You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/07/20 19:27:57 UTC
svn commit: r965921 - in /myfaces/extensions/cdi/trunk:
examples/jsf-examples/hello_myfaces-codi_jsf12/
examples/jsf-examples/hello_myfaces-codi_jsf20/ jee-modules/jsf-module/
jee-modules/jsf20-module/ jee-modules/jsf20-module/api/
jee-modules/jsf20-mo...
Author: struberg
Date: Tue Jul 20 17:27:57 2010
New Revision: 965921
URL: http://svn.apache.org/viewvc?rev=965921&view=rev
Log:
cleanup our property definition + fix shading
we now have myfaces1, myfaces2, mojarra1 and mojarra2 as properties
Modified:
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/pom.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/pom.xml
myfaces/extensions/cdi/trunk/parent/pom.xml
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml?rev=965921&r1=965920&r2=965921&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml Tue Jul 20 17:27:57 2010
@@ -44,13 +44,6 @@
</repositories>
- <properties>
- <owb.version>1.0.0-alpha-1</owb.version>
- <myfaces.version>1.2.8</myfaces.version>
- <mojarra.version>1.2_14</mojarra.version>
- <maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
@@ -260,13 +253,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${myfaces1.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
+ <version>${myfaces1.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -284,13 +277,13 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>${mojarra.version}</version>
+ <version>${mojarra1.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>${mojarra.version}</version>
+ <version>${mojarra1.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml?rev=965921&r1=965920&r2=965921&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml Tue Jul 20 17:27:57 2010
@@ -19,29 +19,22 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <packaging>war</packaging>
-
- <groupId>org.apache.myfaces.extensions.cdi.examples</groupId>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>war</packaging>
+
+ <groupId>org.apache.myfaces.extensions.cdi.examples</groupId>
<artifactId>examples-hello_myfaces-codi-jsf20</artifactId>
<name>MyFaces Extensions-CDI JSF 2.0-Examples Hello MyFaces CODI</name>
<version>1.0.0-SNAPSHOT</version>
- <parent>
+ <parent>
<groupId>org.apache.myfaces.extensions.cdi.examples</groupId>
<artifactId>jsf-examples-project</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
- <properties>
- <owb.version>1.0.0-alpha-1</owb.version>
- <myfaces.version>2.0.1-SNAPSHOT</myfaces.version>
- <mojarra.version>2.0.3-b03</mojarra.version>
- <maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
- </properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
@@ -172,13 +165,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${myfaces2.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
+ <version>${myfaces2.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -196,23 +189,23 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>${mojarra.version}</version>
+ <version>${mojarra2.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>${mojarra.version}</version>
+ <version>${mojarra2.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<repositories>
- <repository>
- <id>maven2-repository.dev.java.net 2</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
+ <repository>
+ <id>maven2-repository.dev.java.net 2</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ </repositories>
</profile>
<profile>
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/pom.xml?rev=965921&r1=965920&r2=965921&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/pom.xml Tue Jul 20 17:27:57 2010
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${jsf.version}</version>
+ <version>${myfaces1.version}</version>
<scope>provided</scope>
</dependency>
@@ -63,7 +63,4 @@
-->
</dependencies>
- <properties>
- <jsf.version>1.2.8</jsf.version>
- </properties>
</project>
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml?rev=965921&r1=965920&r2=965921&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml Tue Jul 20 17:27:57 2010
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jse-modules</groupId>
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml?rev=965921&r1=965920&r2=965921&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml Tue Jul 20 17:27:57 2010
@@ -43,16 +43,14 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
- <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
+ <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <optional>true</optional>
</dependency>
<dependency>
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/pom.xml?rev=965921&r1=965920&r2=965921&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/pom.xml Tue Jul 20 17:27:57 2010
@@ -36,10 +36,6 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <properties>
- <myfaces2.version>2.0.0</myfaces2.version>
- </properties>
-
<modules>
<module>api</module>
<module>impl</module>
Modified: myfaces/extensions/cdi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/parent/pom.xml?rev=965921&r1=965920&r2=965921&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/parent/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/parent/pom.xml Tue Jul 20 17:27:57 2010
@@ -62,7 +62,16 @@
<properties>
<owb.version>1.0.0-alpha-1</owb.version>
- <myfaces.version>2.0.1-SNAPSHOT</myfaces.version>
+
+ <!-- JSF-2.0 implementations-->
+ <myfaces2.version>2.0.1</myfaces2.version>
+ <mojarra2.version>2.0.3-b03</mojarra2.version>
+
+ <!-- JSF-1.1 implementations-->
+ <myfaces1.version>1.2.8</myfaces1.version>
+ <mojarra1.version>1.2_14</mojarra1.version>
+
+ <maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
</properties>
<dependencyManagement>