Integrate MRI projects for Neon

This patch bumps:
- odlparent to 4.0.2
- yangtools to 2.1.2
- mdsal to 3.0.1

It also deals with mockito changes by:
- updating ShiroWebContextSecurer
- updating WebContextApiTest
- removing trivial use of powermock
- overriding javassist/mockito version where powermock is used
- move blueprint files to a standard location
- remove sshd overrides

JIRA: AAA-179
Change-Id: Iee47e06877b877c8345cbee3c327b91f71ee1cac
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/aaa-authn-api/pom.xml b/aaa-authn-api/pom.xml
index f14259de54c09ac2a2825bf3b36e5a326f2ee24e..f6bf310367d71692dba00cc9dbfea8067033e25c 100644 (file)
--- a/aaa-authn-api/pom.xml
+++ b/aaa-authn-api/pom.xml
@@ -6,8 +6,7 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.aaa</groupId>

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index 2e20121cb8be734a04284a16c0f990ea7ecf67aa..92787397901017c0046b0f0c40efce6bb0321532 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -5,8 +5,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
     <groupId>org.opendaylight.aaa</groupId>
@@ -50,6 +49,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
+      <version>2.8.9</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -62,9 +62,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>powermock-module-junit4</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.21.0-GA</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <version>1.7.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/aaa-cli-jar/pom.xml b/aaa-cli-jar/pom.xml
index 3fcd9f1adc7b9f3ad78e90724a285cf35490d4a1..f3b14a1170f82c98a127601a6b33a54761a875e7 100644 (file)
--- a/aaa-cli-jar/pom.xml
+++ b/aaa-cli-jar/pom.xml
@@ -6,8 +6,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

diff --git a/aaa-cli/pom.xml b/aaa-cli/pom.xml
index 0d4213d14801c8679c9e49a5940042c749e510b6..51b13ae13145b2109450169443ae1db3a8aca0d8 100644 (file)
--- a/aaa-cli/pom.xml
+++ b/aaa-cli/pom.xml
@@ -6,8 +6,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
     <groupId>org.opendaylight.aaa</groupId>
@@ -45,23 +44,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>aaa-shiro</artifactId>
     </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
     <build>

diff --git a/aaa-cli/src/test/java/org/opendaylight/aaa/cli/test/DataStoreUtilsTest.java b/aaa-cli/src/test/java/org/opendaylight/aaa/cli/test/DataStoreUtilsTest.java
index 90d5cca67e162180bc692239bfaf03e2d06b4b00..a9d25236b4e354b6505541da668324aa2d4eaceb 100644 (file)
--- a/aaa-cli/src/test/java/org/opendaylight/aaa/cli/test/DataStoreUtilsTest.java
+++ b/aaa-cli/src/test/java/org/opendaylight/aaa/cli/test/DataStoreUtilsTest.java
@@ -18,7 +18,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.aaa.api.IDMStoreException;
 import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.api.model.Domain;
@@ -30,15 +30,13 @@ import org.opendaylight.aaa.api.model.Roles;
 import org.opendaylight.aaa.api.model.User;
 import org.opendaylight.aaa.api.model.Users;
 import org.opendaylight.aaa.cli.utils.DataStoreUtils;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
  * Test Suite for the DataStore Utils.
  * @author mserngawy
  *
  */
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class DataStoreUtilsTest {
 
     @Mock
@@ -51,7 +49,6 @@ public class DataStoreUtilsTest {
 
     @Before
     public void setUp() throws Exception {
-        identityStore = PowerMockito.mock(IIDMStore.class, Mockito.CALLS_REAL_METHODS);
         final Domains domains = new Domains();
         Domain domain = new Domain();
         domain.setName(domainName);

diff --git a/aaa-encrypt-service/api/pom.xml b/aaa-encrypt-service/api/pom.xml
index 2ff7d753d1d9df15baf0c27095cf8edb6b10ff1b..374870c2aeeb56156be652ad91c3781bafe549bd 100644 (file)
--- a/aaa-encrypt-service/api/pom.xml
+++ b/aaa-encrypt-service/api/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -19,7 +18,6 @@
     <dependency>
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-core</artifactId>
-      <version>1.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>

diff --git a/aaa-encrypt-service/impl/pom.xml b/aaa-encrypt-service/impl/pom.xml
index 7e42d8ce7d70763cf0c40350451bd7e45f209b17..dfba86cb1393c80a6e798c0f898cb5a557073efc 100644 (file)
--- a/aaa-encrypt-service/impl/pom.xml
+++ b/aaa-encrypt-service/impl/pom.xml
@@ -6,8 +6,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -59,7 +58,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-core</artifactId>
-      <version>1.6.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -69,6 +67,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
+      <version>2.8.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.21.0-GA</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -83,7 +88,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <version>1.7.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index 95b7b058526703df0247c072b8773a4703746579..03b2677c15c8b91f1723e55e25e5c42fb490977f 100644 (file)
--- a/aaa-encrypt-service/pom.xml
+++ b/aaa-encrypt-service/pom.xml
@@ -5,13 +5,12 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.1.0</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-filterchain/pom.xml b/aaa-filterchain/pom.xml
index bef07cf687e31ae8223a37d17ee4533d06588e70..2b2216ecde0a26bec0363894ea0280fffd7911db 100644 (file)
--- a/aaa-filterchain/pom.xml
+++ b/aaa-filterchain/pom.xml
@@ -1,9 +1,9 @@
+<?xml version="1.0"?>
 <!-- Copyright (c) 2015 Brocade Communications Systems, Inc. and others.
   All rights reserved. This program and the accompanying materials are made
   available under the terms of the Eclipse Public License v1.0 which accompanies
   this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.aaa</groupId>

diff --git a/aaa-password-service/api/pom.xml b/aaa-password-service/api/pom.xml
index 71f08f09879c2005b1dfa30acc514f921083f0bb..be11196df8300c34d70f056b28574b12d71c8a82 100644 (file)
--- a/aaa-password-service/api/pom.xml
+++ b/aaa-password-service/api/pom.xml
@@ -6,8 +6,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

diff --git a/aaa-password-service/impl/pom.xml b/aaa-password-service/impl/pom.xml
index 113d0d7fdb3f49c08c0ca894d0341058e6c8c4e4..fd7ef3848d4e6204cc37605b8477147523a12638 100644 (file)
--- a/aaa-password-service/impl/pom.xml
+++ b/aaa-password-service/impl/pom.xml
@@ -6,8 +6,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

diff --git a/aaa-password-service/pom.xml b/aaa-password-service/pom.xml
index 533a4ab72c857e67e45bf8d3cc2da31c1312b570..25fa5095c1285111d6be251172e5f6cb0211946a 100644 (file)
--- a/aaa-password-service/pom.xml
+++ b/aaa-password-service/pom.xml
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-shiro/api/pom.xml b/aaa-shiro/api/pom.xml
index 3badb09bf633fefc0e4a26f7210ad7ac7466f6cd..eecfb12a6cab0939d572c7547a04f22c4b1c47b8 100644 (file)
--- a/aaa-shiro/api/pom.xml
+++ b/aaa-shiro/api/pom.xml
@@ -6,8 +6,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index daa8dabdf70f247b40a9fc46c65b2fdeb8eb667b..7e6a960520ed43dd7f2d4eba14e8bc6b00b63e93 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -7,8 +7,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/ShiroWebContextSecurer.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/ShiroWebContextSecurer.java
index df34b736ce6a84638cffb4d3a831afb7f240465d..c1fd809f251ddd3f99c4e74c8028d6f65c8be601 100644 (file)
--- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/ShiroWebContextSecurer.java
+++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/ShiroWebContextSecurer.java
@@ -34,10 +34,10 @@ public class ShiroWebContextSecurer implements WebContextSecurer {
             .addListener(shiroEnvironmentLoaderListener)
 
             // AAA filter in front of these REST web services as well as for moon endpoints
-            .addFilter(FilterDetails.builder().filter(new AAAShiroFilter()).addUrlPattern(urlPatterns).build())
+            .addFilter(FilterDetails.builder().filter(new AAAShiroFilter()).addUrlPatterns(urlPatterns).build())
 
             // CORS filter
-            .addFilter(FilterDetails.builder().filter(new CrossOriginFilter()).addUrlPattern(urlPatterns)
+            .addFilter(FilterDetails.builder().filter(new CrossOriginFilter()).addUrlPatterns(urlPatterns)
                .putInitParam("allowedOrigins", "*")
                .putInitParam("allowedMethods", "GET,POST,OPTIONS,DELETE,PUT,HEAD")
                .putInitParam("allowedHeaders", "origin, content-type, accept, authorization")

diff --git a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealmTest.java b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealmTest.java
index 6948b2475f3fe423c327aee902e6bb3e5bca317d..286391010e0d5546cdc92148e45e43af992c8738 100644 (file)
--- a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealmTest.java
+++ b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealmTest.java
@@ -11,8 +11,8 @@ import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -106,7 +106,6 @@ public class KeystoneAuthRealmTest {
         when(requestBuilder.entity(any())).thenReturn(requestBuilder);
         when(requestBuilder.queryParam("nocatalog", "")).thenReturn(requestBuilder);
         when(requestBuilder.build()).thenReturn(httpRequest);
-        when(builder.queryParam(any(String.class), any(String.class))).thenReturn(builder);
         when(httpRequest.execute()).thenReturn(response);
         when(response.getToken()).thenReturn(ksToken);
 
@@ -206,6 +205,8 @@ public class KeystoneAuthRealmTest {
     @Test(expected = AuthenticationException.class)
     public void doGetAuthenticationInfoUnknownTokenType() throws Exception {
         AuthenticationToken token = new AuthenticationToken() {
+            private static final long serialVersionUID = 1L;
+
             @Override
             public Object getPrincipal() {
                 return null;

diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index 59a8a0376d6a47cea04139af4e501462f2cbe047..3a757c306efcc9abc653838a1eedecdb19193b6f 100644 (file)
--- a/aaa-shiro/pom.xml
+++ b/aaa-shiro/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7586a791f4dc04f4b0c6c2686f8a46b193130842..94de418afcaa7dbe467665d7fd154cc31422d7b7 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>3.1.3</version>
+      <version>4.0.2</version>
       <relativePath/>
     </parent>
 

diff --git a/dependency-check/pom.xml b/dependency-check/pom.xml
index 8681e5ca04ba0c373a958526a29592ddff01ca28..34fd6b794fa59656dae674b69889e2d221356d9d 100644 (file)
--- a/dependency-check/pom.xml
+++ b/dependency-check/pom.xml
@@ -6,9 +6,7 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index ae032576e22499b5008f1159789a15696449050c..91e9a6e4a3c1105c4cf218c0554f2766f6258d2e 100644 (file)
--- a/features/features-aaa/pom.xml
+++ b/features/features-aaa/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index 3932415550b136b0b3d730059b03c55f2a8eca81..b9925e33029cd26b21dc25411a52dd934b291893 100644 (file)
--- a/features/odl-aaa-api/pom.xml
+++ b/features/odl-aaa-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>2.6.0-SNAPSHOT</version>
+            <version>3.0.1</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index 03b133daff57985d8e8fdec7152deb8ecd89b3bc..842e4d9b104874fec94f01d7c0bcc955f85f87e2 100644 (file)
--- a/features/odl-aaa-cert/pom.xml
+++ b/features/odl-aaa-cert/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-cli/pom.xml b/features/odl-aaa-cli/pom.xml
index 59cf4583d4866c7ea1aa9de8d652aff80ec765fb..a11375985d01eff1cc22c429a15d77b4438c0e57 100644 (file)
--- a/features/odl-aaa-cli/pom.xml
+++ b/features/odl-aaa-cli/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index 8731b42f00e678b93de94ee022446a8f69611d39..be68b2b39e923c2266511f8e66beb4a4850faff3 100644 (file)
--- a/features/odl-aaa-encryption-service/pom.xml
+++ b/features/odl-aaa-encryption-service/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 
@@ -36,6 +36,13 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-apache-sshd</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- MD-SAL -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index 263b1233652c9a33c1200d5f658b47ca60813823..36131ac86bd605581d84179288b68d55bda4f8e6 100644 (file)
--- a/features/odl-aaa-password-service/pom.xml
+++ b/features/odl-aaa-password-service/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>2.6.0-SNAPSHOT</version>
+            <version>3.0.1</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index e15f1bc471528f04a2b730eca3b822c0cc4d6532..fdce3233a147fb2f9d82e1e5567e22840516f59d 100644 (file)
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-shiro/src/main/feature/feature.xml b/features/odl-aaa-shiro/src/main/feature/feature.xml
index 379a25acedc2d8d74be58aee1bf94dea417b0e60..dd46007e5c58507e1d0a21379ca21c5100398be9 100644 (file)
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -23,7 +23,7 @@
         <configfile finalname="/etc/org.opendaylight.aaa.filterchain.cfg">
             mvn:org.opendaylight.aaa/aaa-filterchain/${project.version}/cfg/config
         </configfile>
-        <feature version="[3.1.0,4)">odl-karaf-feat-jdbc</feature>
-        <feature version="[3.1.0,4)">odl-karaf-feat-jetty</feature>
+        <feature version="[4,5)">odl-karaf-feat-jdbc</feature>
+        <feature version="[4,5)">odl-karaf-feat-jetty</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index 9f071b19dceb5f037621d7954727cebb6b016009..5beeb04275d3e43eb08abf0e5ef75bf5b5c8a388 100644 (file)
--- a/features/odl-aaa-web/pom.xml
+++ b/features/odl-aaa-web/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 
@@ -42,7 +42,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.10</version>
+                <version>2.1.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -52,8 +52,8 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-guava-23</artifactId>
-            <version>3.1.3</version>
+            <artifactId>odl-guava</artifactId>
+            <version>4.0.2</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features/odl-aaa-web/src/main/feature/feature.xml b/features/odl-aaa-web/src/main/feature/feature.xml
index 5057c15cb04ce398e7fc9e8c56edb5e020a1f9e0..45da290661f737d7c81dd6fad1bdaf815c4d890d 100644 (file)
--- a/features/odl-aaa-web/src/main/feature/feature.xml
+++ b/features/odl-aaa-web/src/main/feature/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-web" version="${project.version}">
-        <feature version="[3.1.0,4)">odl-karaf-feat-jetty</feature>
-        <feature version="[3.1.0,4)">odl-guava-23</feature>
-        <feature version="[2.0.10,3)">odl-yangtools-util</feature>
+        <feature version="[4,5)">odl-karaf-feat-jetty</feature>
+        <feature version="[4,5)">odl-guava</feature>
+        <feature version="[2.1,3)">odl-yangtools-util</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 6d5c73a2163b84e0ed7e3357fd113d92c3b1e3ac..071f3b993eef5bf896d52f6f1dd8a973b557eb0e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index e8dafade43381af388553835856439b74f9b9462..d2d61f83fc531e17175d2fec29b53ec1e0fad3e7 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index 393bd2abca5a159c82b66d55fb6ffa2acd3a0ea0..375ac798c7d43e28473ba847688d2b17f45a1d22 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
-    <relativePath />
+    <version>3.0.1</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.aaa</groupId>

diff --git a/pom.xml b/pom.xml
index 9b5db699f0ee087f842e2695be0ed7f60a22f9e5..9fd2e116a8337ac9b071d6616557461eb9f4d5f6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/web/api/pom.xml b/web/api/pom.xml
index a41e8927f6b1e5f57a1338b7a8bfe4cf09d0db33..c0c0f21f33b345b96d76877393ca0b430f6ec9aa 100644 (file)
--- a/web/api/pom.xml
+++ b/web/api/pom.xml
@@ -6,8 +6,7 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

diff --git a/web/api/src/test/java/org/opendaylight/aaa/web/tests/WebContextApiTest.java b/web/api/src/test/java/org/opendaylight/aaa/web/tests/WebContextApiTest.java
index 7879c2e59882e2d63572892091bf9ac41d451d4a..be01cd9a24b3530f8d60038ceded501e1ad479dc 100644 (file)
--- a/web/api/src/test/java/org/opendaylight/aaa/web/tests/WebContextApiTest.java
+++ b/web/api/src/test/java/org/opendaylight/aaa/web/tests/WebContextApiTest.java
@@ -50,7 +50,7 @@ public class WebContextApiTest {
         assertThat(webContext.servlets()).hasSize(1);
         ServletDetails firstServletDetail = webContext.servlets().get(0);
         assertThat(firstServletDetail.name())
-                .startsWith("$javax.servlet.Servlet$$EnhancerByMockitoWithCGLIB$$");
+                .startsWith("org.mockito.codegen.Servlet$MockitoMock$");
         assertThat(firstServletDetail.initParams()).isEmpty();
     }
 

diff --git a/web/impl-jetty/pom.xml b/web/impl-jetty/pom.xml
index 4e9b216c1ed98a2b54e47bd2a7ca8eaa100cde0f..91ac6395a46e4c4d676b999d7889a19d7714026b 100644 (file)
--- a/web/impl-jetty/pom.xml
+++ b/web/impl-jetty/pom.xml
@@ -6,8 +6,7 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

diff --git a/web/impl-osgi/pom.xml b/web/impl-osgi/pom.xml
index 4738398211fa8f5fcd2c7f6da611a980bfdbf62a..ddcb509b6ec9dd27ac4626c13d1532b81e089e93 100644 (file)
--- a/web/impl-osgi/pom.xml
+++ b/web/impl-osgi/pom.xml
@@ -6,8 +6,7 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -32,8 +31,6 @@
     <dependency>
       <groupId>org.ops4j.pax.web</groupId>
       <artifactId>pax-web-api</artifactId>
-      <!-- This version must be exactly the same as the one used in ODL's Karaf! -->
-      <version>6.0.9</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -45,8 +42,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.ops4j.pax.cdi</groupId>
-      <artifactId>pax-cdi-api</artifactId>
+      <groupId>org.apache.aries.blueprint</groupId>
+      <artifactId>blueprint-maven-plugin-annotation</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>

diff --git a/web/impl-osgi/src/main/java/org/opendaylight/aaa/web/osgi/PaxWebServer.java b/web/impl-osgi/src/main/java/org/opendaylight/aaa/web/osgi/PaxWebServer.java
index 28e1cfc09e1f81f9b02b0f520343c78187570e10..c08d7cf118bf0fa8e4be9d3bf8a3b73bfe622193 100644 (file)
--- a/web/impl-osgi/src/main/java/org/opendaylight/aaa/web/osgi/PaxWebServer.java
+++ b/web/impl-osgi/src/main/java/org/opendaylight/aaa/web/osgi/PaxWebServer.java
@@ -19,12 +19,12 @@ import javax.servlet.Filter;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContextListener;
 import javax.servlet.ServletException;
+import org.apache.aries.blueprint.annotation.service.Reference;
 import org.opendaylight.aaa.web.ResourceDetails;
 import org.opendaylight.aaa.web.ServletDetails;
 import org.opendaylight.aaa.web.WebContext;
 import org.opendaylight.aaa.web.WebContextRegistration;
 import org.opendaylight.aaa.web.WebServer;
-import org.ops4j.pax.cdi.api.OsgiService;
 import org.ops4j.pax.web.service.WebContainer;
 import org.ops4j.pax.web.service.WebContainerDTO;
 import org.osgi.framework.Bundle;
@@ -56,7 +56,7 @@ public class PaxWebServer {
     private final ServiceRegistration<?> serviceRegistration;
 
     @Inject
-    public PaxWebServer(@OsgiService WebContainer paxWebContainer, BundleContext bundleContext) {
+    public PaxWebServer(@Reference WebContainer paxWebContainer, BundleContext bundleContext) {
         this.paxWeb = paxWebContainer;
 
         serviceRegistration = bundleContext.registerService(new String[]{WebServer.class.getName()},

diff --git a/web/pom.xml b/web/pom.xml
index 01d6829bd02f71929a052820fb321f233842e3a3..d1a181efde693b2e45f49bba111e33cc0ddbac4b 100644 (file)
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/web/servlet-api/pom.xml b/web/servlet-api/pom.xml
index ca7fe2d4c19182af988fc1d584272c371717c461..5e9ffa7d006dbef514ca7abd07593cb555088f35 100644 (file)
--- a/web/servlet-api/pom.xml
+++ b/web/servlet-api/pom.xml
@@ -6,8 +6,7 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

diff --git a/web/servlet-jersey2/pom.xml b/web/servlet-jersey2/pom.xml
index 659cc4c3d3db79585f760d1e2a1cef1072b8957a..74ae2f38ec6b1c98bf1d107ca04ab6dccdc5cb04 100644 (file)
--- a/web/servlet-jersey2/pom.xml
+++ b/web/servlet-jersey2/pom.xml
@@ -6,8 +6,7 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -44,6 +43,8 @@
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
+            <!-- Override the odlparent version -->
+            <version>2.25.1</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>