You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/02/12 10:07:56 UTC
svn commit: r506381 - in /myfaces/tomahawk/trunk: assembly/pom.xml
core/pom.xml examples/pom.xml pom.xml sandbox/assembly/pom.xml
sandbox/core/pom.xml sandbox/examples/pom.xml sandbox15/core/pom.xml
sandbox15/examples/pom.xml
Author: manolito
Date: Mon Feb 12 01:07:55 2007
New Revision: 506381
URL: http://svn.apache.org/viewvc?view=rev&rev=506381
Log:
Simplified tomahawk maven dependency definitions to core and shared by introducing <dependencyManagement> and <properties> elements in the "tomahawk-project" artifact
Modified:
myfaces/tomahawk/trunk/assembly/pom.xml
myfaces/tomahawk/trunk/core/pom.xml
myfaces/tomahawk/trunk/examples/pom.xml
myfaces/tomahawk/trunk/pom.xml
myfaces/tomahawk/trunk/sandbox/assembly/pom.xml
myfaces/tomahawk/trunk/sandbox/core/pom.xml
myfaces/tomahawk/trunk/sandbox/examples/pom.xml
myfaces/tomahawk/trunk/sandbox15/core/pom.xml
myfaces/tomahawk/trunk/sandbox15/examples/pom.xml
Modified: myfaces/tomahawk/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/assembly/pom.xml?view=diff&rev=506381&r1=506380&r2=506381
==============================================================================
--- myfaces/tomahawk/trunk/assembly/pom.xml (original)
+++ myfaces/tomahawk/trunk/assembly/pom.xml Mon Feb 12 01:07:55 2007
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<name>Tomahawk Assembly</name>
<description>
- This is the MyFaces Assembly [INSERT MORE STUFF HERE]
+ This is the MyFaces Tomahawk Assembly [INSERT MORE STUFF HERE]
</description>
<parent>
@@ -99,10 +99,10 @@
<classifier>sources</classifier>
</artifactItem>
- <artifactItem>
+ <artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-tomahawk</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>${myfaces-shared.version}</version>
<classifier>sources</classifier>
</artifactItem>
Modified: myfaces/tomahawk/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/pom.xml?view=diff&rev=506381&r1=506380&r2=506381
==============================================================================
--- myfaces/tomahawk/trunk/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/core/pom.xml Mon Feb 12 01:07:55 2007
@@ -100,14 +100,12 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.6-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-tomahawk</artifactId>
- <version>2.0.6-SNAPSHOT</version>
<scope>provided</scope> <!-- because we add all classes to the jar directly -->
</dependency>
@@ -137,7 +135,6 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.6-SNAPSHOT</version>
<!--
Since Tomahawk must stay compatible to other JSF implementations we
must not have any (compile time) dependency on myfaces-impl other than
@@ -278,7 +275,7 @@
<artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-tomahawk</artifactId>
- <version>2.0.6-SNAPSHOT</version>
+ <version>${myfaces-shared.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -296,7 +293,7 @@
<artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-tomahawk</artifactId>
- <version>2.0.6-SNAPSHOT</version>
+ <version>${myfaces-shared.version}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
Modified: myfaces/tomahawk/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/pom.xml?view=diff&rev=506381&r1=506380&r2=506381
==============================================================================
--- myfaces/tomahawk/trunk/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/pom.xml Mon Feb 12 01:07:55 2007
@@ -73,12 +73,12 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces}</version>
+ <version>${myfaces.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces}</version>
+ <version>${myfaces.version}</version>
<!-- Tomahawk examples must only have runtime dependency to myfaces-impl
so that it will be automatically added to war. But there must not be
any compile dependency on impl so that is is always possible to use
@@ -89,7 +89,6 @@
<properties>
<jsf_implementation>MyFaces</jsf_implementation>
- <myfaces>1.1.6-SNAPSHOT</myfaces>
</properties>
</profile>
Modified: myfaces/tomahawk/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/pom.xml?view=diff&rev=506381&r1=506380&r2=506381
==============================================================================
--- myfaces/tomahawk/trunk/pom.xml (original)
+++ myfaces/tomahawk/trunk/pom.xml Mon Feb 12 01:07:55 2007
@@ -31,16 +31,49 @@
<url>http://issues.apache.org/jira/browse/TOMAHAWK</url>
</issueManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-tomahawk</artifactId>
+ <version>${myfaces-shared.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<repositories>
<repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
<id>apache-maven-snapshots</id>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>myfaces-staging</id>
+ <url>http://people.apache.org/builds/myfaces/m2-staging-repository</url>
+ <releases>
+ <enabled>false</enabled> <!-- Enable to test a MyFaces core release candidate with tomahawk -->
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
@@ -76,5 +109,10 @@
</plugin>
</plugins>
</build>
+
+ <properties>
+ <myfaces.version>1.1.6-SNAPSHOT</myfaces.version>
+ <myfaces-shared.version>2.0.6-SNAPSHOT</myfaces-shared.version>
+ </properties>
</project>
Modified: myfaces/tomahawk/trunk/sandbox/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/assembly/pom.xml?view=diff&rev=506381&r1=506380&r2=506381
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/assembly/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/assembly/pom.xml Mon Feb 12 01:07:55 2007
@@ -139,12 +139,10 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.6-SNAPSHOT</version>
<!-- Sandbox must only have runtime dependency to myfaces-impl
so that it will be automatically added to binary. But there must not be
any compile dependency on impl so that is is always possible to use
Modified: myfaces/tomahawk/trunk/sandbox/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/pom.xml?view=diff&rev=506381&r1=506380&r2=506381
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core/pom.xml Mon Feb 12 01:07:55 2007
@@ -94,7 +94,6 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.6-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -117,7 +116,6 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: myfaces/tomahawk/trunk/sandbox/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/pom.xml?view=diff&rev=506381&r1=506380&r2=506381
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/pom.xml Mon Feb 12 01:07:55 2007
@@ -84,12 +84,10 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.6-SNAPSHOT</version>
<!-- Sandbox examples must only have runtime dependency to myfaces-impl
so that it will be automatically added to war. But there must not be
any compile dependency on impl so that is is always possible to use
Modified: myfaces/tomahawk/trunk/sandbox15/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/pom.xml?view=diff&rev=506381&r1=506380&r2=506381
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/pom.xml Mon Feb 12 01:07:55 2007
@@ -94,7 +94,6 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.6-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -117,7 +116,6 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: myfaces/tomahawk/trunk/sandbox15/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/examples/pom.xml?view=diff&rev=506381&r1=506380&r2=506381
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox15/examples/pom.xml Mon Feb 12 01:07:55 2007
@@ -84,12 +84,10 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.6-SNAPSHOT</version>
<!-- Sandbox examples must only have runtime dependency to myfaces-impl
so that it will be automatically added to war. But there must not be
any compile dependency on impl so that is is always possible to use