Author: manaRH Date: 2013-09-20 12:54:22 -0400 (Fri, 20 Sep 2013) New Revision: 15589
Modified: branches/enterprise/WFK-2_1/bom/pom.xml branches/enterprise/WFK-2_1/pom.xml Log: switched from JDF BOMs to plain deps and managed jgroups upgrade https://issues.jboss.org/browse/WFK2-162 Modified: branches/enterprise/WFK-2_1/bom/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/bom/pom.xml 2013-09-13 14:11:17 UTC (rev 15588) +++ branches/enterprise/WFK-2_1/bom/pom.xml 2013-09-20 16:54:22 UTC (rev 15589) @@ -36,12 +36,32 @@ <version.drools>5.3.0.BRMS</version.drools> <version.resteasy>2.3.6.Final-redhat-1</version.resteasy> <version.spring>3.1.4.RELEASE</version.spring> - <version.jsf2>2.1.19-redhat-1</version.jsf2> - <!-- <version.webdriver>0.9.7376</version.webdriver> --> - <version.infinispan>5.2.6.Final-redhat-1</version.infinispan> + <version.richfaces>4.3.2.Final-redhat-1</version.richfaces> + <version.org.slf4j>1.7.2-redhat-1</version.org.slf4j> + + <version.org.jboss.spec.jboss.javaee.6.0>3.0.2.Final-redhat-3</version.org.jboss.spec.jboss.javaee.6.0> + + <!-- hibernate version properties --> + <version.org.hibernate>4.2.0.SP1-redhat-1</version.org.hibernate> + <version.org.hibernate.common>4.0.1.Final-redhat-2</version.org.hibernate.common> + <version.org.hibernate.javax.persistence>1.0.1.Final-redhat-2</version.org.hibernate.javax.persistence> + <version.org.hibernate.search>4.3.0.Final-redhat-wfk-3</version.org.hibernate.search> + <version.org.hibernate.validator>4.3.1.Final-redhat-1</version.org.hibernate.validator> + + <version.infinispan>5.2.7.Final-redhat-1</version.infinispan> + <version.org.jgroups>3.2.10.Final-redhat-2</version.org.jgroups> + <version.slf4j>1.7.2-redhat-1</version.slf4j> + <!-- Test frameworks --> <version.junit>4.10</version.junit> - <version.testng>5.14.10</version.testng> - <version.org.jboss.bom>1.0.4.Final-redhat-wfk-3</version.org.jboss.bom> + <version.org.testng>5.14.10</version.org.testng> + + <!-- Versions of Arquillian and Shrinkwrap --> + <version.org.jboss.arquillian>1.1.0.Final</version.org.jboss.arquillian> + <version.org.jboss.arquillian.extension.drone>1.1.1.Final</version.org.jboss.arquillian.extension.drone> + <version.org.jboss.arquillian.graphene>1.0.0.Final</version.org.jboss.arquillian.graphene> + <version.org.jboss.as.arquillian.container>7.2.0.Final</version.org.jboss.as.arquillian.container> + <version.org.jboss.shrinkwrap.resolver>2.0.0</version.org.jboss.shrinkwrap.resolver> + <!-- ***************** --> <!-- Repository Deployment URLs --> <!-- ***************** --> @@ -55,27 +75,169 @@ that versions are only specified here, not in sub project poms. All dependencies for all modules should be listed out here --> <dependencies> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${version.org.slf4j}</version> + </dependency> + + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <version>${version.org.jboss.spec.jboss.javaee.6.0}</version> + <type>pom</type> + <scope>import</scope> + </dependency> - <dependency> - <groupId>org.jboss.bom</groupId> - <artifactId>jboss-javaee-6.0-with-hibernate</artifactId> - <version>${version.org.jboss.bom}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <!-- Hibernate ORM sub-modules --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version.org.hibernate}</version> + <!-- this already part of JDK6 --> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>${version.org.hibernate}</version> + + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-envers</artifactId> + <version>${version.org.hibernate}</version> + </dependency> - <dependency> - <groupId>org.jboss.bom</groupId> - <artifactId>jboss-javaee-6.0-with-tools</artifactId> - <version>${version.org.jboss.bom}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>${version.org.hibernate.validator}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search</artifactId> + <version>${version.org.hibernate.search}</version> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-analyzers</artifactId> + <version>${version.org.hibernate.search}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-engine</artifactId> + <version>${version.org.hibernate.search}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-infinispan</artifactId> + <version>${version.org.hibernate.search}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-orm</artifactId> + <version>${version.org.hibernate.search}</version> + </dependency> + + <!-- Shrinkwrap resolver --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${version.org.jboss.shrinkwrap.resolver}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Arquillian lets test you your applications in real environment --> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-bom</artifactId> + <version>${version.org.jboss.arquillian}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Arquillian Drone adds support for visual testing of your + application --> + <dependency> + <groupId>org.jboss.arquillian.extension</groupId> + <artifactId>arquillian-drone-bom</artifactId> + <version>${version.org.jboss.arquillian.extension.drone}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Arquillian Drone bindings for DefaultSelenium based browsers --> + <dependency> + <groupId>org.jboss.arquillian.extension</groupId> + <artifactId>arquillian-drone-selenium-depchain</artifactId> + <version>${version.org.jboss.arquillian.extension.drone}</version> + <type>pom</type> + </dependency> + + <!-- Arquillian Drone bindings for WebDriver based browsers --> + <dependency> + <groupId>org.jboss.arquillian.extension</groupId> + <artifactId>arquillian-drone-webdriver-depchain</artifactId> + <version>${version.org.jboss.arquillian.extension.drone}</version> + <type>pom</type> + </dependency> + + <!-- Arquillian Graphene is an enhanced tool based on Selenium + allowing you to test AJAX more easily --> + <dependency> + <groupId>org.jboss.arquillian.graphene</groupId> + <artifactId>arquillian-graphene</artifactId> + <version>${version.org.jboss.arquillian.graphene}</version> + <type>pom</type> + </dependency> + + <!-- Arquillian support for JBoss AS7 container --> + <!-- Note: Managed version of container allows Arquillian to + control startup and shutdown of the container --> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <version>${version.org.jboss.as.arquillian.container}</version> + </dependency> + + <!-- Arquillian support for JBoss AS7 container --> + <!-- Note: Remote version of container allows Arquillian to connect + to already running container --> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-remote</artifactId> + <version>${version.org.jboss.as.arquillian.container}</version> + </dependency> + + <!-- Recommended JUnit version --> + <!-- Note that JUnit is preferred framework --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${version.junit}</version> + </dependency> + + <!-- Recommended TestNG version --> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${version.org.testng}</version> + </dependency> + <dependency> - <groupId>org.jboss.bom</groupId> - <artifactId>jboss-javaee-6.0-with-richfaces</artifactId> - <version>${version.org.jboss.bom}</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <version>${version.richfaces}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -783,30 +945,6 @@ </dependency> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>${version.testng}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${version.junit}</version> - </dependency> - - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-server</artifactId> - <version>2.25.0</version> - </dependency> - - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-java</artifactId> - <version>2.25.0</version> - </dependency> - - <dependency> <groupId>org.jboss.seam</groupId> <artifactId>functional-tests</artifactId> <version>${version.seam}</version> @@ -837,11 +975,11 @@ </exclusions> </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>${version.jsf2}</version> - </dependency> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>${version.org.jgroups}</version> + </dependency> <dependency> <groupId>org.infinispan</groupId> Modified: branches/enterprise/WFK-2_1/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/pom.xml 2013-09-13 14:11:17 UTC (rev 15588) +++ branches/enterprise/WFK-2_1/pom.xml 2013-09-20 16:54:22 UTC (rev 15589) @@ -46,13 +46,11 @@ <!-- Version string properties --> <version.seam>2.3.2.Final-redhat-1</version.seam> - <version.testng>5.14.10</version.testng> <version.jacoco>0.5.8.201207111220</version.jacoco> - <version.jbossas7>7.2.0.Final</version.jbossas7> + <version.jbossas7>7.2.1.Final-redhat-10</version.jbossas7> + <version.arquillian-jbossas7-container>7.2.0.Final</version.arquillian-jbossas7-container> <version.emma>2.0.5312</version.emma> - <version.junit>4.8.2</version.junit> <version.richfaces.cdk>4.3.1.Final-redhat-2</version.richfaces.cdk> - <version.slf4j>1.6.1</version.slf4j> <!-- ***************** --> <!-- Repository Deployment URLs --> @@ -76,15 +74,7 @@ <scope>import</scope> </dependency> - <!-- thirdparty dependencies --> <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.6</version> - </dependency> - - - <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>1.7.0</version> @@ -105,52 +95,22 @@ <dependency> <groupId>emma</groupId> <artifactId>emma</artifactId> - <version>2.0.5312</version> + <version>${version.emma}</version> </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>${version.testng}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${version.junit}</version> - </dependency> <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-server</artifactId> - <version>2.21.0</version> - </dependency> - - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-java</artifactId> - <version>2.21.0</version> - </dependency> - - <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-arquillian-container-managed</artifactId> - <version>${version.jbossas7}</version> + <version>${version.arquillian-jbossas7-container}</version> </dependency> <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-arquillian-container-remote</artifactId> - <version>${version.jbossas7}</version> + <version>${version.arquillian-jbossas7-container}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${version.slf4j}</version> - </dependency> - - <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <version>2.2.5-redhat-5</version> _______________________________________________ seam-commits mailing list [email protected] https://lists.jboss.org/mailman/listinfo/seam-commits
