Make sure CLI components are scope=provided

[odlparent.git] / odlparent / pom.xml

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index f9a5348c647fee2703a28db0193a808bcf30fdb1..ffd3083f26d943e33959c65a8f2fb16ee21b2a3c 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.1-SNAPSHOT</version>
     <relativePath>../odlparent-lite</relativePath>
   </parent>
 
@@ -52,7 +52,7 @@
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
-    <bouncycastle.version>1.62</bouncycastle.version>
+    <bouncycastle.version>1.63</bouncycastle.version>
 
     <!-- JaCoCo configuration, by default tied to Sonar configuration, but can be overridden separately
          to allow projects to report Sonar values from the entire project. -->
@@ -101,7 +101,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.1-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -351,8 +351,11 @@
         <groupId>com.google.inject</groupId>
         <artifactId>guice</artifactId>
         <!-- Make sure this version is in sync with the one used by mycila-guice-jsr250 above
-             by checking it here: https://github.com/mycila/guice/blob/master/pom.xml#L103 -->
-        <version>4.1.0</version>
+             by checking it here: https://github.com/mycila/guice/blob/master/pom.xml#L103.
+
+             Well, mycila is dead as a dodo and we need to support Java 11. This is the best
+             we can do in the interim. -->
+        <version>4.2.2</version>
       </dependency>
       <dependency>
         <groupId>commons-beanutils</groupId>
@@ -457,23 +460,23 @@
       </dependency>
 
       <!-- These three need to be consistent:
-        jackson-2.9 needs woodstox-5.0.x
-        woodstox-5.0 needs stax2-api-3.1.x
+        jackson-2.9.10 needs woodstox-5.3.x
+        woodstox-5.3 needs stax2-api-4.2.x
         -->
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>stax2-api</artifactId>
-        <version>3.1.4</version>
+        <version>4.2</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.woodstox</groupId>
         <artifactId>woodstox-core</artifactId>
-        <version>5.0.3</version>
+        <version>5.3.0</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.9.9.20190807</version>
+        <version>2.9.10</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -526,37 +529,37 @@
         <artifactId>netty-all</artifactId>
         <!-- If these are updated, the version in features.xml needs to be changed too -->
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-buffer</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec-http</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-common</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-handler</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <!-- Here we need to define all available native epoll implementations; we can't limit ourselves to the build
       platform and we can't require the build platform to have an implementation (e.g. OS X) -->
@@ -564,7 +567,7 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
         <classifier>linux-x86_64</classifier>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>javax.ws.rs</groupId>
@@ -645,7 +648,7 @@
       <dependency>
         <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
-        <version>3.24.1-GA</version>
+        <version>3.26.0-GA</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.spec.javax.transaction</groupId>
@@ -698,7 +701,7 @@
       <dependency>
         <groupId>org.reactivestreams</groupId>
         <artifactId>reactive-streams</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
       </dependency>
 
       <!-- Akka -->
@@ -1014,11 +1017,13 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>org.apache.karaf.shell.core</artifactId>
         <version>${karaf.version}</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>org.apache.karaf.shell.console</artifactId>
         <version>${karaf.version}</version>
+        <scope>provided</scope>
       </dependency>
 
       <!-- ThreeTen-Extra, date/time complements -->
@@ -1077,7 +1082,7 @@
       <dependency>
         <groupId>tech.pantheon.triemap</groupId>
         <artifactId>bom</artifactId>
-        <version>1.0.6</version>
+        <version>1.1.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -1177,10 +1182,6 @@
       <plugins>
         <!-- Official maven plugins, alpha-sorted by artifactId.
              We do not need to specify the groupId. -->
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.8</version>
-        </plugin>
         <plugin>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <version>3.1.0</version>
@@ -1194,7 +1195,7 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>6.0.0-SNAPSHOT</version>
+              <version>6.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>com.github.sevntu-checkstyle</groupId>
@@ -1316,10 +1317,6 @@
           <artifactId>maven-invoker-plugin</artifactId>
           <version>3.2.0</version>
         </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.1.2</version>
-        </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
           <executions>
@@ -1334,7 +1331,7 @@
                   <artifactItem>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>odl-license</artifactId>
-                    <version>6.0.0-SNAPSHOT</version>
+                    <version>6.0.1-SNAPSHOT</version>
                     <type>license</type>
                     <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                     <destFileName>LICENSE</destFileName>
@@ -1495,7 +1492,7 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>spotbugs</artifactId>
-              <version>6.0.0-SNAPSHOT</version>
+              <version>6.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
               <!-- The SpotBugs Maven plugin uses SLF4J 1.8 beta 2 -->
@@ -1726,20 +1723,6 @@
           <version>1.2.4</version>
         </plugin>
 
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>jdepend-maven-plugin</artifactId>
-          <version>2.0</version>
-          <executions>
-            <execution>
-              <phase>site</phase>
-              <goals>
-                <goal>generate-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-
         <!-- When updating this version, consider antl4-runtime above -->
         <plugin>
           <groupId>org.antlr</groupId>