summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
l---------orchestrator-restapi/.#pom.xml1
-rw-r--r--orchestrator-restapi/pom.xml23
-rw-r--r--orchestrator/pom.xml23
3 files changed, 23 insertions, 24 deletions
diff --git a/orchestrator-restapi/.#pom.xml b/orchestrator-restapi/.#pom.xml
deleted file mode 120000
index 2cbe7080c4a..00000000000
--- a/orchestrator-restapi/.#pom.xml
+++ /dev/null
@@ -1 +0,0 @@
-hakon@seemstepcare-ll.trondheim.corp.yahoo.com.21087:1476431678 \ No newline at end of file
diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml
index 055811783b1..b2b581a7fc6 100644
--- a/orchestrator-restapi/pom.xml
+++ b/orchestrator-restapi/pom.xml
@@ -22,29 +22,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_${scala.major-version}</artifactId>
- <version>${jackson2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>findbugs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson2.version}</version>
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml
index 07ac788e0a5..717eab0d92e 100644
--- a/orchestrator/pom.xml
+++ b/orchestrator/pom.xml
@@ -97,6 +97,29 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-scala_${scala.major-version}</artifactId>
+ <version>${jackson2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>findbugs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson2.version}</version>