diff --git a/java-bindings/pom.xml b/java-bindings/pom.xml
index 4950f87..0414454 100644
--- a/java-bindings/pom.xml
+++ b/java-bindings/pom.xml
@@ -30,10 +30,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
-                <configuration>
-                    <argLine>-Xmx2048m -XX:MaxPermSize=256m</argLine>
-                </configuration>
+                <version>3.0.0-M5</version>
             </plugin>
 
             <!-- Prepares this JAXB project from the IEPD directory. -->
@@ -86,7 +83,8 @@
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
-                        <version>2.4.0</version>
+                        <version>3.0.9</version>
+                        <type>pom</type>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -96,7 +94,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>2.2</version>
+                <version>2.5.0</version>
                 <executions>
                     <execution>
                         <id>xjc</id>
@@ -180,7 +178,19 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- API -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
 
+        <!-- Runtime -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.5</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/pom.xml b/pom.xml
index f02ab92..bbc12c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,9 +20,6 @@
 
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
         <timestamp>${maven.build.timestamp}</timestamp>
-
-        <groovyVersion>2.2.1</groovyVersion>
-
     </properties>
 
     <dependencies>
diff --git a/rest-services/pom.xml b/rest-services/pom.xml
index e09f23c..dc475cf 100644
--- a/rest-services/pom.xml
+++ b/rest-services/pom.xml
@@ -108,7 +108,8 @@
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
-                        <version>2.4.0</version>
+                        <version>3.0.9</version>
+                        <type>pom</type>
                     </dependency>
                     <dependency>
                         <groupId>ant</groupId>
@@ -124,4 +125,4 @@
     </build>
 
 
-</project>
\ No newline at end of file
+</project>