Author: manaRH
Date: 2012-01-16 06:45:34 -0500 (Mon, 16 Jan 2012)
New Revision: 14257
Modified:
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
branches/community/Seam_2_3/jboss-seam-remoting/pom.xml
branches/community/Seam_2_3/seam-integration-tests/pom.xml
Log:
fixed/moved dependency management from profiles in parent, fixed remoting and
integration tests for new jboss-seam-parent dependency management
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-01-16
11:45:25 UTC (rev 14256)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-01-16
11:45:34 UTC (rev 14257)
@@ -47,6 +47,8 @@
<version.spring>2.5.6.SEC02</version.spring>
<version.jbossembedded>beta3.SP15</version.jbossembedded>
<version.emma>2.0.5312</version.emma>
+ <version.jsf12>1.2_12</version.jsf12>
+ <version.jsf2>2.1.3_01</version.jsf2>
<!-- ***************** -->
<!-- Repository Deployment URLs -->
@@ -1520,7 +1522,50 @@
<artifactId>metawidget</artifactId>
<version>0.95</version>
</dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${version.jsf12}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${version.jsf12}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-collections</groupId>
+
<artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+
<groupId>commons-digester</groupId>
+
<artifactId>commons-digester</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${version.jsf2}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${version.jsf2}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -1774,7 +1819,6 @@
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -1850,43 +1894,14 @@
</profile>
<profile>
<id>jsf12</id>
-<!-- <activation> -->
-<!-- <activeByDefault>true</activeByDefault> -->
-<!-- </activation> -->
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<modules>
<module>../jboss-seam</module>
<module>../jboss-seam-ui</module>
<module>../jboss-seam-debug</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_12</version>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_12</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
-
<artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-digester</groupId>
-
<artifactId>commons-digester</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ </modules>
</profile>
<profile>
<id>jsf2</id>
@@ -1895,41 +1910,6 @@
<module>../jboss-seam-ui-jsf2</module>
<module>../jboss-seam-debug-jsf2</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.1.3_01</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.1.3_01</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
-
<artifactId>jboss-seam-ui-jsf2</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug-jsf2</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
- </dependencies>
-
- </dependencyManagement>
</profile>
<profile>
<id>code-coverage</id>
Modified: branches/community/Seam_2_3/jboss-seam-remoting/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-01-16
11:45:25 UTC (rev 14256)
+++ branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-01-16
11:45:34 UTC (rev 14257)
@@ -139,6 +139,9 @@
</profile>
<profile>
<id>jsf12</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<dependencies>
<dependency>
Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-01-16
11:45:25 UTC (rev 14256)
+++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-01-16
11:45:34 UTC (rev 14257)
@@ -119,23 +119,10 @@
<artifactId>hibernate-all</artifactId>
<version>${version.jbossembedded}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -209,55 +196,56 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_12</version>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_12</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
-
<artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-digester</groupId>
-
<artifactId>commons-digester</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-collections</groupId>
+
<artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+
<groupId>commons-digester</groupId>
+
<artifactId>commons-digester</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>jsf2</id>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.1.3_01</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.1.3_01</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
</project>
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
