Merge branch 'master' into fb_tomee8
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b06d4b72 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b06d4b72 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b06d4b72 Branch: refs/heads/fb_tomee8 Commit: b06d4b7233080afd2f63ca69856f2e269d5ae43e Parents: e76a37b 1f90ee2 Author: Mark Struberg <strub...@apache.org> Authored: Mon Oct 23 17:31:57 2017 +0200 Committer: Mark Struberg <strub...@apache.org> Committed: Mon Oct 23 17:31:57 2017 +0200 ---------------------------------------------------------------------- arquillian/arquillian-tomee-remote/pom.xml | 2 +- container/openejb-core/pom.xml | 8 +- .../openejb/batchee/BatchEEServiceManager.java | 18 ++- .../persistence/PersistenceBootstrap.java | 2 +- .../activemq/jms2/TomEEXAConnection.java | 16 +++ .../classic/AppNamingReadOnlyTest.java | 16 +++ .../core/ivm/EjbObjectInputStreamTest.java | 16 +++ .../stateless/StatelessInvocationStatsTest.java | 127 ++++++++++--------- container/openejb-jee/pom.xml | 3 + .../loader/provisining/MavenResolver.java | 56 +++++--- .../openejb/observer/ObserverManager.java | 2 +- .../loader/provisining/MavenResolverTest.java | 16 ++- .../superbiz/example/jaxws/MeetingPlanner.java | 3 + .../example/jaxws/MeetingPlannerTest.java | 19 ++- .../WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml | 6 - .../WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml | 6 - examples/bval-evaluation-redeployment/pom.xml | 20 +-- .../org/superbiz/rest/GreetingServiceTest.java | 2 + examples/webservice-ws-security/pom.xml | 2 +- maven/pom.xml | 14 +- pom.xml | 68 ++++++---- rat.xml | 3 + .../server/cxf/rs/JSonStreamingOutputTest.java | 16 +++ server/openejb-hsql/pom.xml | 1 + server/pom.xml | 7 + tck/cdi-embedded/pom.xml | 10 +- tck/cdi-tomee/pom.xml | 2 +- tck/cdi-tomee/src/test/resources/arquillian.xml | 2 +- tomee/pom.xml | 2 +- tomee/tomee-embedded/pom.xml | 5 +- tomee/tomee-juli/pom.xml | 1 - .../jul/handler/rotating/ArchivingTest.java | 125 +++++++++++++----- .../tomee/webaccess/test/units/LogTest.groovy | 9 +- tomee/tomee-webapp/pom.xml | 7 +- .../src/main/resources/META-INF/LICENSE | 18 +-- .../src/main/resources/js/livereload.js | 9 ++ 36 files changed, 437 insertions(+), 202 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/arquillian/arquillian-tomee-remote/pom.xml ---------------------------------------------------------------------- diff --cc arquillian/arquillian-tomee-remote/pom.xml index 1d38c74,133601f..72e7a56 --- a/arquillian/arquillian-tomee-remote/pom.xml +++ b/arquillian/arquillian-tomee-remote/pom.xml @@@ -154,7 -154,7 +154,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-impl</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/container/openejb-core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/container/openejb-jee/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/examples/bval-evaluation-redeployment/pom.xml ---------------------------------------------------------------------- diff --cc examples/bval-evaluation-redeployment/pom.xml index 23e0e7d,d257023..145e75f --- a/examples/bval-evaluation-redeployment/pom.xml +++ b/examples/bval-evaluation-redeployment/pom.xml @@@ -64,8 -64,8 +64,8 @@@ <dependencies> <dependency> <groupId>org.apache.tomee</groupId> - <artifactId>javaee-api</artifactId> - <version>8.0-SNAPSHOT</version> + <artifactId>javaee-api</artifactId> - <version>7.0-1</version> ++ <version>8.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/examples/webservice-ws-security/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/maven/pom.xml ---------------------------------------------------------------------- diff --cc maven/pom.xml index ad5e66f,4a037f8..0ea17e4 --- a/maven/pom.xml +++ b/maven/pom.xml @@@ -27,11 -27,11 +27,14 @@@ </parent> <groupId>org.apache.tomee.maven</groupId> - <version>8.0.0-SNAPSHOT</version> - <version>7.0.5-SNAPSHOT</version> <artifactId>maven</artifactId> <packaging>pom</packaging> <name>OpenEJB :: Maven Plugins</name> ++ <properties> ++ <maven.version>2.2.1</maven.version> ++ </properties> ++ <modules> <module>tomee-maven-plugin</module> <module>tomee-embedded-maven-plugin</module> @@@ -92,9 -92,9 +95,12 @@@ </dependencies> </dependencyManagement> -- <properties> -- <maven.version>2.2.1</maven.version> -- </properties> ++ <dependencies> ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ </dependency> ++ </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 890bc6a,718f6e1..2f02617 --- a/pom.xml +++ b/pom.xml @@@ -94,16 -94,16 +94,17 @@@ <properties> <tomee.version>${project.version}</tomee.version> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> ++ <surefire.version>2.20</surefire.version> <!-- To easily change the javaee api version --> - <version.javaee-api>7.0-1</version.javaee-api> + <version.javaee-api>8.0-SNAPSHOT</version.javaee-api> - <openjpa.version>2.4.2</openjpa.version> - <org.apache.openwebbeans.version>1.7.4</org.apache.openwebbeans.version> + <openjpa.version>3.0.0-SNAPSHOT</openjpa.version> - <org.apache.openwebbeans.version>2.0.1-SNAPSHOT</org.apache.openwebbeans.version> ++ <openwebbeans.version>2.0.3-SNAPSHOT</openwebbeans.version> <jcs.version>2.1</jcs.version> - <johnzon.version>1.0.0</johnzon.version> + <johnzon.version>1.1.2</johnzon.version> <!-- Maven module versions --> <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version> @@@ -1464,7 -1459,7 +1460,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-impl</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <exclusions> <exclusion> <groupId>org.apache.xbean</groupId> @@@ -1475,12 -1470,12 +1471,12 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-jsf</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> </dependency> <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-spi</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.specs</groupId> @@@ -1503,7 -1498,7 +1499,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-ejb</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.specs</groupId> @@@ -1522,7 -1517,7 +1518,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-ee</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.specs</groupId> @@@ -1553,7 -1548,7 +1549,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-web</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <exclusions> <exclusion> <groupId>org.apache.xbean</groupId> @@@ -1564,7 -1559,7 +1560,7 @@@ <dependency> <artifactId>openwebbeans-ee-common</artifactId> <groupId>org.apache.openwebbeans</groupId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/server/openejb-hsql/pom.xml ---------------------------------------------------------------------- diff --cc server/openejb-hsql/pom.xml index e4b1217,21e6d66..4335de6 --- a/server/openejb-hsql/pom.xml +++ b/server/openejb-hsql/pom.xml @@@ -61,6 -61,6 +61,7 @@@ <artifactId>commons-pool2</artifactId> <scope>provided</scope> </dependency> ++ </dependencies> </project> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/server/pom.xml ---------------------------------------------------------------------- diff --cc server/pom.xml index c056882,567468c..eb6c518 --- a/server/pom.xml +++ b/server/pom.xml @@@ -52,5 -52,5 +52,12 @@@ <module>openejb-bonecp</module> <module>openejb-hessian</module> </modules> ++ ++ <dependencies> ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ </dependency> ++ </dependencies> </project> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/tck/cdi-embedded/pom.xml ---------------------------------------------------------------------- diff --cc tck/cdi-embedded/pom.xml index 4b6a6bd,5caab6b..12a9483 --- a/tck/cdi-embedded/pom.xml +++ b/tck/cdi-embedded/pom.xml @@@ -92,7 -96,7 +96,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-porting</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <scope>test</scope> <exclusions> <exclusion> @@@ -149,7 -153,7 +153,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-jsf</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/tck/cdi-tomee/pom.xml ---------------------------------------------------------------------- diff --cc tck/cdi-tomee/pom.xml index 67f5ed0,940d03c..1650699 --- a/tck/cdi-tomee/pom.xml +++ b/tck/cdi-tomee/pom.xml @@@ -83,7 -83,7 +83,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-porting</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> <scope>test</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/tck/cdi-tomee/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --cc tck/cdi-tomee/src/test/resources/arquillian.xml index d052b35,d052b35..693016d --- a/tck/cdi-tomee/src/test/resources/arquillian.xml +++ b/tck/cdi-tomee/src/test/resources/arquillian.xml @@@ -56,7 -56,7 +56,7 @@@ <property name="additionalLibs"> target/test-classes/org target/test-classes/META-INF -- mvn:org.apache.openwebbeans:openwebbeans-porting:${org.apache.openwebbeans.version} ++ mvn:org.apache.openwebbeans:openwebbeans-porting:${openwebbeans.version} mvn:org.jboss.cdi.tck:cdi-tck-ext-lib:${cdi-tck.version} </property> </configuration> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/tomee/pom.xml ---------------------------------------------------------------------- diff --cc tomee/pom.xml index db03dad,9d04904..b05ddc4 --- a/tomee/pom.xml +++ b/tomee/pom.xml @@@ -287,7 -287,7 +287,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-jsf</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/tomee/tomee-embedded/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/tomee/tomee-juli/pom.xml ---------------------------------------------------------------------- diff --cc tomee/tomee-juli/pom.xml index 7c57902,8492af2..9de4bff --- a/tomee/tomee-juli/pom.xml +++ b/tomee/tomee-juli/pom.xml @@@ -1,6 -1,6 +1,5 @@@ <?xml version="1.0" encoding="UTF-8"?> <!-- -- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/tomee/blob/b06d4b72/tomee/tomee-webapp/pom.xml ---------------------------------------------------------------------- diff --cc tomee/tomee-webapp/pom.xml index 877aa01,fbc3d24..c538123 --- a/tomee/tomee-webapp/pom.xml +++ b/tomee/tomee-webapp/pom.xml @@@ -227,7 -230,7 +230,7 @@@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-jsf</artifactId> -- <version>${org.apache.openwebbeans.version}</version> ++ <version>${openwebbeans.version}</version> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId>