X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=d0794a386c2bff1168bc6fbe71647415b8bb5bb7;hb=refs%2Fchanges%2F36%2F36536%2F4;hp=cf2893644e841683cfaead0ec5e3a489b28ba91f;hpb=45b0f350846fc98b224c94169e6e7728389ae6c7;p=odlparent.git

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index cf2893644..d0794a386 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -87,36 +87,42 @@
     <!-- Supporting Libraries -->
     <!-- Used by controller -->
     <bouncycastle.version>1.54</bouncycastle.version>
-    <!-- Used by persistence, snmp4sdn; see also didm -->
+    <!-- Used by persistence; see also didm -->
+    <!-- Removed in didm: https://git.opendaylight.org/gerrit/38218 -->
+    <!-- Removed in persistence: https://git.opendaylight.org/gerrit/31285 -->
     <guava.version>18.0</guava.version>
-    <!-- Used by alto; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp -->
-    <jackson.version>2.3.2</jackson.version>
-    <!-- Used by snmp4sdn -->
-    <javassist.version>3.20.0-GA</javassist.version>
 
     <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects -->
-    <!-- Used by alto, centinel, tsdr; see also affinity, defense4all, nemo, snmp4sdn, toolkit -->
+    <!-- Used by centinel, tsdr; see also affinity, defense4all, nemo, snmp4sdn, toolkit -->
+    <!-- Removed in centinel: https://git.opendaylight.org/gerrit/38139 -->
+    <!-- Removed in tsdr: https://git.opendaylight.org/gerrit/38140 -->
     <jersey.version>1.17</jersey.version>
 
     <!-- Used by centinel -->
+    <!-- Removed in centinel: https://git.opendaylight.org/gerrit/38139 -->
     <org.json.version>20131018</org.json.version>
 
     <!-- Used by centinel -->
+    <!-- Removed in centinel: https://git.opendaylight.org/gerrit/38139 -->
     <jettison.version>1.3.7</jettison.version>
     <!-- Used by persistence -->
+    <!-- Removed in persistence: https://git.opendaylight.org/gerrit/31285 -->
     <jsr305.api.version>3.0.0</jsr305.api.version>
     <!-- Need to stick to JUnit 4.11 until
          https://github.com/jayway/powermock/issues/560 is fixed (either in
          PowerMock or with a new JUnit release) -->
-    <!-- Used by nic, persistence, tsdr; see also nemo -->
+    <!-- Used by persistence, tsdr; see also nemo -->
+    <!-- Removed in persistence: https://git.opendaylight.org/gerrit/31285 -->
+    <!-- Removed in tsdr: https://git.opendaylight.org/gerrit/38140 -->
     <junit.version>4.11</junit.version>
-    <!-- Used by snmp4sdn; see also affinity, toolkit -->
-    <logback.version>1.1.3</logback.version>
-    <!-- Used by nic, tsdr -->
+    <!-- Used by tsdr -->
+    <!-- Removed in tsdr: https://git.opendaylight.org/gerrit/38140 -->
     <mockito.version>1.10.19</mockito.version>
-    <!-- Used by alto, controller, didm, snbi; see also centinel, dlux, toolkit, tsdr -->
+    <!-- Used by controller, didm, snbi; see also centinel, dlux, toolkit -->
+    <!-- Removed in didm: https://git.opendaylight.org/gerrit/38218 -->
     <osgi.core.version>5.0.0</osgi.core.version>
-    <!-- Used by persistence, snmp4sdn; see also affinity, toolkit -->
+    <!-- Used by persistence; see also affinity, toolkit -->
+    <!-- Removed in persistence: https://git.opendaylight.org/gerrit/31285 -->
     <slf4j.version>1.7.12</slf4j.version>
 
     <akka.version>2.4.4</akka.version>
@@ -247,12 +253,12 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>${logback.version}</version>
+        <version>1.1.3</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>${logback.version}</version>
+        <version>1.1.3</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -283,12 +289,17 @@
       <dependency>
         <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
         <artifactId>jersey-guava</artifactId>
-        <version>2.8</version>
+        <version>2.22.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish</groupId>
+        <artifactId>javax.json</artifactId>
+        <version>1.0.4</version>
       </dependency>
       <dependency>
         <groupId>com.eclipsesource.jaxrs</groupId>
         <artifactId>jersey-all</artifactId>
-        <version>2.8</version>
+        <version>2.22.2</version>
       </dependency>
 
       <!-- servlet 3.x support -->
@@ -302,7 +313,7 @@
         <artifactId>json</artifactId>
         <version>20090211_1</version>
       </dependency>
-      <!-- FIXME : remove all dependencies for jersey 1.7 -->
+      <!-- FIXME : remove all dependencies for jersey 1.17 -->
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-core</artifactId>
@@ -329,6 +340,12 @@
         <version>${jersey.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.sun.jersey.jersey-test-framework</groupId>
+        <artifactId>jersey-test-framework-inmemory</artifactId>
+        <version>${jersey.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-client</artifactId>
@@ -337,7 +354,7 @@
       <dependency>
         <groupId>org.opendaylight.controller.thirdparty</groupId>
         <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-        <version>1.17</version>
+        <version>${jersey.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.shiro</groupId>
@@ -369,44 +386,44 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <version>${jackson.version}</version>
+        <version>2.3.2</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
+        <version>2.3.2</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}</version>
+        <version>2.3.2</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-json-org</artifactId>
-        <version>${jackson.version}</version>
+        <version>2.3.2</version>
       </dependency>
       <!-- TODO do we really need resteasy ? -->
       <dependency>
           <groupId>org.jboss.resteasy</groupId>
           <artifactId>jaxrs-api</artifactId>
-          <version>3.0.4.Final</version>
+          <version>3.0.12.Final</version>
       </dependency>
 
       <dependency>
         <groupId>com.fasterxml.jackson.jaxrs</groupId>
         <artifactId>jackson-jaxrs-base</artifactId>
-        <version>${jackson.version}</version>
+        <version>2.3.2</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.jaxrs</groupId>
         <artifactId>jackson-jaxrs-json-provider</artifactId>
-        <version>${jackson.version}</version>
+        <version>2.3.2</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.module</groupId>
         <artifactId>jackson-module-jaxb-annotations</artifactId>
-        <version>${jackson.version}</version>
+        <version>2.3.2</version>
       </dependency>
       <dependency>
         <groupId>com.sun.xml.txw2</groupId>
@@ -732,6 +749,11 @@
         <artifactId>org.apache.felix.fileinstall</artifactId>
         <version>3.1.6</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.metatype</artifactId>
+        <version>1.1.2</version>
+      </dependency>
       <!-- felix webconsole -->
       <dependency>
         <groupId>org.apache.felix</groupId>
@@ -797,7 +819,7 @@
       <dependency>
         <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
-        <version>${javassist.version}</version>
+        <version>3.20.0-GA</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.spec.javax.transaction</groupId>
@@ -996,7 +1018,7 @@
         <groupId>com.lmax</groupId>
         <artifactId>disruptor</artifactId>
         <!-- If this is updated, the version in features.xml needs to be changed too -->
-        <version>3.3.2</version>
+        <version>3.3.4</version>
       </dependency>
 
       <!-- Add Pax Exam -->
@@ -1113,6 +1135,7 @@
               <phase>process-sources</phase>
               <configuration>
                 <configLocation>check-license.xml</configLocation>
+                <headerLocation>EPL-LICENSE.regexp.txt</headerLocation>
                 <includeResources>false</includeResources>
                 <includeTestResources>false</includeTestResources>
                 <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>