Author: manaRH
Date: 2012-10-08 08:30:02 -0400 (Mon, 08 Oct 2012)
New Revision: 15207
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
branches/enterprise/WFK-2_1/functional-tests/pom.xml
branches/enterprise/WFK-2_1/jboss-seam-remoting/pom.xml
branches/enterprise/WFK-2_1/jboss-seam/pom.xml
branches/enterprise/WFK-2_1/pom.xml
Log:
aligned to EAP 6 maven repository
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-08 12:29:52 UTC (rev
15206)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-08 12:30:02 UTC (rev
15207)
@@ -32,20 +32,19 @@
<properties>
<!-- Version string properties -->
<version.seam>2.3.0.Final-redhat-1</version.seam>
- <version.wicket>1.4.14</version.wicket>
<version.drools>5.3.3.Final</version.drools>
- <version.resteasy>2.0.1.GA</version.resteasy>
+ <version.resteasy>2.3.3.Final-redhat-1</version.resteasy>
<version.spring>3.1.1.RELEASE</version.spring>
- <version.jbossas7>7.1.1.Final</version.jbossas7>
- <version.jsf2>2.1.7</version.jsf2>
+ <version.jbossas7>7.1.2.Final-redhat-1</version.jbossas7>
+ <version.jsf2>2.1.7-redhat-1</version.jsf2>
<version.webdriver>0.9.7376</version.webdriver>
<version.infinispan>5.1.3.FINAL</version.infinispan>
<version.junit>4.8.2</version.junit>
<version.testng>5.14.10</version.testng>
- <version.richfaces>4.2.2.Final</version.richfaces>
+ <version.richfaces>4.2.3.Final-redhat-1</version.richfaces>
<version.arquillian_core>1.0.1.Final</version.arquillian_core>
-
-
+
<version.org.hibernate.search>4.1.1.Final-redhat-1</version.org.hibernate.search>
+ <version.org.jboss.bom>1.0.0.M12-redhat-1</version.org.jboss.bom>
<!-- ***************** -->
<!-- Repository Deployment URLs -->
<!-- ***************** -->
@@ -63,15 +62,15 @@
<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
- <version>1.0.0.Final</version>
+ <version>${version.org.jboss.bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-bom</artifactId>
- <version>${version.arquillian_core}</version>
+ <groupId>org.jboss.bom</groupId>
+ <artifactId>jboss-wfk-arquillian</artifactId>
+ <version>${version.org.jboss.bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -165,12 +164,6 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>1.4.1.SP9</version>
- </dependency>
-
- <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.2.3</version>
@@ -308,54 +301,6 @@
<version>3.1-jbossorg-1</version>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>1.0.0.CR8</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
-
<artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
-
<artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
-
<artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>apache-httpclient</groupId>
-
<artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-slide</groupId>
-
<artifactId>webdavlib</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>oswego-concurrent</groupId>
-
<artifactId>concurrent</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>wutka-dtdparser</groupId>
-
<artifactId>dtdparser121</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
-
<artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>javax.activation</groupId>
-
<artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaf</groupId>
-
<artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Excel export module dependency -->
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
@@ -396,7 +341,7 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.15.0-GA</version>
+ <version>3.15.0.GA-redhat-1</version>
</dependency>
<dependency>
@@ -408,7 +353,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
@@ -709,7 +654,7 @@
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
- <version>2.1.2</version>
+ <version>2.1.7</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -730,7 +675,7 @@
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext-rtf</artifactId>
- <version>2.1.2</version>
+ <version>2.1.7</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -759,7 +704,12 @@
</exclusion>
</exclusions>
</dependency>
-
+ <!-- rewriting version in openid pom -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.0.2</version>
+ </dependency>
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java-consumer</artifactId>
@@ -850,68 +800,6 @@
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>${version.wicket}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
-
<artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-ioc</artifactId>
- <version>${version.wicket}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
-
<artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>commons-collections</groupId>
-
<artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${version.wicket}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
-
<artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>commons-collections</groupId>
-
<artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-datetime</artifactId>
- <version>${version.wicket}</version>
- </dependency>
-
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${version.testng}</version>
Modified: branches/enterprise/WFK-2_1/functional-tests/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/functional-tests/pom.xml 2012-10-08
12:29:52 UTC (rev 15206)
+++ branches/enterprise/WFK-2_1/functional-tests/pom.xml 2012-10-08
12:30:02 UTC (rev 15207)
@@ -17,10 +17,36 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api-2.5</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Don't want to use version 2.9 -->
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.7.1-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.1.3-redhat-1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: branches/enterprise/WFK-2_1/jboss-seam/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/pom.xml 2012-10-08 12:29:52 UTC
(rev 15206)
+++ branches/enterprise/WFK-2_1/jboss-seam/pom.xml 2012-10-08 12:30:02 UTC
(rev 15207)
@@ -23,7 +23,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>antlr-maven-plugin</artifactId>
- <version>2.2</version>
+<!-- <version>2.2</version> -->
<configuration>
<grammars>org/jboss/seam/text/seam-text.g</grammars>
</configuration>
@@ -141,6 +141,12 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-orm</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>org.codehaus.jackson</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -149,11 +155,11 @@
<optional>true</optional>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.javassist</groupId> -->
-<!-- <artifactId>javassist</artifactId> -->
-<!-- <scope>provided</scope> -->
-<!-- </dependency> -->
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>dom4j</groupId>
@@ -261,38 +267,7 @@
<optional>true</optional>
</dependency>
- <!-- Order matters of jboss:jboss-cache and
org.jboss.cache:jbosscache-core -->
-
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <optional>true</optional>
- </dependency>
-
-
-
- <!-- This is actually a dep of jboss-cache, but it doesn't
declare it -->
-
- <!-- This is actually a dep of jboss-cache, but it doesn't
declare it -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<optional>true</optional>
@@ -372,10 +347,16 @@
<artifactId>urlrewritefilter</artifactId>
<optional>true</optional>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>concurrent</groupId>
+ <groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
<optional>true</optional>
</dependency>
Modified: branches/enterprise/WFK-2_1/jboss-seam-remoting/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-remoting/pom.xml 2012-10-08
12:29:52 UTC (rev 15206)
+++ branches/enterprise/WFK-2_1/jboss-seam-remoting/pom.xml 2012-10-08
12:30:02 UTC (rev 15207)
@@ -30,6 +30,53 @@
<configuration>
<jsSrcDir>src/main/resources/org/jboss/seam/remoting/</jsSrcDir>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.8-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit-core-js</artifactId>
+ <version>2.8-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.1.3-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.cssparser</groupId>
+ <artifactId>cssparser</artifactId>
+ <version>0.9.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.1.3-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.14</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1-redhat-1</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: branches/enterprise/WFK-2_1/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/pom.xml 2012-10-08 12:29:52 UTC (rev 15206)
+++ branches/enterprise/WFK-2_1/pom.xml 2012-10-08 12:30:02 UTC (rev 15207)
@@ -243,7 +243,7 @@
</dependency>
<dependency>
- <groupId>concurrent</groupId>
+ <groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.4</version>
</dependency>
@@ -446,7 +446,7 @@
<profile>
<id>distribution</id>
<modules>
- <module>seam-reference-guide</module>
+<!-- <module>seam-reference-guide</module> -->
<module>distribution</module>
</modules>
</profile>
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
