pom: Update third party libraries

The new postgresql driver supports failover! Target: trunk Require-notes: yes Require-book: no Acked-by: Karsten Schwank <karsten.schwank@desy.de> Patch: https://rb.dcache.org/r/7849/
dCache · Feb 23, 2015 · 1985d5d · 1985d5d
1 parent 7cef919
commit 1985d5d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,15 +60,15 @@
         <source.version>1.8</source.version>
         <target.version>1.8</target.version>
 
-        <version.slf4j>1.7.7</version.slf4j>
+        <version.slf4j>1.7.10</version.slf4j>
         <version.milton>2.6.3.3-dcache-1</version.milton>
-        <version.spring>4.1.1.RELEASE</version.spring>
+        <version.spring>4.1.5.RELEASE</version.spring>
         <!-- Remember to sync aspectj version in dcache.properties -->
-        <version.aspectj>1.8.4</version.aspectj>
+        <version.aspectj>1.8.5</version.aspectj>
         <version.smc>6.3.0</version.smc>
         <version.xerces>2.11.0</version.xerces>
-        <version.jetty>9.2.4.v20141103</version.jetty>
-        <version.wicket>6.17.0</version.wicket>
+        <version.jetty>9.2.8.v20150217</version.jetty>
+        <version.wicket>6.19.0</version.wicket>
         <version.xrootd4j>2.0.0</version.xrootd4j>
         <version.jglobus>2.0.6-rc8.d</version.jglobus>
         <version.openmq>4.5.2</version.openmq>
@@ -100,7 +100,7 @@
          -->
         <bouncycastle.bcprov>bcprov-jdk16</bouncycastle.bcprov>
         <bouncycastle.version>1.45</bouncycastle.version>
-        <datanucleus-core.version>4.0.3</datanucleus-core.version>
+        <datanucleus-core.version>4.0.4</datanucleus-core.version>
         <datanucleus.plugin.version>4.0.0-release</datanucleus.plugin.version>
     </properties>
 
@@ -133,12 +133,12 @@
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-library</artifactId>
-                <version>2.11.4</version>
+                <version>2.11.5</version>
             </dependency>
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-reflect</artifactId>
-                <version>2.11.4</version>
+                <version>2.11.5</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -324,12 +324,18 @@
             <dependency>
                 <groupId>com.zaxxer</groupId>
                 <artifactId>HikariCP</artifactId>
-                <version>2.2.4</version>
+                <version>2.3.2</version>
             </dependency>
             <dependency>
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>
-                <version>9.3-1102-jdbc41</version>
+                <version>9.4-1200-jdbc41</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-simple</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.milton</groupId>
@@ -353,12 +359,12 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-codec-http</artifactId>
-                <version>4.0.24.Final</version>
+                <version>4.0.25.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.grizzly</groupId>
                 <artifactId>grizzly-framework</artifactId>
-                <version>2.3.17</version>
+                <version>2.3.18</version>
             </dependency>
             <dependency>
                 <groupId>com.sleepycat</groupId>
@@ -388,7 +394,7 @@
             <dependency>
                 <groupId>com.github.parboiled1</groupId>
                 <artifactId>grappa</artifactId>
-                <version>1.0.0-beta.9</version>
+                <version>1.0.4</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
@@ -403,22 +409,22 @@
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-api-jdo</artifactId>
-                <version>${datanucleus-core.version}</version>
+                <version>4.0.5</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-api-jpa</artifactId>
-                <version>4.0.4</version>
+                <version>4.0.6</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-rdbms</artifactId>
-                <version>4.0.4</version>
+                <version>4.0.7</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-xml</artifactId>
-                <version>${datanucleus-core.version}</version>
+                <version>4.0.5</version>
             </dependency>
             <dependency>
                 <groupId>net.sf.saxon</groupId>
@@ -612,7 +618,7 @@
             <dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>20131018</version>
+                <version>20141113</version>
             </dependency>
 
             <dependency>
@@ -739,7 +745,7 @@
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-                <version>2.3</version>
+                <version>2.3.1</version>
             </dependency>
 
             <dependency>
@@ -846,7 +852,7 @@
 	<dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.3.3</version>
+            <version>4.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -867,7 +873,7 @@
         <dependency>
            <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.5.6</version>
+            <version>1.6.1</version>
             <scope>test</scope>
             <exclusions>
                 <!-- powermock-api-mockito depends on mockito-all,
@@ -892,25 +898,26 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <!-- Powermock 1.6.1 is incompatible with versions newer than 1.10.8 -->
             <version>1.10.8</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.5.6</version>
+            <version>1.6.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.scalatest</groupId>
             <artifactId>scalatest_2.11</artifactId>
-            <version>2.2.0</version>
+            <version>2.2.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/skel/share/defaults/dcache.properties b/skel/share/defaults/dcache.properties
@@ -183,7 +183,7 @@ dcache.log.access.max-history=30
     -Djava.security.auth.login.config=${dcache.authn.jaas.config} \
     -XX:+HeapDumpOnOutOfMemoryError \
     -XX:HeapDumpPath=${dcache.java.oom.file} \
-    -javaagent:${dcache.paths.classes}/aspectjweaver-1.8.4.jar \
+    -javaagent:${dcache.paths.classes}/aspectjweaver-1.8.5.jar \
     ${dcache.java.options.common} \
     ${dcache.java.options.extra}