diff --git a/opencga-app/pom.xml b/opencga-app/pom.xml index 7e86ac13394..3562884db36 100644 --- a/opencga-app/pom.xml +++ b/opencga-app/pom.xml @@ -56,6 +56,10 @@ org.opencb.opencga opencga-master + + org.opencb.opencga + opencga-test + org.opencb.opencga opencga-client @@ -495,11 +499,11 @@ - - - - - + diff --git a/opencga-server/pom.xml b/opencga-server/pom.xml index 19845c9f6e5..a823bf691ce 100644 --- a/opencga-server/pom.xml +++ b/opencga-server/pom.xml @@ -106,10 +106,6 @@ com.fasterxml.jackson.core jackson-core - - org.codehaus.jackson - jackson-mapper-asl - com.google.protobuf protobuf-java diff --git a/opencga-server/src/test/java/org/opencb/opencga/server/rest/ProjectWSServerTest.java b/opencga-server/src/test/java/org/opencb/opencga/server/rest/ProjectWSServerTest.java index 518e867eaa5..04b5c77257d 100644 --- a/opencga-server/src/test/java/org/opencb/opencga/server/rest/ProjectWSServerTest.java +++ b/opencga-server/src/test/java/org/opencb/opencga/server/rest/ProjectWSServerTest.java @@ -146,7 +146,7 @@ public void modifyProject(long projectId, String sessionId) { System.out.println("\nJSON RESPONSE"); System.out.println(s); try { - org.codehaus.jackson.map.ObjectMapper objectMapper = new org.codehaus.jackson.map.ObjectMapper(); + ObjectMapper objectMapper = new ObjectMapper(); QueryResponse queryResponse = objectMapper.readValue(s, QueryResponse.class); //Map userData = objectMapper.readValue(s, Map.class); assertEquals("Expected [], actual [" + queryResponse.getError() + "]", "", queryResponse.getError()); diff --git a/opencga-server/src/test/java/org/opencb/opencga/server/rest/UserWSServerTest.java b/opencga-server/src/test/java/org/opencb/opencga/server/rest/UserWSServerTest.java index 2494c5cb1ad..c6a535628d7 100644 --- a/opencga-server/src/test/java/org/opencb/opencga/server/rest/UserWSServerTest.java +++ b/opencga-server/src/test/java/org/opencb/opencga/server/rest/UserWSServerTest.java @@ -16,7 +16,7 @@ package org.opencb.opencga.server.rest; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.experimental.categories.Category; import org.opencb.commons.datastore.core.ObjectMap; import org.opencb.commons.datastore.core.QueryResponse; diff --git a/opencga-server/src/test/java/org/opencb/opencga/server/rest/VariableSetWSServerTest.java b/opencga-server/src/test/java/org/opencb/opencga/server/rest/VariableSetWSServerTest.java index 177a529004a..e746b1f7070 100644 --- a/opencga-server/src/test/java/org/opencb/opencga/server/rest/VariableSetWSServerTest.java +++ b/opencga-server/src/test/java/org/opencb/opencga/server/rest/VariableSetWSServerTest.java @@ -16,7 +16,7 @@ package org.opencb.opencga.server.rest; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.*; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; diff --git a/pom.xml b/pom.xml index 0de0a7fdc99..1f78cee2441 100644 --- a/pom.xml +++ b/pom.xml @@ -52,13 +52,13 @@ 0.2.0 - 2.11.4 + 2.14.3 2.30.1 4.4 1.7.7 3.11.4 1.28.1 - 1.7.32 + 1.7.36 2.17.2 8.8.2 0.11.2 @@ -67,7 +67,7 @@ 2.23.0 4.3.1 4.8.2 - 3.12.0 + 3.14.0 2.5 1.7 0.9.10 @@ -146,6 +146,13 @@ 1.7.24 2.5-20081211 + + + true 2.23.0 @@ -249,6 +256,11 @@ opencga-storage-app ${project.version} + + org.opencb.opencga + opencga-test + ${project.version} + org.opencb.opencga opencga-storage-core @@ -931,11 +943,6 @@ log4j ${log4j.version} - - org.codehaus.jackson - jackson-mapper-asl - ${jackson-codehaus.version} - org.codehaus.jackson jackson-core-asl