Skip to content

Commit

Permalink
Revert "Update third party dependencies"
Browse files Browse the repository at this point in the history
This reverts commit e60ea77.
  • Loading branch information
gbehrmann committed Oct 27, 2015
1 parent e60ea77 commit 9b77b04
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions pom.xml
Expand Up @@ -62,12 +62,12 @@

<version.slf4j>1.7.10</version.slf4j>
<version.milton>2.6.3.3-dcache-1</version.milton>
<version.spring>4.2.2.RELEASE</version.spring>
<version.spring>4.2.1.RELEASE</version.spring>
<!-- Remember to sync aspectj version in dcache.properties -->
<version.aspectj>1.8.7</version.aspectj>
<version.aspectj>1.8.6</version.aspectj>
<version.smc>6.3.0</version.smc>
<version.xerces>2.11.0</version.xerces>
<version.jetty>9.3.5.v20151012</version.jetty>
<version.jetty>9.3.3.v20150827</version.jetty>
<version.wicket>7.0.0</version.wicket>
<version.xrootd4j>3.0.0</version.xrootd4j>

Expand Down Expand Up @@ -98,8 +98,8 @@
-->
<bouncycastle.bcprov>bcprov-jdk16</bouncycastle.bcprov>
<bouncycastle.version>1.46</bouncycastle.version>
<datanucleus-core.version>4.1.5</datanucleus-core.version>
<datanucleus.plugin.version>4.0.1</datanucleus.plugin.version>
<datanucleus-core.version>4.1.3</datanucleus-core.version>
<datanucleus.plugin.version>4.0.0-release</datanucleus.plugin.version>
</properties>

<prerequisites>
Expand Down Expand Up @@ -131,12 +131,12 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.11.7</version>
<version>2.11.6</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
<version>2.11.7</version>
<version>2.11.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -329,7 +329,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.4-1204-jdbc42</version>
<version>9.4-1202-jdbc42</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -359,12 +359,12 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.0.32.Final</version>
<version>4.0.31.Final</version>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
<version>6.4.9</version>
<version>6.3.8</version>
</dependency>
<dependency>
<groupId>javax.jdo</groupId>
Expand Down Expand Up @@ -404,7 +404,7 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId>
<version>4.1.5</version>
<version>4.1.3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion skel/share/defaults/dcache.properties
Expand Up @@ -184,7 +184,7 @@ dcache.log.access.max-history=30
-XX:+HeapDumpOnOutOfMemoryError \
-XX:HeapDumpPath=${dcache.java.oom.file} \
-XX:+UseCompressedOops \
-javaagent:${dcache.paths.classes}/aspectjweaver-1.8.7.jar \
-javaagent:${dcache.paths.classes}/aspectjweaver-1.8.6.jar \
${dcache.java.options.common} \
${dcache.java.options.extra}

Expand Down

0 comments on commit 9b77b04

Please sign in to comment.