diff --git a/pom.xml b/pom.xml
index be53638..9da6ee9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
     <groupId>org.apache</groupId>
@@ -38,6 +39,38 @@
     <url>http://svn.apache.org/viewvc/tomee/javaee-api/trunk</url>
   </scm>
 
+  <properties>
+    <geronimo-interceptor_1.2_spec.version>1.0</geronimo-interceptor_1.2_spec.version>
+    <geronimo-jms_2.0_spec.version>1.0-alpha-2</geronimo-jms_2.0_spec.version>
+    <geronimo-jpa_2.1_spec.version>1.0-alpha-1</geronimo-jpa_2.1_spec.version>
+    <geronimo-jta_1.2_spec.version>1.0-alpha-1</geronimo-jta_1.2_spec.version>
+    <geronimo-jacc_1.4_spec.version>1.0</geronimo-jacc_1.4_spec.version>
+    <geronimo-jaxr_1.0_spec.version>2.1</geronimo-jaxr_1.0_spec.version>
+    <geronimo-jaxrs_2.0_spec.version>1.0-alpha-1</geronimo-jaxrs_2.0_spec.version>
+    <geronimo-jaxrpc_1.1_spec.version>2.1</geronimo-jaxrpc_1.1_spec.version>
+    <geronimo-j2ee-deployment_1.1_spec.version>1.1</geronimo-j2ee-deployment_1.1_spec.version>
+    <geronimo-j2ee-connector_1.6_spec.version>1.0</geronimo-j2ee-connector_1.6_spec.version>
+    <geronimo-j2ee-management_1.1_spec.version>1.0.1</geronimo-j2ee-management_1.1_spec.version>
+    <geronimo-ejb_3.2_spec.version>1.0-alpha-1</geronimo-ejb_3.2_spec.version>
+    <geronimo-jsp_2.2_spec.version>1.2</geronimo-jsp_2.2_spec.version>
+    <geronimo-ws-metadata_2.0_spec.version>1.1.3</geronimo-ws-metadata_2.0_spec.version>
+    <geronimo-annotation_1.2_spec.version>1.0</geronimo-annotation_1.2_spec.version>
+    <geronimo-validation_1.1_spec.version>1.0-alpha-1</geronimo-validation_1.1_spec.version>
+    <geronimo-activation_1.1_spec.version>1.1</geronimo-activation_1.1_spec.version>
+    <geronimo-stax-api_1.2_spec.version>1.2</geronimo-stax-api_1.2_spec.version>
+    <geronimo-saaj_1.3_spec.version>1.1</geronimo-saaj_1.3_spec.version>
+    <geronimo-atinject_1.0_spec.version>1.0</geronimo-atinject_1.0_spec.version>
+    <geronimo-jaspic_1.0_spec.version>1.1</geronimo-jaspic_1.0_spec.version>
+    <geronimo-jcdi_1.1_spec.version>1.0</geronimo-jcdi_1.1_spec.version>
+    <geronimo-jaxws_2.2_spec.version>1.2</geronimo-jaxws_2.2_spec.version>
+    <geronimo-osgi.version>1.0</geronimo-osgi.version>
+    <geronimo-json_1.0_spec.version>1.0-alpha-1</geronimo-json_1.0_spec.version>
+    <geronimo-concurrent_1.0_spec.version>1.0-alpha-1</geronimo-concurrent_1.0_spec.version>
+    <geronimo-jbatch_1.0_spec.version>1.0</geronimo-jbatch_1.0_spec.version>
+    <geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
+    <tomcat.version>8.0.26</tomcat.version>
+  </properties>
+
   <build>
     <resources>
       <resource>
@@ -52,7 +85,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.5</version>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
@@ -89,7 +122,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
+        <version>2.6</version>
         <executions>
           <execution>
             <id>javaee-api-libs</id>
@@ -247,7 +280,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.9.1</version>
+        <version>1.10</version>
         <executions>
           <execution>
             <id>attach-artifacts</id>
@@ -487,17 +520,30 @@
       <version>${geronimo-jcdi_1.1_spec.version}</version>
       <optional>true</optional>
     </dependency>
+    <!--<dependency>-->
+    <!--<groupId>org.apache.geronimo.specs</groupId>-->
+    <!--<artifactId>geronimo-jms_2.0_spec</artifactId>-->
+    <!--<version>${geronimo-jms_2.0_spec.version}</version>-->
+    <!--<classifier>sources</classifier>-->
+    <!--<optional>true</optional>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+    <!--<groupId>org.apache.geronimo.specs</groupId>-->
+    <!--<artifactId>geronimo-jms_2.0_spec</artifactId>-->
+    <!--<version>${geronimo-jms_2.0_spec.version}</version>-->
+    <!--<optional>true</optional>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>javax.jms</groupId>-->
+      <!--<artifactId>jms</artifactId>-->
+      <!--<version>2.1-SNAPSHOT</version>-->
+      <!--<classifier>sources</classifier>-->
+      <!--<optional>true</optional>-->
+    <!--</dependency>-->
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_2.0_spec</artifactId>
-      <version>${geronimo-jms_2.0_spec.version}</version>
-      <classifier>sources</classifier>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_2.0_spec</artifactId>
-      <version>${geronimo-jms_2.0_spec.version}</version>
+      <groupId>javax.jms</groupId>
+      <artifactId>jms</artifactId>
+      <version>2.1-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -689,35 +735,17 @@
     </dependency>
   </dependencies>
 
-  <properties>
-    <geronimo-interceptor_1.2_spec.version>1.0</geronimo-interceptor_1.2_spec.version>
-    <geronimo-jms_2.0_spec.version>1.0-alpha-2</geronimo-jms_2.0_spec.version>
-    <geronimo-jpa_2.1_spec.version>1.0-alpha-1</geronimo-jpa_2.1_spec.version>
-    <geronimo-jta_1.2_spec.version>1.0-alpha-1</geronimo-jta_1.2_spec.version>
-    <geronimo-jacc_1.4_spec.version>1.0</geronimo-jacc_1.4_spec.version>
-    <geronimo-jaxr_1.0_spec.version>2.1</geronimo-jaxr_1.0_spec.version>
-    <geronimo-jaxrs_2.0_spec.version>1.0-alpha-1</geronimo-jaxrs_2.0_spec.version>
-    <geronimo-jaxrpc_1.1_spec.version>2.1</geronimo-jaxrpc_1.1_spec.version>
-    <geronimo-j2ee-deployment_1.1_spec.version>1.1</geronimo-j2ee-deployment_1.1_spec.version>
-    <geronimo-j2ee-connector_1.6_spec.version>1.0</geronimo-j2ee-connector_1.6_spec.version>
-    <geronimo-j2ee-management_1.1_spec.version>1.0.1</geronimo-j2ee-management_1.1_spec.version>
-    <geronimo-ejb_3.2_spec.version>1.0-alpha-1</geronimo-ejb_3.2_spec.version>
-    <geronimo-jsp_2.2_spec.version>1.2</geronimo-jsp_2.2_spec.version>
-    <geronimo-ws-metadata_2.0_spec.version>1.1.3</geronimo-ws-metadata_2.0_spec.version>
-    <geronimo-annotation_1.2_spec.version>1.0</geronimo-annotation_1.2_spec.version>
-    <geronimo-validation_1.1_spec.version>1.0-alpha-1</geronimo-validation_1.1_spec.version>
-    <geronimo-activation_1.1_spec.version>1.1</geronimo-activation_1.1_spec.version>
-    <geronimo-stax-api_1.2_spec.version>1.2</geronimo-stax-api_1.2_spec.version>
-    <geronimo-saaj_1.3_spec.version>1.1</geronimo-saaj_1.3_spec.version>
-    <geronimo-atinject_1.0_spec.version>1.0</geronimo-atinject_1.0_spec.version>
-    <geronimo-jaspic_1.0_spec.version>1.1</geronimo-jaspic_1.0_spec.version>
-    <geronimo-jcdi_1.1_spec.version>1.0</geronimo-jcdi_1.1_spec.version>
-    <geronimo-jaxws_2.2_spec.version>1.2</geronimo-jaxws_2.2_spec.version>
-    <geronimo-osgi.version>1.0</geronimo-osgi.version>
-    <geronimo-json_1.0_spec.version>1.0-alpha-1</geronimo-json_1.0_spec.version>
-    <geronimo-concurrent_1.0_spec.version>1.0-alpha-1</geronimo-concurrent_1.0_spec.version>
-    <geronimo-jbatch_1.0_spec.version>1.0</geronimo-jbatch_1.0_spec.version>
-    <geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
-    <tomcat.version>8.0.26</tomcat.version>
-  </properties>
+  <repositories>
+    <repository>
+      <id>agilejava-snapshots</id>
+      <url>http://nexus.agilejava.eu/content/repositories/snapshots</url>
+      <name>Temporary Snapshot Repository. Do not rely on this!</name>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 </project>