Skip to content

Commit

Permalink
Update third party dependencies
Browse files Browse the repository at this point in the history 
The patch updates various third party dependencies. Only minor dependencies/minor updates are updated.

Target: trunk
Require-notes: no
Require-book: no
Acked-by: Paul Millar <paul.millar@desy.de>
Patch: http://rb.dcache.org/r/5097/
  • Loading branch information
Gerd Behrmann committed Jan 16, 2013
1 parent 09997bf commit 5efd9f2
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 41 deletions.
87 changes: 47 additions & 40 deletions pom.xml
View file
Expand Up @@ -26,12 +26,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.slf4j>1.7.2</version.slf4j>
<version.milton>2.3.0.4</version.milton>
<version.spring>3.1.1.RELEASE</version.spring>
<version.aspectj>1.6.12</version.aspectj>
<version.spring>3.2.0.RELEASE</version.spring>
<version.aspectj>1.7.1</version.aspectj>
<version.smc>5.1.0</version.smc>
<version.xerces>2.9.1</version.xerces>
<version.jetty>7.5.4.v20111024</version.jetty>
<version.wicket>1.5.7</version.wicket>
<version.wicket>1.5.9</version.wicket>
<version.xrootd4j>1.1.3</version.xrootd4j>
<version.jglobus>2.0.5-rc1</version.jglobus>
</properties>
Expand Down Expand Up @@ -102,7 +102,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>12.0</version>
<version>13.0</version>
</dependency>
<dependency>
<groupId>eu.emi</groupId>
Expand Down Expand Up @@ -282,12 +282,12 @@
<dependency>
<groupId>org.parboiled</groupId>
<artifactId>parboiled-java</artifactId>
<version>1.0.2</version>
<version>1.1.4</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
<version>3.1.0-release</version>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
Expand All @@ -297,27 +297,27 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-enhancer</artifactId>
<version>3.1.0-release</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
<version>3.1.0-release</version>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jpa</artifactId>
<version>3.1.0-release</version>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId>
<version>3.1.0-release</version>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-xml</artifactId>
<version>3.1.0-release</version>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
Expand Down Expand Up @@ -358,13 +358,13 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>ST4</artifactId>
<version>4.0.4</version>
<version>4.0.7</version>
</dependency>

<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.6.0</version>
<version>0.8.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -488,13 +488,13 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.167</version>
<version>1.3.170</version>
</dependency>

<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.2.8</version>
<version>2.2.9</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -670,19 +670,19 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3.RC2</version>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.0</version>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.10</version>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -699,7 +699,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.1</version>
<version>3.2</version>
</plugin>
<plugin>
<groupId>org.scala-tools</groupId>
Expand All @@ -709,27 +709,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.0</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version>
<version>2.6</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<version>2.4</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<version>2.3</version>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
Expand All @@ -743,54 +743,63 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<version>2.13</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.3.2</version>
<version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.5.1</version>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>maven-datanucleus-plugin</artifactId>
<version>3.1.0-release</version>
<version>3.1.3</version>
<dependencies>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
<version>3.1.0-release</version>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
<version>3.1.0-release</version>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jpa</artifactId>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-enhancer</artifactId>
<version>3.1.0-release</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.dcache</groupId>
<artifactId>logback-test-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
<version>3.0.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.13</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.9</version>
</plugin>
</plugins>
</pluginManagement>

Expand Down Expand Up @@ -856,7 +865,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.8</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
Expand All @@ -868,7 +876,6 @@

<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.12</version>
<executions>
<execution>
<goals>
Expand All @@ -886,7 +893,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
<version>2.6</version>
<reportSets>
<reportSet>
<reports>
Expand All @@ -899,7 +906,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.5.1</version>
<version>2.5.2</version>
<configuration>
<omitVisitors>FindDeadLocalStores,UnreadFields,Naming,FindUncalledPrivateMethods</omitVisitors>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion skel/share/defaults/dcache.properties
View file
Expand Up @@ -122,7 +122,7 @@
-DwantLog4jSetup=n \
-XX:+HeapDumpOnOutOfMemoryError \
-XX:HeapDumpPath=${dcache.java.oom.file} \
-javaagent:${dcache.paths.classes}/spring-instrument-3.1.1.RELEASE.jar \
-javaagent:${dcache.paths.classes}/spring-instrument-3.2.0.RELEASE.jar \
${dcache.java.options.extra}

# Whether to cache the compiled configuration files. If disabled most dCache
Expand Down

0 comments on commit 5efd9f2

Please sign in to comment.