Author: manaRH Date: 2014-01-29 03:51:35 -0500 (Wed, 29 Jan 2014) New Revision: 15654 Modified: branches/enterprise/WFK-2_1/bom/pom.xml branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java branches/enterprise/WFK-2_1/pom.xml Log: aligned EAP 6.2 deps Modified: branches/enterprise/WFK-2_1/bom/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/bom/pom.xml 2014-01-22 15:53:10 UTC (rev 15653) +++ branches/enterprise/WFK-2_1/bom/pom.xml 2014-01-29 08:51:35 UTC (rev 15654) @@ -32,36 +32,34 @@ <properties> <!-- Version string properties --> - <version.seam>2.3.3.Final-redhat-1</version.seam> - <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.seam>2.3.3.Final-redhat-1</version.seam> + <version.drools>5.3.0.BRMS</version.drools> + <version.resteasy>2.3.7.Final-redhat-2</version.resteasy> + <version.spring>3.1.4.RELEASE</version.spring> <version.richfaces>4.3.4.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-4</version.org.jboss.spec.jboss.javaee.6.0> + <version.org.slf4j>1.7.2.redhat-2</version.org.slf4j> + <version.org.jboss.spec.jboss.javaee.6.0>3.0.2.Final-redhat-7</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>4.2.7.SP1-redhat-3</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.4.0.Final-redhat-wfk-2</version.org.hibernate.search> + <version.org.hibernate.search>4.4.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.infinispan>5.2.7.Final-redhat-1</version.infinispan> <version.org.jboss.staxmapper>1.1.0.Final-redhat-2</version.org.jboss.staxmapper> - <version.org.jgroups>3.2.10.Final-redhat-2</version.org.jgroups> - <version.org.slf4j>1.7.2-redhat-1</version.org.slf4j> + <version.org.jgroups>3.2.12.Final-redhat-1</version.org.jgroups> <!-- Test frameworks --> - <version.junit>4.10</version.junit> - <version.org.testng>5.14.10</version.org.testng> + <version.junit>4.10</version.junit> + <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.2.0.Final</version.org.jboss.arquillian.extension.drone> + <version.org.jboss.arquillian.extension.drone>1.2.2.Final</version.org.jboss.arquillian.extension.drone> <version.org.jboss.arquillian.graphene>2.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> + <version.org.jboss.shrinkwrap.resolver>2.0.2</version.org.jboss.shrinkwrap.resolver> <!-- other version properties https://issues.jboss.org/browse/WFK2-243 --> <version.antlr>2.7.6</version.antlr> Modified: branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml =================================================================== --- branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml 2014-01-22 15:53:10 UTC (rev 15653) +++ branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml 2014-01-29 08:51:35 UTC (rev 15654) @@ -12,7 +12,7 @@ <mkdir dir="${test.lib.dir}"/> <aether:resolve> <aether:dependencies> - <aether:dependency groupid="org.jboss.shrinkwrap.resolver" artifactid="shrinkwrap-resolver-depchain" type="pom" version="2.0.0"/> + <aether:dependency groupid="org.jboss.shrinkwrap.resolver" artifactid="shrinkwrap-resolver-depchain" type="pom" version="2.0.2"/> <aether:dependency groupid="org.jboss.shrinkwrap" artifactid="shrinkwrap-api" type="pom" version="1.1.2"/> <aether:dependency groupid="org.jboss.as" artifactid="jboss-as-arquillian-container-remote" version="${version.jboss-as7}"> <aether:exclusion groupid="org.jboss.shrinkwrap.resolver" /> Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2014-01-22 15:53:10 UTC (rev 15653) +++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2014-01-29 08:51:35 UTC (rev 15654) @@ -857,4 +857,10 @@ return ( (SessionImplementor) delegate).list(criteria); } + @Override + public void removeOrphanBeforeUpdates(String arg0, Object arg1) + { + ((EventSource) delegate).removeOrphanBeforeUpdates(arg0, arg1); + } + } Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2014-01-22 15:53:10 UTC (rev 15653) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2014-01-29 08:51:35 UTC (rev 15654) @@ -119,14 +119,14 @@ <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-api-base-2.0.0-alpha-3.jar"/> <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-spi-2.0.0-alpha-3.jar"/> <classpathentry kind="lib" path="lib/test/shrinkwrap-impl-base-1.1.2.jar"/> - <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-2.0.0.jar"/> - <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-maven-2.0.0.jar"/> - <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-maven-archive-2.0.0.jar"/> - <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-impl-maven-2.0.0.jar"/> - <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-impl-maven-archive-2.0.0.jar"/> - <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-spi-2.0.0.jar"/> - <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-spi-maven-2.0.0.jar"/> - <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-spi-maven-archive-2.0.0.jar"/> + <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-2.0.2.jar"/> + <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-maven-2.0.2.jar"/> + <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-maven-archive-2.0.2.jar"/> + <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-impl-maven-2.0.2.jar"/> + <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-impl-maven-archive-2.0.2.jar"/> + <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-spi-2.0.2.jar"/> + <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-spi-maven-2.0.2.jar"/> + <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-spi-maven-archive-2.0.2.jar"/> <classpathentry kind="lib" path="lib/test/shrinkwrap-spi-1.1.2.jar"/> <classpathentry kind="lib" path="lib/test/staxmapper-1.1.0.Final.jar"/> <classpathentry kind="lib" path="lib/test/validation-api-1.0.0.GA.jar"/> Modified: branches/enterprise/WFK-2_1/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/pom.xml 2014-01-22 15:53:10 UTC (rev 15653) +++ branches/enterprise/WFK-2_1/pom.xml 2014-01-29 08:51:35 UTC (rev 15654) @@ -47,7 +47,7 @@ <!-- Version string properties --> <version.seam>2.3.3.Final-redhat-1</version.seam> <version.jacoco>0.5.8.201207111220</version.jacoco> - <version.jbossas7>7.2.1.Final-redhat-10</version.jbossas7> + <version.jbossas7>7.3.0.Final-redhat-14</version.jbossas7> <version.arquillian-jbossas7-container>7.2.0.Final</version.arquillian-jbossas7-container> <version.emma>2.0.5312</version.emma> <version.richfaces.cdk>4.3.1.Final-redhat-3</version.richfaces.cdk> @@ -113,7 +113,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>2.2.5-redhat-5</version> + <version>2.2.5.redhat-7</version> </dependency> </dependencies> </dependencyManagement>