tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: some plugin updates
Date Tue, 02 May 2017 21:41:40 GMT
Repository: tomee
Updated Branches:
  refs/heads/master 55a598e40 -> 05de12823


some plugin updates


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/05de1282
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/05de1282
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/05de1282

Branch: refs/heads/master
Commit: 05de12823216cbda5c3fcf41b789fb8a16343da8
Parents: 55a598e
Author: rmannibucau <rmannibucau@apache.org>
Authored: Tue May 2 23:41:30 2017 +0200
Committer: rmannibucau <rmannibucau@apache.org>
Committed: Tue May 2 23:41:30 2017 +0200

----------------------------------------------------------------------
 .../core/webservices/ProviderWrapper.java       |  6 ++-
 .../core/webservices/ProviderWrapperTest.java   |  2 +-
 .../apache/openejb/loader/TomcatClassPath.java  |  2 +-
 examples/bval-evaluation-redeployment/pom.xml   |  4 +-
 examples/cdi-ejbcontext-jaas/pom.xml            |  2 +-
 examples/cdi-realm/pom.xml                      |  2 +-
 examples/cdi-session-scope/pom.xml              |  2 +-
 examples/change-jaxws-url/pom.xml               |  2 +-
 examples/deltaspike-fullstack/pom.xml           |  5 ++
 examples/ejb-examples/pom.xml                   |  5 ++
 examples/ejb-webservice/pom.xml                 |  5 ++
 examples/groovy-cdi/pom.xml                     | 45 +++++++++-------
 .../src/main/groovy/org/superbiz/Hello.groovy   | 24 +++++++++
 .../main/java/org/superbiz/groovy/Hello.groovy  | 24 ---------
 .../groovy/org/superbiz/groovy/HelloTest.groovy | 53 ++++++++++++++++++
 .../java/org/superbiz/groovy/HelloTest.groovy   | 53 ------------------
 examples/groovy-jpa/pom.xml                     | 45 +++++++++-------
 examples/groovy-spock/pom.xml                   | 47 ++++++++--------
 .../groovy/org/superbiz/groovy/Hello.groovy     | 29 ++++++++++
 .../main/java/org/superbiz/groovy/Hello.groovy  | 29 ----------
 .../superbiz/groovy/HelloSpecification.groovy   | 56 ++++++++++++++++++++
 .../superbiz/groovy/HelloSpecification.groovy   | 56 --------------------
 examples/jsf-cdi-and-ejb/pom.xml                |  5 ++
 examples/jsf-managedBean-and-ejb/pom.xml        |  5 ++
 examples/moviefun-rest/pom.xml                  |  5 ++
 examples/moviefun/pom.xml                       |  5 ++
 examples/myfaces-codi-demo/pom.xml              |  5 ++
 examples/pojo-webservice/pom.xml                |  5 ++
 examples/polling-parent/polling-web/pom.xml     |  2 +-
 examples/realm-in-tomee/pom.xml                 |  2 +-
 examples/resources-declared-in-webapp/pom.xml   |  2 +-
 examples/rest-example-with-application/pom.xml  |  2 +-
 examples/rest-example/pom.xml                   |  2 +-
 examples/rest-jaas/pom.xml                      |  2 +-
 examples/scala-basic/build.sbt                  |  4 +-
 examples/scala-basic/pom.xml                    | 19 +++++--
 examples/struts/pom.xml                         |  5 ++
 examples/tomee-jersey-eclipselink/pom.xml       |  5 ++
 itests/openejb-itests-web/pom.xml               | 10 ++++
 .../main/resources/archetype-resources/pom.xml  |  4 +-
 pom.xml                                         | 18 +++++--
 .../openejb/client/JaxWsProviderWrapper.java    |  5 +-
 .../client/JaxWsProviderWrapperTest.java        |  2 +-
 tomee/apache-tomee/pom.xml                      | 17 +++++-
 tomee/tomee-juli/pom.xml                        |  2 +-
 tomee/tomee-webaccess/pom.xml                   | 40 ++++++++------
 46 files changed, 402 insertions(+), 269 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
index 9ab14ad..a1314dd 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
@@ -61,6 +61,8 @@ import java.util.concurrent.Executor;
 public class ProviderWrapper extends Provider {
     public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_WS, ProviderWrapper.class);
 
+    private static final String JAXWSPROVIDER_PROPERTY = Provider.class.getName();
+
     //
     // Magic to get our provider wrapper installed with the PortRefData
     //
@@ -77,7 +79,9 @@ public class ProviderWrapper extends Provider {
             JavaSecurityManagers.setSystemProperty(JAXWSPROVIDER_PROPERTY, ProviderWrapper.class.getName());
         }
 
-        JavaSecurityManagers.setSystemProperty(JAXWSPROVIDER_PROPERTY, ProviderWrapper.class.getName());
+        if (oldProperty == null || !oldProperty.equals(ProviderWrapper.class.getName())) {
+            JavaSecurityManagers.setSystemProperty(JAXWSPROVIDER_PROPERTY, ProviderWrapper.class.getName());
+        }
 
         final ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
         if (oldClassLoader != null) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/ProviderWrapperTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/ProviderWrapperTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/ProviderWrapperTest.java
index 7c7c99c..706f145 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/ProviderWrapperTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/ProviderWrapperTest.java
@@ -33,7 +33,7 @@ import java.util.List;
 
 public class ProviderWrapperTest extends TestCase {
     public void test() throws Exception {
-        System.setProperty(Provider.JAXWSPROVIDER_PROPERTY, MockProvider.class.getName());
+        System.setProperty(Provider.class.getName(), MockProvider.class.getName());
         Provider provider = Provider.provider();
         assertNotNull("provider is null", provider);
         assertFalse("provider should not be an instance of ProviderWrapper", provider instanceof ProviderWrapper);

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
index 8ac2d0a..9bbd71c 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
@@ -53,7 +53,7 @@ public class TomcatClassPath extends BasicURLClassPath {
         try {
             addRepositoryMethod = getAddRepositoryMethod();
         } catch (final Exception e) {
-            throw new IllegalStateException("Ensure you use the right tomcat version");
+            throw new IllegalStateException("Ensure you use the right tomcat version (" + e.getMessage() + ")");
         }
 
         final ClassLoader serverLoader = getServerLoader(getContextClassLoader());

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/bval-evaluation-redeployment/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml
index fa49de6..1cc3474 100644
--- a/examples/bval-evaluation-redeployment/pom.xml
+++ b/examples/bval-evaluation-redeployment/pom.xml
@@ -44,12 +44,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>3.6.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.4</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/cdi-ejbcontext-jaas/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-ejbcontext-jaas/pom.xml b/examples/cdi-ejbcontext-jaas/pom.xml
index 5abe2c0..b768f47 100644
--- a/examples/cdi-ejbcontext-jaas/pom.xml
+++ b/examples/cdi-ejbcontext-jaas/pom.xml
@@ -69,7 +69,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/cdi-realm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml
index 4d14961..a03b441 100644
--- a/examples/cdi-realm/pom.xml
+++ b/examples/cdi-realm/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.1.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/cdi-session-scope/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-session-scope/pom.xml b/examples/cdi-session-scope/pom.xml
index 3df12bc..9f7645f 100644
--- a/examples/cdi-session-scope/pom.xml
+++ b/examples/cdi-session-scope/pom.xml
@@ -37,7 +37,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/change-jaxws-url/pom.xml
----------------------------------------------------------------------
diff --git a/examples/change-jaxws-url/pom.xml b/examples/change-jaxws-url/pom.xml
index 711506b..a73c35a 100644
--- a/examples/change-jaxws-url/pom.xml
+++ b/examples/change-jaxws-url/pom.xml
@@ -67,7 +67,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index 4f70fe9..291b2f3 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -41,6 +41,11 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-maven-plugin</artifactId>
         <version>2.4.0</version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/ejb-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml
index ebc6e3b..62dea5f 100644
--- a/examples/ejb-examples/pom.xml
+++ b/examples/ejb-examples/pom.xml
@@ -55,6 +55,11 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
         <version>7.0.4-SNAPSHOT</version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/ejb-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ejb-webservice/pom.xml b/examples/ejb-webservice/pom.xml
index 0f92925..895ba4b 100644
--- a/examples/ejb-webservice/pom.xml
+++ b/examples/ejb-webservice/pom.xml
@@ -47,6 +47,11 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.5.1</version>
         <configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index b31ecee..afcb47b 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -38,29 +38,24 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.6.1</version>
         <configuration>
-          <compilerId>groovy-eclipse-compiler</compilerId>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.8.0-01</version>
-          </dependency>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.1.8-01</version>
-          </dependency>
-          <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.contenttype</artifactId>
-            <version>3.4.100.v20100505-1235</version>
-          </dependency>
-        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
+        <version>1.5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
@@ -83,7 +78,17 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <version>2.3.0</version>
+      <version>2.5.0-alpha-1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.2.11</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-cdi/src/main/groovy/org/superbiz/Hello.groovy
----------------------------------------------------------------------
diff --git a/examples/groovy-cdi/src/main/groovy/org/superbiz/Hello.groovy b/examples/groovy-cdi/src/main/groovy/org/superbiz/Hello.groovy
new file mode 100644
index 0000000..75b9569
--- /dev/null
+++ b/examples/groovy-cdi/src/main/groovy/org/superbiz/Hello.groovy
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.superbiz.groovy
+
+class Hello {
+
+    def hi() {
+        "hi"
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-cdi/src/main/java/org/superbiz/groovy/Hello.groovy
----------------------------------------------------------------------
diff --git a/examples/groovy-cdi/src/main/java/org/superbiz/groovy/Hello.groovy b/examples/groovy-cdi/src/main/java/org/superbiz/groovy/Hello.groovy
deleted file mode 100644
index 75b9569..0000000
--- a/examples/groovy-cdi/src/main/java/org/superbiz/groovy/Hello.groovy
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.superbiz.groovy
-
-class Hello {
-
-    def hi() {
-        "hi"
-    }
-}

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-cdi/src/test/groovy/org/superbiz/groovy/HelloTest.groovy
----------------------------------------------------------------------
diff --git a/examples/groovy-cdi/src/test/groovy/org/superbiz/groovy/HelloTest.groovy b/examples/groovy-cdi/src/test/groovy/org/superbiz/groovy/HelloTest.groovy
new file mode 100644
index 0000000..f2b259d
--- /dev/null
+++ b/examples/groovy-cdi/src/test/groovy/org/superbiz/groovy/HelloTest.groovy
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.superbiz.groovy
+
+import org.apache.ziplock.JarLocation
+import org.jboss.arquillian.container.test.api.Deployment
+import org.jboss.arquillian.junit.Arquillian
+import org.jboss.shrinkwrap.api.ArchivePaths
+import org.jboss.shrinkwrap.api.ShrinkWrap
+import org.jboss.shrinkwrap.api.asset.EmptyAsset
+import org.jboss.shrinkwrap.api.spec.WebArchive
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import javax.inject.Inject
+
+import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertNotNull
+
+@RunWith(Arquillian.class)
+class HelloTest {
+
+    @Inject
+    private Hello hello
+
+    @Deployment
+    static WebArchive war() {
+        ShrinkWrap.create(WebArchive.class)
+                  .addAsLibraries(JarLocation.jarLocation(GroovyObject.class))
+                  .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
+                  .addClasses(Hello.class)
+    }
+
+    @Test
+    void hello() {
+        assertNotNull hello
+        assertEquals "hi", hello.hi()
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-cdi/src/test/java/org/superbiz/groovy/HelloTest.groovy
----------------------------------------------------------------------
diff --git a/examples/groovy-cdi/src/test/java/org/superbiz/groovy/HelloTest.groovy b/examples/groovy-cdi/src/test/java/org/superbiz/groovy/HelloTest.groovy
deleted file mode 100644
index f2b259d..0000000
--- a/examples/groovy-cdi/src/test/java/org/superbiz/groovy/HelloTest.groovy
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.superbiz.groovy
-
-import org.apache.ziplock.JarLocation
-import org.jboss.arquillian.container.test.api.Deployment
-import org.jboss.arquillian.junit.Arquillian
-import org.jboss.shrinkwrap.api.ArchivePaths
-import org.jboss.shrinkwrap.api.ShrinkWrap
-import org.jboss.shrinkwrap.api.asset.EmptyAsset
-import org.jboss.shrinkwrap.api.spec.WebArchive
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import javax.inject.Inject
-
-import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertNotNull
-
-@RunWith(Arquillian.class)
-class HelloTest {
-
-    @Inject
-    private Hello hello
-
-    @Deployment
-    static WebArchive war() {
-        ShrinkWrap.create(WebArchive.class)
-                  .addAsLibraries(JarLocation.jarLocation(GroovyObject.class))
-                  .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
-                  .addClasses(Hello.class)
-    }
-
-    @Test
-    void hello() {
-        assertNotNull hello
-        assertEquals "hi", hello.hi()
-    }
-}

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index 398a355..f48e5ae 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -39,29 +39,24 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.6.1</version>
         <configuration>
-          <compilerId>groovy-eclipse-compiler</compilerId>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.8.0-01</version>
-          </dependency>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.1.8-01</version>
-          </dependency>
-          <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.contenttype</artifactId>
-            <version>3.4.100.v20100505-1235</version>
-          </dependency>
-        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
+        <version>1.5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
@@ -84,7 +79,17 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <version>2.3.0</version>
+      <version>2.5.0-alpha-1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.2.11</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-spock/pom.xml
----------------------------------------------------------------------
diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml
index 03fef2f..22be2ae 100644
--- a/examples/groovy-spock/pom.xml
+++ b/examples/groovy-spock/pom.xml
@@ -37,29 +37,24 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.6.1</version>
         <configuration>
-          <compilerId>groovy-eclipse-compiler</compilerId>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.8.0-01</version>
-          </dependency>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.1.8-01</version>
-          </dependency>
-          <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.contenttype</artifactId>
-            <version>3.4.100.v20100505-1235</version>
-          </dependency>
-        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
+        <version>1.5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -93,7 +88,17 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <version>2.3.0</version>
+      <version>2.5.0-alpha-1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.2.11</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -128,7 +133,7 @@
     <dependency>
       <groupId>org.spockframework</groupId>
       <artifactId>spock-core</artifactId>
-      <version>0.7-groovy-2.0</version>
+      <version>1.1-groovy-2.4-rc-4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-spock/src/main/groovy/org/superbiz/groovy/Hello.groovy
----------------------------------------------------------------------
diff --git a/examples/groovy-spock/src/main/groovy/org/superbiz/groovy/Hello.groovy b/examples/groovy-spock/src/main/groovy/org/superbiz/groovy/Hello.groovy
new file mode 100644
index 0000000..5141fcc
--- /dev/null
+++ b/examples/groovy-spock/src/main/groovy/org/superbiz/groovy/Hello.groovy
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.superbiz.groovy
+
+class Hello {
+
+    def hi() {
+        "hi"
+    }
+
+    @Override
+    String toString() {
+        "This is the Hello instance";
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-spock/src/main/java/org/superbiz/groovy/Hello.groovy
----------------------------------------------------------------------
diff --git a/examples/groovy-spock/src/main/java/org/superbiz/groovy/Hello.groovy b/examples/groovy-spock/src/main/java/org/superbiz/groovy/Hello.groovy
deleted file mode 100644
index 5141fcc..0000000
--- a/examples/groovy-spock/src/main/java/org/superbiz/groovy/Hello.groovy
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.superbiz.groovy
-
-class Hello {
-
-    def hi() {
-        "hi"
-    }
-
-    @Override
-    String toString() {
-        "This is the Hello instance";
-    }
-}

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-spock/src/test/groovy/org/superbiz/groovy/HelloSpecification.groovy
----------------------------------------------------------------------
diff --git a/examples/groovy-spock/src/test/groovy/org/superbiz/groovy/HelloSpecification.groovy b/examples/groovy-spock/src/test/groovy/org/superbiz/groovy/HelloSpecification.groovy
new file mode 100644
index 0000000..08b0c15
--- /dev/null
+++ b/examples/groovy-spock/src/test/groovy/org/superbiz/groovy/HelloSpecification.groovy
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.superbiz.groovy
+
+import org.apache.ziplock.JarLocation
+import org.jboss.arquillian.container.test.api.Deployment
+import org.jboss.arquillian.spock.ArquillianSputnik
+import org.jboss.shrinkwrap.api.ArchivePaths
+import org.jboss.shrinkwrap.api.ShrinkWrap
+import org.jboss.shrinkwrap.api.asset.EmptyAsset
+import org.jboss.shrinkwrap.api.spec.WebArchive
+import org.junit.runner.RunWith
+
+import javax.inject.Inject
+
+import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertNotNull
+
+@RunWith(ArquillianSputnik.class)
+class HelloSpecification extends spock.lang.Specification {
+
+    @Inject
+    private org.superbiz.groovy.Hello hello
+
+    @Deployment
+    def static WebArchive "create archive"() {
+        ShrinkWrap.create(WebArchive.class)
+                  .addAsLibraries(JarLocation.jarLocation(GroovyObject.class))
+                  .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
+                  .addClasses(Hello.class)
+    }
+
+    def "Hello.hi() method should return 'hi'"() {
+        when:
+        println("Checking hello instance: " + hello)
+        assertNotNull hello
+
+        then:
+        println("Comparing 'hi' to '" + hello.hi() + "'")
+        assertEquals "hi", hello.hi()
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/groovy-spock/src/test/java/org/superbiz/groovy/HelloSpecification.groovy
----------------------------------------------------------------------
diff --git a/examples/groovy-spock/src/test/java/org/superbiz/groovy/HelloSpecification.groovy b/examples/groovy-spock/src/test/java/org/superbiz/groovy/HelloSpecification.groovy
deleted file mode 100644
index 08b0c15..0000000
--- a/examples/groovy-spock/src/test/java/org/superbiz/groovy/HelloSpecification.groovy
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.superbiz.groovy
-
-import org.apache.ziplock.JarLocation
-import org.jboss.arquillian.container.test.api.Deployment
-import org.jboss.arquillian.spock.ArquillianSputnik
-import org.jboss.shrinkwrap.api.ArchivePaths
-import org.jboss.shrinkwrap.api.ShrinkWrap
-import org.jboss.shrinkwrap.api.asset.EmptyAsset
-import org.jboss.shrinkwrap.api.spec.WebArchive
-import org.junit.runner.RunWith
-
-import javax.inject.Inject
-
-import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertNotNull
-
-@RunWith(ArquillianSputnik.class)
-class HelloSpecification extends spock.lang.Specification {
-
-    @Inject
-    private org.superbiz.groovy.Hello hello
-
-    @Deployment
-    def static WebArchive "create archive"() {
-        ShrinkWrap.create(WebArchive.class)
-                  .addAsLibraries(JarLocation.jarLocation(GroovyObject.class))
-                  .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
-                  .addClasses(Hello.class)
-    }
-
-    def "Hello.hi() method should return 'hi'"() {
-        when:
-        println("Checking hello instance: " + hello)
-        assertNotNull hello
-
-        then:
-        println("Comparing 'hi' to '" + hello.hi() + "'")
-        assertEquals "hi", hello.hi()
-    }
-}

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/jsf-cdi-and-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jsf-cdi-and-ejb/pom.xml b/examples/jsf-cdi-and-ejb/pom.xml
index 44e6a7c..8f2a553 100644
--- a/examples/jsf-cdi-and-ejb/pom.xml
+++ b/examples/jsf-cdi-and-ejb/pom.xml
@@ -42,6 +42,11 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tomcat-maven-plugin</artifactId>
         <version>1.0-beta-1</version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/jsf-managedBean-and-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jsf-managedBean-and-ejb/pom.xml b/examples/jsf-managedBean-and-ejb/pom.xml
index 74b0236..7b32cb0 100644
--- a/examples/jsf-managedBean-and-ejb/pom.xml
+++ b/examples/jsf-managedBean-and-ejb/pom.xml
@@ -47,6 +47,11 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
         <version>7.0.4-SNAPSHOT</version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/moviefun-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index 1eecc75..82567e8 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -121,6 +121,11 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.5.1</version>
         <configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/moviefun/pom.xml
----------------------------------------------------------------------
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index dee29fc..6505053 100644
--- a/examples/moviefun/pom.xml
+++ b/examples/moviefun/pom.xml
@@ -88,6 +88,11 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <version>2.9</version>
         <configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/myfaces-codi-demo/pom.xml
----------------------------------------------------------------------
diff --git a/examples/myfaces-codi-demo/pom.xml b/examples/myfaces-codi-demo/pom.xml
index c102086..685ad6e 100644
--- a/examples/myfaces-codi-demo/pom.xml
+++ b/examples/myfaces-codi-demo/pom.xml
@@ -39,6 +39,11 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
         <version>7.0.4-SNAPSHOT</version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/pojo-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index b3fa1b1..7d6c56b 100644
--- a/examples/pojo-webservice/pom.xml
+++ b/examples/pojo-webservice/pom.xml
@@ -60,6 +60,11 @@
           <target>1.7</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
       <plugin> <!-- http://localhost:8080/pojo-webservice?wsdl -->
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/polling-parent/polling-web/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-web/pom.xml b/examples/polling-parent/polling-web/pom.xml
index 4cc6980..88f1669 100644
--- a/examples/polling-parent/polling-web/pom.xml
+++ b/examples/polling-parent/polling-web/pom.xml
@@ -72,7 +72,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.1.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/realm-in-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/examples/realm-in-tomee/pom.xml b/examples/realm-in-tomee/pom.xml
index 13ee75b..ce85af1 100644
--- a/examples/realm-in-tomee/pom.xml
+++ b/examples/realm-in-tomee/pom.xml
@@ -42,7 +42,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.4</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/resources-declared-in-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-declared-in-webapp/pom.xml b/examples/resources-declared-in-webapp/pom.xml
index f2b5fe6..7b7d467 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/pom.xml
@@ -67,7 +67,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>3.1.0</version>
         <configuration>
           <packagingExcludes>WEB-INF/web.xml</packagingExcludes>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/rest-example-with-application/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml
index 38d2e0e..c015862 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -67,7 +67,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>3.1.0</version>
         <configuration>
           <packagingExcludes>WEB-INF/web.xml</packagingExcludes>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/rest-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index 37e268f..efc8946 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -69,7 +69,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>3.1.0</version>
         <configuration>
           <packagingExcludes>WEB-INF/web.xml</packagingExcludes>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/rest-jaas/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml
index d8067ab..ee0b453 100644
--- a/examples/rest-jaas/pom.xml
+++ b/examples/rest-jaas/pom.xml
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.1.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/scala-basic/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-basic/build.sbt b/examples/scala-basic/build.sbt
index 81b7919..56b1bdd 100644
--- a/examples/scala-basic/build.sbt
+++ b/examples/scala-basic/build.sbt
@@ -27,8 +27,8 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "org.apache.openejb" % "javaee-api" % "7.0-SNAPSHOT",
-  "org.apache.openejb" % "openejb-core" % "7.0.0-SNAPSHOT" % "test",
+  "org.apache.openejb" % "javaee-api" % "7.0-1",
+  "org.apache.openejb" % "openejb-core" % "7.0.4-SNAPSHOT" % "test",
   "org.scalatest" %% "scalatest_2.11" % "2.2.0" % "test"
 )
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/scala-basic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml
index ff4f614..e89e343 100644
--- a/examples/scala-basic/pom.xml
+++ b/examples/scala-basic/pom.xml
@@ -31,7 +31,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <scala.version>2.11</scala.version>
-    <scala.full-version>${scala.version}.6</scala.full-version>
+    <scala.full-version>${scala.version}.9</scala.full-version>
   </properties>
 
   <repositories>
@@ -63,7 +63,7 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.1.6</version>
+        <version>3.2.2</version>
         <executions>
           <execution>
             <goals>
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.version}</artifactId>
-      <version>2.2.0</version>
+      <version>3.0.3</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -164,4 +164,17 @@
       <url>file://${basedir}/target/snapshot-repo/</url>
     </snapshotRepository>
   </distributionManagement>
+
+  <profiles>
+    <profile>
+      <id>java9</id>
+      <activation>
+        <jdk>9</jdk>
+      </activation>
+      <properties>
+        <scala.version>2.12</scala.version>
+        <scala.full-version>${scala.version}.2</scala.full-version>
+      </properties>
+    </profile>
+  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/struts/pom.xml
----------------------------------------------------------------------
diff --git a/examples/struts/pom.xml b/examples/struts/pom.xml
index cef5f3c..d91c700 100644
--- a/examples/struts/pom.xml
+++ b/examples/struts/pom.xml
@@ -58,6 +58,11 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.5.1</version>
         <configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/examples/tomee-jersey-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tomee-jersey-eclipselink/pom.xml b/examples/tomee-jersey-eclipselink/pom.xml
index d4a81c1..8873142 100644
--- a/examples/tomee-jersey-eclipselink/pom.xml
+++ b/examples/tomee-jersey-eclipselink/pom.xml
@@ -90,6 +90,11 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+      <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
         <version>7.0.4-SNAPSHOT</version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/itests/openejb-itests-web/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-web/pom.xml b/itests/openejb-itests-web/pom.xml
index 2fa9415..58128d1 100644
--- a/itests/openejb-itests-web/pom.xml
+++ b/itests/openejb-itests-web/pom.xml
@@ -51,5 +51,15 @@
       <scope>runtime</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+    </plugins>
+  </build>
 </project>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/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 88d8189..ccf4459 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
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.6.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -96,7 +96,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.6</version>
+        <version>3.1.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d20cc3..4378405 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@
     <version.xalan>2.7.1</version.xalan>
     <version.hibernate>4.2.18.Final</version.hibernate>
     <version.eclipselink>2.6.3</version.eclipselink>
-    <version.groovy>2.4.2</version.groovy>
+    <version.groovy>2.5.0-alpha-1</version.groovy>
 
     <!-- arquillian related -->
     <version.arquillian.bom>1.1.10.Final</version.arquillian.bom>
@@ -195,6 +195,11 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
           <version>${maven-bundle-plugin.version}</version>
@@ -234,7 +239,14 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-ear-plugin</artifactId>
-          <version>2.10</version>
+          <version>2.10.1</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.codehaus.plexus</groupId>
+              <artifactId>plexus-archiver</artifactId>
+              <version>3.4</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -254,7 +266,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.2</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.swizzle</groupId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java
----------------------------------------------------------------------
diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java b/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java
index f0fde52..f82ac9d 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java
@@ -66,6 +66,7 @@ public class JaxWsProviderWrapper extends Provider {
     //
 
     private static final ThreadLocal<ProviderWrapperData> threadPortRefs = new ThreadLocal<ProviderWrapperData>();
+    private static final String JAXWSPROVIDER_PROPERTY = Provider.class.getName();
 
     public static void beforeCreate(final List<PortRefMetaData> portRefMetaDatas) {
         // Axis JAXWS api is non compliant and checks system property before classloader
@@ -76,7 +77,9 @@ public class JaxWsProviderWrapper extends Provider {
             System.setProperty("openejb." + JAXWSPROVIDER_PROPERTY, oldProperty);
         }
 
-        System.setProperty(JAXWSPROVIDER_PROPERTY, JaxWsProviderWrapper.class.getName());
+        if (oldProperty == null || !oldProperty.equals(JaxWsProviderWrapper.class.getName())) {
+            System.setProperty(JAXWSPROVIDER_PROPERTY, JaxWsProviderWrapper.class.getName());
+        }
 
         final ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
         if (oldClassLoader != null) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java b/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java
index 7ec30fc..cdcb913 100644
--- a/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java
+++ b/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java
@@ -34,7 +34,7 @@ import java.util.List;
 public class JaxWsProviderWrapperTest extends TestCase {
 
     public void test() throws Exception {
-        System.setProperty(Provider.JAXWSPROVIDER_PROPERTY, MockProvider.class.getName());
+        System.setProperty(Provider.class.getName(), MockProvider.class.getName());
         Provider provider = Provider.provider();
         assertNotNull("provider is null", provider);
         assertFalse("provider should not be an instance of ProviderWrapper", provider instanceof JaxWsProviderWrapper);

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/tomee/apache-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 49e607c..e15ee4f 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -233,6 +233,21 @@
         <artifactId>groovy-maven-plugin</artifactId>
         <dependencies>
           <dependency>
+            <groupId>org.apache.tomee</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>${version.javaee-api}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+            <version>1.0.1</version>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.2.11</version>
+          </dependency>
+          <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>openejb-jpa-integration</artifactId>
             <version>${project.version}</version>
@@ -245,7 +260,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
-            <version>2.4.3</version>
+            <version>${version.groovy}</version>
           </dependency>
         </dependencies>
         <configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/tomee/tomee-juli/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml
index fc3a77f..03d8b72 100644
--- a/tomee/tomee-juli/pom.xml
+++ b/tomee/tomee-juli/pom.xml
@@ -72,7 +72,7 @@
   </dependencies>
 
   <properties>
-    <jmh.version>1.10.5</jmh.version>
+    <jmh.version>1.18</jmh.version>
   </properties>
 
   <build>

http://git-wip-us.apache.org/repos/asf/tomee/blob/05de1282/tomee/tomee-webaccess/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index 56280ef..473c793 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -220,6 +220,18 @@
       <version>2.3.0</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+      <version>1.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.2.11</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -267,23 +279,17 @@
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerId>groovy-eclipse-compiler</compilerId>
-          <verbose>true</verbose>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.8.0-01</version>
-          </dependency>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.1.8-01</version>
-          </dependency>
-        </dependencies>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
+        <version>1.5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>


Mime
View raw message