Bump odlparent to 7.0.1

Update odlparent in preparation for Aluminium MRI, also adopting
Guice dependency versions.

Some updates are needed around Truth, but since we are using only
primitive assert, adopt plain JUnit asserts as needed.

Change-Id: I74495579c8d9a7b867b4058d5f2430425d6b190e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/inject-guice-testutils/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/ExampleGuiceRuleTest.java b/inject-guice-testutils/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/ExampleGuiceRuleTest.java
index 259d53e7060a28685995ce504e7e44deba5c312c..1c7efa089cf225a45e7fa8f1593e2d8f169ddb1b 100644 (file)
--- a/inject-guice-testutils/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/ExampleGuiceRuleTest.java
+++ b/inject-guice-testutils/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/ExampleGuiceRuleTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.infrautils.inject.guice.testutils.tests;
 
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import javax.inject.Inject;
 import org.junit.Rule;
@@ -25,8 +25,9 @@ public class ExampleGuiceRuleTest {
 
     @Inject SomeInterfaceWithPostConstruct someService;
 
-    @Test public void testGuiceWithRule() {
-        assertThat(someService.isInit()).named("isInit()").isTrue();
+    @Test
+    public void testGuiceWithRule() {
+        assertTrue(someService.isInit());
     }
 
     public static class TestModule extends AbstractGuiceJsr250Module {

diff --git a/inject-guice-testutils/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/ExamplePureGuiceTest.java b/inject-guice-testutils/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/ExamplePureGuiceTest.java
index eed96c92bea0262ddea7afb2db3476b96c95cf1d..aca9a4e10aa05e247decbb1232da73aff3ec089c 100644 (file)
--- a/inject-guice-testutils/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/ExamplePureGuiceTest.java
+++ b/inject-guice-testutils/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/ExamplePureGuiceTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.infrautils.inject.guice.testutils.tests;
 
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
@@ -29,7 +29,7 @@ public class ExamplePureGuiceTest {
     public void testPostConstruct() {
         Injector injector = Guice.createInjector(new TestModule());
         SomeClassWithPostConstruct someClass = injector.getInstance(SomeClassWithPostConstruct.class);
-        assertThat(someClass.isInit).named("isInit").isTrue();
+        assertTrue(someClass.isInit);
     }
 
     static class TestModule extends AbstractModule {

diff --git a/inject-guice/pom.xml b/inject-guice/pom.xml
index a17de16a2a6282518452b1a79c12d4e7ab29fd12..9f10bfce9826197e965e2560624163ee0b799429 100644 (file)
--- a/inject-guice/pom.xml
+++ b/inject-guice/pom.xml
@@ -32,12 +32,10 @@
     <dependency>
       <groupId>com.mycila.guice.extensions</groupId>
       <artifactId>mycila-guice-jsr250</artifactId>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>

diff --git a/pom.xml b/pom.xml
index a3092087bf1fc164c501fb6ddd21f69ec5cd8ee1..86603788eda4071759488969c87e9509adbc9717 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.4</version>
+    <version>7.0.1</version>
     <relativePath/>
   </parent>