Repository: tomee Updated Branches: refs/heads/master b9c99d0d0 -> fbc4b38f2
Exclude Guava Update org.jboss.arquillian.junit:arquillian-junit-container:1.1.10.Final Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fbc4b38f Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fbc4b38f Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fbc4b38f Branch: refs/heads/master Commit: fbc4b38f2daca71587d1736773d7c4d6d3f3a11b Parents: b9c99d0 Author: AndyGee <[email protected]> Authored: Thu Dec 31 11:27:40 2015 +0100 Committer: AndyGee <[email protected]> Committed: Thu Dec 31 11:27:40 2015 +0100 ---------------------------------------------------------------------- examples/arquillian-jpa/pom.xml | 2 +- examples/bval-evaluation-redeployment/pom.xml | 2 +- examples/cdi-realm/pom.xml | 2 +- examples/datasource-versioning/pom.xml | 10 ++++++++-- examples/groovy-spock/pom.xml | 2 +- examples/moviefun/pom.xml | 4 ++-- examples/multiple-arquillian-adapters/pom.xml | 2 +- examples/multiple-tomee-arquillian/pom.xml | 2 +- examples/projectstage-demo/pom.xml | 2 +- examples/resources-jmx-example/resources-jmx-ejb/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- pom.xml | 4 ++-- server/openejb-bonecp/pom.xml | 2 +- server/openejb-cxf/pom.xml | 4 ++++ 14 files changed, 27 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/arquillian-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/examples/arquillian-jpa/pom.xml b/examples/arquillian-jpa/pom.xml index 3687424..fc569ae 100644 --- a/examples/arquillian-jpa/pom.xml +++ b/examples/arquillian-jpa/pom.xml @@ -17,7 +17,7 @@ <version>1.1.0-SNAPSHOT</version> <properties> - <arquillian.version>1.1.5.Final</arquillian.version> + <arquillian.version>1.1.10.Final</arquillian.version> <arquillian-persistence.version>1.0.0.Alpha7</arquillian-persistence.version> <tomee.version>7.0.0-SNAPSHOT</tomee.version> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/bval-evaluation-redeployment/pom.xml ---------------------------------------------------------------------- diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml index 7a2cf7c..1a6dbf2 100644 --- a/examples/bval-evaluation-redeployment/pom.xml +++ b/examples/bval-evaluation-redeployment/pom.xml @@ -121,7 +121,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/cdi-realm/pom.xml ---------------------------------------------------------------------- diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml index 484f25e..1abbd57 100644 --- a/examples/cdi-realm/pom.xml +++ b/examples/cdi-realm/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/datasource-versioning/pom.xml ---------------------------------------------------------------------- diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml index 07feb85..71dc0cd 100644 --- a/examples/datasource-versioning/pom.xml +++ b/examples/datasource-versioning/pom.xml @@ -114,7 +114,7 @@ <dependency> <groupId>org.jboss.arquillian</groupId> <artifactId>arquillian-bom</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>import</scope> <type>pom</type> </dependency> @@ -131,7 +131,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> @@ -145,6 +145,12 @@ <artifactId>shrinkwrap-resolver-depchain</artifactId> <type>pom</type> <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/groovy-spock/pom.xml ---------------------------------------------------------------------- diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml index 871dc09..38aea77 100644 --- a/examples/groovy-spock/pom.xml +++ b/examples/groovy-spock/pom.xml @@ -127,7 +127,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/moviefun/pom.xml ---------------------------------------------------------------------- diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml index 0ad33a0..02e026e 100644 --- a/examples/moviefun/pom.xml +++ b/examples/moviefun/pom.xml @@ -123,7 +123,7 @@ <dependency> <groupId>org.jboss.arquillian</groupId> <artifactId>arquillian-bom</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>import</scope> <type>pom</type> </dependency> @@ -180,7 +180,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/multiple-arquillian-adapters/pom.xml ---------------------------------------------------------------------- diff --git a/examples/multiple-arquillian-adapters/pom.xml b/examples/multiple-arquillian-adapters/pom.xml index 005187d..ba36f61 100644 --- a/examples/multiple-arquillian-adapters/pom.xml +++ b/examples/multiple-arquillian-adapters/pom.xml @@ -31,7 +31,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <tomee.version>7.0.0-SNAPSHOT</tomee.version> - <arquillian.version>1.1.5.Final</arquillian.version> + <arquillian.version>1.1.10.Final</arquillian.version> </properties> <build> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/multiple-tomee-arquillian/pom.xml ---------------------------------------------------------------------- diff --git a/examples/multiple-tomee-arquillian/pom.xml b/examples/multiple-tomee-arquillian/pom.xml index aa1c0a9..cff2653 100644 --- a/examples/multiple-tomee-arquillian/pom.xml +++ b/examples/multiple-tomee-arquillian/pom.xml @@ -98,7 +98,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/projectstage-demo/pom.xml ---------------------------------------------------------------------- diff --git a/examples/projectstage-demo/pom.xml b/examples/projectstage-demo/pom.xml index 6220ee3..f2b9acd 100644 --- a/examples/projectstage-demo/pom.xml +++ b/examples/projectstage-demo/pom.xml @@ -55,7 +55,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/examples/resources-jmx-example/resources-jmx-ejb/pom.xml ---------------------------------------------------------------------- diff --git a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml index 76d2bd5..c6b34a6 100644 --- a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml +++ b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml @@ -74,7 +74,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.7.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml index 64b833d..cfee53c 100644 --- a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> @@ -69,7 +69,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> + <version>1.1.10.Final</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f5ca736..878a20d 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ <batchee.version>0.2-incubating</batchee.version> - <version.arquillian>1.1.8.Final</version.arquillian> + <version.arquillian>1.1.10.Final</version.arquillian> <version.shrinkwrap.descriptor>2.0.0-alpha-7</version.shrinkwrap.descriptor> <version.shrinkwrap.shrinkwrap>1.2.2</version.shrinkwrap.shrinkwrap> @@ -183,7 +183,7 @@ <version.groovy>2.4.2</version.groovy> <!-- arquillian related --> - <version.arquillian.bom>1.1.5.Final</version.arquillian.bom> + <version.arquillian.bom>1.1.10.Final</version.arquillian.bom> <version.shrinkwrap.resolver.bom>2.1.0</version.shrinkwrap.resolver.bom> </properties> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/server/openejb-bonecp/pom.xml ---------------------------------------------------------------------- diff --git a/server/openejb-bonecp/pom.xml b/server/openejb-bonecp/pom.xml index 702034d..821d1ff 100644 --- a/server/openejb-bonecp/pom.xml +++ b/server/openejb-bonecp/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>com.jolbox</groupId> <artifactId>bonecp</artifactId> - <version>0.7.1.RELEASE</version> + <version>0.8.0.RELEASE</version> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/fbc4b38f/server/openejb-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml index 82bbd3c..ee2b07e 100644 --- a/server/openejb-cxf/pom.xml +++ b/server/openejb-cxf/pom.xml @@ -73,6 +73,10 @@ <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </exclusion> + <exclusion> + <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + </exclusion> </exclusions> </dependency> <dependency>
