aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerwin Gsenger <g.gsenger@datentechnik-innovation.at>2015-01-12 10:13:16 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-06-19 11:04:35 +0200
commitdb9fdd97ec65b050494a01891eab55b59c3f3ace (patch)
tree61b291a53983f34d69d4e8fe6f4608e2a4551641
parent3221a6d123d7f6e30220d7f86081927deeb23f22 (diff)
downloadmoa-id-spss-db9fdd97ec65b050494a01891eab55b59c3f3ace.tar.gz
moa-id-spss-db9fdd97ec65b050494a01891eab55b59c3f3ace.tar.bz2
moa-id-spss-db9fdd97ec65b050494a01891eab55b59c3f3ace.zip
switch to Jackson Version 2.5.0
-rw-r--r--id/server/idserverlib/pom.xml11
-rw-r--r--id/server/moa-id-commons/pom.xml5
-rw-r--r--pom.xml12
3 files changed, 23 insertions, 5 deletions
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 9465b56d1..f0c845928 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -424,6 +424,17 @@
</exclusions>
</dependency>
+ <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 6d499f42a..27beeaaf3 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -123,11 +123,6 @@
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector.java}</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index a87900e72..5bf9febdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,6 +659,18 @@
</dependency>
</dependencies>
+ <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+ <!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
</dependencyManagement>
<dependencies>