myfaces-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bernd Bohmann <bernd.bohm...@atanion.com>
Subject Re: svn commit: r365908 - in /myfaces: api/trunk/pom.xml impl/trunk/pom.xml sandbox/trunk/pom.xml tomahawk/trunk/pom.xml
Date Wed, 04 Jan 2006 14:00:58 GMT
Martin,

can you apply the common.pom.xml.diff, too?

Regards

Bernd

mmarinschek@apache.org schrieb:
> Author: mmarinschek
> Date: Wed Jan  4 05:45:38 2006
> New Revision: 365908
> 
> URL: http://svn.apache.org/viewcvs?rev=365908&view=rev
> Log:
> new poms - fix for MYFACES-1000
> 
> Modified:
>     myfaces/api/trunk/pom.xml
>     myfaces/impl/trunk/pom.xml
>     myfaces/sandbox/trunk/pom.xml
>     myfaces/tomahawk/trunk/pom.xml
> 
> Modified: myfaces/api/trunk/pom.xml
> URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/pom.xml?rev=365908&r1=365907&r2=365908&view=diff
> ==============================================================================
> --- myfaces/api/trunk/pom.xml (original)
> +++ myfaces/api/trunk/pom.xml Wed Jan  4 05:45:38 2006
> @@ -5,7 +5,6 @@
>    <groupId>org.apache.myfaces</groupId>
>    <artifactId>myfaces-api</artifactId>
>    <packaging>jar</packaging>
> -  <version>1.1.2-SNAPSHOT</version>
>    <name>MyFaces API</name>
>    <url>http://myfaces.apache.org</url>
>    <description>
> @@ -107,48 +106,48 @@
>  			<artifactId>easymockclassextension</artifactId>
>  			<version>1.1</version>
>  		  <scope>test</scope>			
> -		</dependency>
> -		
> -		<dependency>
> -      <groupId>junit</groupId>
> -      <artifactId>junit</artifactId>
> -      <version>3.8.1</version>
> -      <scope>test</scope>
> -    </dependency>
> -    
> -    <dependency>
> -      <groupId>cactus</groupId>
> -      <artifactId>cactus</artifactId>
> -      <version>13-1.7.1</version>
> -      <scope>test</scope>
> -    </dependency>
> -    
> -    <dependency>
> -      <groupId>aspectj</groupId>
> -      <artifactId>aspectjrt</artifactId>
> -      <version>1.2.1</version>
> -      <scope>test</scope>
> -    </dependency>
> -    
> -    <dependency>
> -      <groupId>commons-httpclient</groupId>
> -      <artifactId>commons-httpclient</artifactId>
> -      <version>2.0.2</version>
> -      <scope>test</scope>
> -    </dependency>
> -    
> -    <dependency>
> -      <groupId>httpunit</groupId>
> -      <artifactId>httpunit</artifactId>
> -      <version>1.6</version>
> -      <scope>test</scope>
> -    </dependency>
> -    
> -    <dependency>
> -      <groupId>nekohtml</groupId>
> -      <artifactId>nekohtml</artifactId>
> -      <version>0.9.1</version>
> -      <scope>test</scope>
> +		</dependency>
> +		
> +		<dependency>
> +      <groupId>junit</groupId>
> +      <artifactId>junit</artifactId>
> +      <version>3.8.1</version>
> +      <scope>test</scope>
> +    </dependency>
> +    
> +    <dependency>
> +      <groupId>cactus</groupId>
> +      <artifactId>cactus</artifactId>
> +      <version>13-1.7.1</version>
> +      <scope>test</scope>
> +    </dependency>
> +    
> +    <dependency>
> +      <groupId>aspectj</groupId>
> +      <artifactId>aspectjrt</artifactId>
> +      <version>1.2.1</version>
> +      <scope>test</scope>
> +    </dependency>
> +    
> +    <dependency>
> +      <groupId>commons-httpclient</groupId>
> +      <artifactId>commons-httpclient</artifactId>
> +      <version>2.0.2</version>
> +      <scope>test</scope>
> +    </dependency>
> +    
> +    <dependency>
> +      <groupId>httpunit</groupId>
> +      <artifactId>httpunit</artifactId>
> +      <version>1.6</version>
> +      <scope>test</scope>
> +    </dependency>
> +    
> +    <dependency>
> +      <groupId>nekohtml</groupId>
> +      <artifactId>nekohtml</artifactId>
> +      <version>0.9.1</version>
> +      <scope>test</scope>
>      </dependency>   
>  
>    </dependencies>
> @@ -172,4 +171,4 @@
>    -->
>  
>    
> -</project>
> \ No newline at end of file
> +</project>
> 
> Modified: myfaces/impl/trunk/pom.xml
> URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/pom.xml?rev=365908&r1=365907&r2=365908&view=diff
> ==============================================================================
> --- myfaces/impl/trunk/pom.xml (original)
> +++ myfaces/impl/trunk/pom.xml Wed Jan  4 05:45:38 2006
> @@ -5,7 +5,6 @@
>      <groupId>org.apache.myfaces</groupId>
>      <artifactId>myfaces-impl</artifactId>
>      <packaging>jar</packaging>
> -    <version>1.1.2-SNAPSHOT</version>
>      <name>MyFaces Impl</name>
>      <url>http://myfaces.apache.org</url>
>      <description>
> @@ -22,14 +21,14 @@
>          <dependency>
>              <groupId>org.apache.myfaces</groupId>
>              <artifactId>myfaces-api</artifactId>
> -            <version>1.1.2-SNAPSHOT</version>
> +             <version>${version}</version>
>              <scope>compile</scope>
>          </dependency>
>  
>          <dependency>
>              <groupId>org.apache.myfaces</groupId>
>              <artifactId>myfaces-commons</artifactId>
> -            <version>1.1.2-SNAPSHOT</version>
> +             <version>${version}</version>
>              <scope>compile</scope>
>          </dependency>
>  
> @@ -115,6 +114,9 @@
>      <build>
>          <resources>
>              <resource>
> +                <directory>src/main/resources</directory>
> +            </resource>
> +            <resource>
>                  <directory>src/main/resources-facesconfig</directory>
>              </resource>
>          </resources>
> @@ -139,4 +141,4 @@
>              </plugin>
>          </plugins>
>      </build>
> -</project>
> \ No newline at end of file
> +</project>
> 
> Modified: myfaces/sandbox/trunk/pom.xml
> URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/pom.xml?rev=365908&r1=365907&r2=365908&view=diff
> ==============================================================================
> --- myfaces/sandbox/trunk/pom.xml (original)
> +++ myfaces/sandbox/trunk/pom.xml Wed Jan  4 05:45:38 2006
> @@ -5,7 +5,6 @@
>      <groupId>org.apache.myfaces</groupId>
>      <artifactId>myfaces-sandbox</artifactId>
>      <packaging>jar</packaging>
> -    <version>1.1.2-SNAPSHOT</version>
>      <name>MyFaces Sandbox</name>
>      <url>http://myfaces.apache.org</url>
>      <description>
> @@ -30,28 +29,28 @@
>          <dependency>
>              <groupId>org.apache.myfaces</groupId>
>              <artifactId>myfaces-api</artifactId>
> -            <version>1.1.2-SNAPSHOT</version>
> +            <version>${version}</version>
>              <scope>compile</scope>
>          </dependency>
>  
>          <dependency>
>              <groupId>org.apache.myfaces</groupId>
>              <artifactId>myfaces-commons</artifactId>
> -            <version>1.1.2-SNAPSHOT</version>
> +             <version>${version}</version>
>              <scope>compile</scope>
>          </dependency>
>  
>          <dependency>
>              <groupId>org.apache.myfaces</groupId>
>              <artifactId>myfaces-impl</artifactId>
> -            <version>1.1.2-SNAPSHOT</version>
> +             <version>${version}</version>
>              <scope>compile</scope>
>          </dependency>
>  
>          <dependency>
>              <groupId>org.apache.myfaces</groupId>
>              <artifactId>tomahawk</artifactId>
> -            <version>1.1.2-SNAPSHOT</version>
> +             <version>${version}</version>
>              <scope>compile</scope>
>          </dependency>
>  
> @@ -74,6 +73,9 @@
>      <build>
>          <resources>
>              <resource>
> +                <directory>src/main/resources</directory>
> +            </resource>
> +            <resource>
>                  <directory>src/main/resources-facesconfig</directory>
>              </resource>
>          </resources>
> @@ -170,4 +172,4 @@
>          <url>http://svn.apache.org/viewcvs.cgi/myfaces/sandbox</url>
>      </scm>
>  
> -</project>
> \ No newline at end of file
> +</project>
> 
> Modified: myfaces/tomahawk/trunk/pom.xml
> URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/pom.xml?rev=365908&r1=365907&r2=365908&view=diff
> ==============================================================================
> --- myfaces/tomahawk/trunk/pom.xml (original)
> +++ myfaces/tomahawk/trunk/pom.xml Wed Jan  4 05:45:38 2006
> @@ -130,6 +130,9 @@
>      <build>
>          <resources>
>              <resource>
> +                <directory>src/main/resources</directory>
> +            </resource>
> +            <resource>
>                  <directory>src/main/resources-facesconfig</directory>
>              </resource>
>          </resources>
> @@ -226,4 +229,4 @@
>          <url>http://svn.apache.org/viewcvs.cgi/myfaces/tomahawk</url>
>      </scm>
>  
> -</project>
> \ No newline at end of file
> +</project>
> 
> 
> 

-- 
Dipl.-Ing. Bernd Bohmann - Atanion GmbH - Software Development
Bismarckstr. 13, 26122 Oldenburg, http://www.atanion.com
phone: +49 441 4082312, mobile: +49 173 8839471, fax: +49 441 4082333

Mime
View raw message