You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/02/20 21:26:14 UTC
svn commit: r1448376 - in /myfaces/tobago/trunk: pom.xml tobago-core/pom.xml
tobago-example/pom.xml tobago-example/tobago-example-demo/pom.xml
tobago-theme/tobago-theme-standard/pom.xml
Author: lofwyr
Date: Wed Feb 20 20:26:14 2013
New Revision: 1448376
URL: http://svn.apache.org/r1448376
Log:
TOBAGO-1221: Remove JSF 1.1/1.2 and JDK 1.4 support
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-example/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1448376&r1=1448375&r2=1448376&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Feb 20 20:26:14 2013
@@ -541,12 +541,6 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test12</artifactId>
- <version>${myfaces-test12.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test20</artifactId>
<version>${myfaces-test20.version}</version>
<scope>test</scope>
@@ -1455,58 +1449,15 @@
They define the JSF version which are generally incompatible.
They also define the JSF implementation used to compile and for runtime.
- Usage for a standard build (jsf-1.2):
+ Usage for a standard build (jsf-2.0):
mvn
Usage for specific build:
- mvn -Pjsf-2.0
mvn -Pjsf-2.1
+ mvn -Pjsf-2.2
-->
- <profile>
- <id>jsf-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>myfaces-1.2</value>
- </property>
- </activation>
- <properties>
- <jsf.target>1.2</jsf.target>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces12.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
-
<!--
<profile>
<id>jsf-2.0</id>
@@ -1596,49 +1547,6 @@
</profile>
<profile>
- <id>mojarra-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.2</value>
- </property>
- </activation>
- <properties>
- <jsf.target>1.2</jsf.target>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${mojarra12.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${mojarra12.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
-
- <profile>
<id>mojarra-2.0</id>
<activation>
<property>
@@ -1796,12 +1704,9 @@
</contributors>
<properties>
- <myfaces12.version>1.2.12</myfaces12.version>
- <myfaces-test12.version>1.0.4</myfaces-test12.version>
<myfaces-test20.version>1.0.4</myfaces-test20.version>
<myfaces20.version>2.0.16</myfaces20.version>
<myfaces21.version>2.1.10</myfaces21.version>
- <mojarra12.version>1.2_15</mojarra12.version>
<mojarra20.version>2.0.10</mojarra20.version>
<mojarra21.version>2.1.16</mojarra21.version>
<mojarra22.version>2.2.0-m07</mojarra22.version>
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1448376&r1=1448375&r2=1448376&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Wed Feb 20 20:26:14 2013
@@ -258,7 +258,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <!-- TBD: if we support JSF 1.2 this must be configurable over a profile -->
<dependency>
<groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test20</artifactId>
Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1448376&r1=1448375&r2=1448376&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Wed Feb 20 20:26:14 2013
@@ -265,35 +265,6 @@
</profile>
<profile>
- <id>myfaces-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>myfaces-1.2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces12.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>myfaces-2.0</id>
<activation>
<property>
@@ -351,35 +322,6 @@
</profile>
<profile>
- <id>mojarra-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${mojarra12.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${mojarra12.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>mojarra-2.0</id>
<activation>
<property>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1448376&r1=1448375&r2=1448376&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Wed Feb 20 20:26:14 2013
@@ -257,8 +257,8 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test12</artifactId>
- <version>${myfaces-test12.version}</version>
+ <artifactId>myfaces-test20</artifactId>
+ <version>${myfaces-test20.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -315,39 +315,6 @@
<profiles>
<profile>
- <id>myfaces-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>myfaces-1.2</value>
- </property>
- </activation>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf12</artifactId>
- <version>${openwebbeans.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
- </profile>
-
- <profile>
<id>myfaces-2.0</id>
<activation>
<property>
@@ -437,39 +404,6 @@
</profile>
<profile>
- <id>mojarra-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.2</value>
- </property>
- </activation>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf12</artifactId>
- <version>${openwebbeans.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
- </profile>
-
- <profile>
<id>mojarra-2.0</id>
<activation>
<property>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml?rev=1448376&r1=1448375&r2=1448376&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml Wed Feb 20 20:26:14 2013
@@ -174,8 +174,8 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test12</artifactId>
- <version>${myfaces-test12.version}</version>
+ <artifactId>myfaces-test20</artifactId>
+ <version>${myfaces-test20.version}</version>
<scope>test</scope>
</dependency>
<dependency>