Skip to content

Commit

Permalink
massive dependency/plugin update
Browse files Browse the repository at this point in the history
  • Loading branch information
@ddossot
ddossot committed Jan 11, 2014
1 parent 1f5ee34 commit 369a51a
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 42 deletions.
76 changes: 44 additions & 32 deletions pom.xml
View file
Expand Up @@ -47,11 +47,11 @@
<eruntime.version>1.4.0-SNAPSHOT</eruntime.version> <eruntime.version>1.4.0-SNAPSHOT</eruntime.version>


<spring.version>3.2.4.RELEASE</spring.version> <spring.version>3.2.4.RELEASE</spring.version>
<spring-security.version>3.1.4.RELEASE</spring-security.version> <spring-security.version>3.2.0.RELEASE</spring-security.version>
<spring-integration.version>2.2.5.RELEASE</spring-integration.version> <spring-integration.version>3.0.0.RELEASE</spring-integration.version>
<activemq.version>5.7.0</activemq.version> <activemq.version>5.7.0</activemq.version>
<cxf.version>2.7.6</cxf.version> <cxf.version>2.7.8</cxf.version>
<jetty-plugin.version>8.1.5.v20120716</jetty-plugin.version> <jetty-plugin.version>8.1.14.v20131031</jetty-plugin.version>
<soapui.version>4.5.1</soapui.version> <soapui.version>4.5.1</soapui.version>
<tomcat.version>7.0.42</tomcat.version> <tomcat.version>7.0.42</tomcat.version>
<local.server.port>8888</local.server.port> <local.server.port>8888</local.server.port>
Expand Down Expand Up @@ -246,7 +246,7 @@
<dependency> <dependency>
<groupId>org.codehaus.jettison</groupId> <groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId> <artifactId>jettison</artifactId>
<version>1.3.4</version> <version>1.3.5</version>
</dependency> </dependency>


<!-- JMS --> <!-- JMS -->
Expand Down Expand Up @@ -293,19 +293,19 @@
<dependency> <dependency>
<groupId>redis.clients</groupId> <groupId>redis.clients</groupId>
<artifactId>jedis</artifactId> <artifactId>jedis</artifactId>
<version>2.1.0</version> <version>2.2.1</version>
</dependency> </dependency>


<!-- Support --> <!-- Support -->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.1</version> <version>3.2.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId> <artifactId>commons-math3</artifactId>
<version>3.0</version> <version>3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
Expand All @@ -320,7 +320,7 @@
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.6</version> <version>1.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-pool</groupId> <groupId>commons-pool</groupId>
Expand All @@ -340,7 +340,7 @@
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId> <artifactId>jackson-xc</artifactId>
<version>1.9.9</version> <version>1.9.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>
Expand All @@ -362,31 +362,43 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.6.4</version> <version>1.7.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId> <artifactId>slf4j-jcl</artifactId>
<version>1.6.4</version> <version>1.7.5</version>
</dependency> </dependency>


<!-- Testing --> <!-- Testing -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.10</version> <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<version>1.9.0</version> <version>1.9.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xmlunit</groupId> <groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId> <artifactId>xmlunit</artifactId>
<version>1.3</version> <version>1.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
Expand Down Expand Up @@ -457,7 +469,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId> <artifactId>maven-eclipse-plugin</artifactId>
<version>2.8</version> <version>2.9</version>
<configuration> <configuration>
<downloadSources>true</downloadSources> <downloadSources>true</downloadSources>
<additionalProjectnatures> <additionalProjectnatures>
Expand All @@ -471,7 +483,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.7.2</version> <version>2.16</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
Expand All @@ -493,7 +505,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.5</version> <version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>
Expand Down Expand Up @@ -525,13 +537,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.0</version> <version>3.3</version>
<configuration> <configuration>
<reportPlugins> <reportPlugins>
<plugin> <plugin>
<groupId>org.codehaus.enunciate</groupId> <groupId>org.codehaus.enunciate</groupId>
<artifactId>maven-enunciate-plugin</artifactId> <artifactId>maven-enunciate-plugin</artifactId>
<version>1.23</version> <version>1.28</version>
<configuration> <configuration>
<configFile>enunciate.xml</configFile> <configFile>enunciate.xml</configFile>
<docsSubdir>wsdocs</docsSubdir> <docsSubdir>wsdocs</docsSubdir>
Expand All @@ -540,7 +552,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.6</version> <version>2.7</version>
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>
Expand All @@ -558,35 +570,35 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version> <version>2.9.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId> <artifactId>maven-surefire-report-plugin</artifactId>
<version>2.8</version> <version>2.16</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.2</version> <version>2.5.3</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId> <artifactId>cobertura-maven-plugin</artifactId>
<version>2.4</version> <version>2.6</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>2.2</version> <version>2.4</version>
</plugin> </plugin>
</reportPlugins> </reportPlugins>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version> <version>2.5</version>
<configuration> <configuration>
<filesets> <filesets>
<fileset> <fileset>
Expand All @@ -603,7 +615,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version> <version>2.4</version>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
Expand Down Expand Up @@ -927,7 +939,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version> <version>2.4</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
Expand Down Expand Up @@ -980,9 +992,9 @@
<id>postgresql</id> <id>postgresql</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>9.1-901-1.jdbc4</version> <version>9.3-1100-jdbc41</version>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
Expand All @@ -992,7 +1004,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.26</version> <version>5.1.28</version>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/eu/openanalytics/rsb/component/AdminResource.java
View file
Expand Up @@ -114,6 +114,7 @@ public void setrServiPackageManager(final RServiPackageManager rServiPackageMana
this.rServiPackageManager = rServiPackageManager; this.rServiPackageManager = rServiPackageManager;
} }


@Override
public void setApplicationContext(final ApplicationContext applicationContext) throws BeansException public void setApplicationContext(final ApplicationContext applicationContext) throws BeansException
{ {
this.applicationContext = (ConfigurableApplicationContext) applicationContext; this.applicationContext = (ConfigurableApplicationContext) applicationContext;
Expand Down Expand Up @@ -213,7 +214,7 @@ public void installRPackage(@QueryParam("rServiPoolUri") final String rServiPool


// validate the checksum // validate the checksum
final FileInputStream packageSourceInputStream = new FileInputStream(packageSourceFile); final FileInputStream packageSourceInputStream = new FileInputStream(packageSourceFile);
final String calculatedSha1HexSum = DigestUtils.shaHex(packageSourceInputStream); final String calculatedSha1HexSum = DigestUtils.sha1Hex(packageSourceInputStream);
IOUtils.closeQuietly(packageSourceInputStream); IOUtils.closeQuietly(packageSourceInputStream);
Validate.isTrue(calculatedSha1HexSum.equals(sha1HexSum), "Invalid SHA-1 HEX checksum"); Validate.isTrue(calculatedSha1HexSum.equals(sha1HexSum), "Invalid SHA-1 HEX checksum");


Expand Down Expand Up @@ -320,6 +321,7 @@ public Response getCatalogFile(@PathParam("catalogName") final String catalogNam
rb.type(Util.getContentType(catalogFile)); rb.type(Util.getContentType(catalogFile));
rb.entity(new StreamingOutput() rb.entity(new StreamingOutput()
{ {
@Override
public void write(final OutputStream output) throws IOException public void write(final OutputStream output) throws IOException
{ {
final FileInputStream fis = new FileInputStream(catalogFile); final FileInputStream fis = new FileInputStream(catalogFile);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/eu/openanalytics/rsb/component/AdminResourceTestCase.java
View file
Expand Up @@ -141,8 +141,8 @@ public void installRPackageSuccess() throws Exception


final byte[] fakePackageBytes = IOUtils.toByteArray(JobsResourceTestCase.getTestDataAsStream("fake-package.tar.gz")); final byte[] fakePackageBytes = IOUtils.toByteArray(JobsResourceTestCase.getTestDataAsStream("fake-package.tar.gz"));


adminResource.installRPackage("ignored", DigestUtils.shaHex(fakePackageBytes), "fake_package.tar.gz", adminResource.installRPackage("ignored", DigestUtils.sha1Hex(fakePackageBytes),
new ByteArrayInputStream(fakePackageBytes)); "fake_package.tar.gz", new ByteArrayInputStream(fakePackageBytes));
} }


@Test @Test
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/eu/openanalytics/rsb/component/AuthenticatedResultResourceTestCase.java
View file
Expand Up @@ -41,7 +41,7 @@
import org.apache.activemq.util.ByteArrayInputStream; import org.apache.activemq.util.ByteArrayInputStream;
import org.apache.activemq.util.ByteArrayOutputStream; import org.apache.activemq.util.ByteArrayOutputStream;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.math3.random.RandomDataImpl; import org.apache.commons.math3.random.RandomDataGenerator;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
Expand Down Expand Up @@ -76,7 +76,7 @@ public class AuthenticatedResultResourceTestCase
@Before @Before
public void prepareTest() public void prepareTest()
{ {
testResultPayload = RandomStringUtils.randomAlphanumeric(25 + new RandomDataImpl().nextInt(0, 25)); testResultPayload = RandomStringUtils.randomAlphanumeric(25 + new RandomDataGenerator().nextInt(0, 25));


when(securityContext.getUserPrincipal()).thenReturn( when(securityContext.getUserPrincipal()).thenReturn(
new TestingAuthenticationToken(TEST_USER_NAME, null)); new TestingAuthenticationToken(TEST_USER_NAME, null));
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/eu/openanalytics/rsb/component/ResultResourceTestCase.java
View file
Expand Up @@ -40,7 +40,7 @@
import org.apache.activemq.util.ByteArrayInputStream; import org.apache.activemq.util.ByteArrayInputStream;
import org.apache.activemq.util.ByteArrayOutputStream; import org.apache.activemq.util.ByteArrayOutputStream;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.math3.random.RandomDataImpl; import org.apache.commons.math3.random.RandomDataGenerator;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
Expand Down Expand Up @@ -71,7 +71,7 @@ public class ResultResourceTestCase
@Before @Before
public void prepareTest() public void prepareTest()
{ {
testResultPayload = RandomStringUtils.randomAlphanumeric(25 + new RandomDataImpl().nextInt(0, 25)); testResultPayload = RandomStringUtils.randomAlphanumeric(25 + new RandomDataGenerator().nextInt(0, 25));


resultResource = new ResultResource(); resultResource = new ResultResource();
resultResource.setResultStore(resultStore); resultResource.setResultStore(resultStore);
Expand Down
8 changes: 5 additions & 3 deletions src/test/java/eu/openanalytics/rsb/jaxrs/IllegalArgumentExceptionMapperTestCase.java
View file
Expand Up @@ -22,8 +22,8 @@
package eu.openanalytics.rsb.jaxrs; package eu.openanalytics.rsb.jaxrs;


import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.junit.internal.matchers.StringContains.containsString;


import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
Expand All @@ -33,9 +33,11 @@
/** /**
* @author "OpenAnalytics &lt;rsb.development@openanalytics.eu&gt;" * @author "OpenAnalytics &lt;rsb.development@openanalytics.eu&gt;"
*/ */
public class IllegalArgumentExceptionMapperTestCase { public class IllegalArgumentExceptionMapperTestCase
{
@Test @Test
public void toResponse() { public void toResponse()
{
final IllegalArgumentExceptionMapper iaeMapper = new IllegalArgumentExceptionMapper(); final IllegalArgumentExceptionMapper iaeMapper = new IllegalArgumentExceptionMapper();


final Response response = iaeMapper.toResponse(new IllegalArgumentException("test_err")); final Response response = iaeMapper.toResponse(new IllegalArgumentException("test_err"));
Expand Down

0 comments on commit 369a51a

Please sign in to comment.