Code Review / odlparent.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump Checkstyle from 6.16 to 7.6.1
[odlparent.git] / odlparent / pom.xml
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index bbbe529194382f02ba9e628dd3ceae13de9f5321..639ffa94762b509767e98c8e077bb376b86e0ccd 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -80,7 +80,7 @@
     <!-- Used in affinity, controller, nemo, opendove, snmp4sdn -->
     <enunciate.version>1.31</enunciate.version>
     <!-- Used in affinity, coretutorials, netide -->
-    <exam.version>4.10.0</exam.version>
+    <exam.version>4.11.0</exam.version>
     <!-- Used in affinity, controller, neutron, of-config; see also snmp4sdn -->
     <!-- Later versions break tests in downstream projects -->
     <failsafe.version>2.18.1</failsafe.version>
@@ -105,7 +105,7 @@
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
 
-    <akka.version>2.4.17</akka.version>
+    <akka.version>2.4.18</akka.version>
     <scala.version>2.11</scala.version>
     <scala.micro.version>11</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>
@@ -141,7 +141,7 @@
         <groupId>com.puppycrawl.tools</groupId>
         <artifactId>checkstyle</artifactId>
         <!-- This should match the plugin management on maven-checkstyle-plugin below -->
-        <version>6.16</version>
+        <version>7.6.1</version>
       </dependency>
 
       <!-- Testing Dependencies -->
@@ -940,6 +940,17 @@
         <version>${osgi.core.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <!-- for https://bugs.opendaylight.org/show_bug.cgi?id=4290 -->
+        <artifactId>org.osgi.service.event</artifactId>
+        <version>1.3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.aries.quiesce</groupId>
+        <artifactId>org.apache.aries.quiesce.api</artifactId>
+        <version>1.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm-all</artifactId>
@@ -1131,17 +1142,17 @@
       <dependency>
         <groupId>org.agrona</groupId>
         <artifactId>agrona</artifactId>
-        <version>0.9.2</version>
+        <version>0.9.5</version>
       </dependency>
       <dependency>
         <groupId>io.aeron</groupId>
         <artifactId>aeron-client</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.5</version>
       </dependency>
       <dependency>
         <groupId>io.aeron</groupId>
         <artifactId>aeron-driver</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.5</version>
       </dependency>
 
       <!-- Scala -->
@@ -1195,18 +1206,31 @@
         <version>${exam.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-link-assembly</artifactId>
+        <version>${exam.version}</version>
+        <scope>test</scope>
+      </dependency>
 
+      <dependency>
+        <groupId>org.ops4j.pax.url</groupId>
+        <artifactId>pax-url-link</artifactId>
+        <version>2.5.2</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-wrap</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
       </dependency>
+
       <dependency>
         <groupId>org.springframework.osgi</groupId>
         <artifactId>spring-osgi-mock</artifactId>
@@ -1219,6 +1243,7 @@
         <version>1.6</version>
         <scope>test</scope>
       </dependency>
+
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-client</artifactId>
@@ -1284,6 +1309,13 @@
         <groupId>javax.inject</groupId>
         <artifactId>javax.inject</artifactId>
         <version>1</version>
+        <optional>true</optional>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.cdi</groupId>
+        <artifactId>pax-cdi-api</artifactId>
+        <version>1.0.0.RC2</version>
+        <optional>true</optional>
       </dependency>
 
       <!-- Cassandra -->
@@ -1365,7 +1397,7 @@
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
               <!-- This should match the dependency management on com.puppycrawl.tools:checkstyle above -->
-              <version>6.16</version>
+              <version>7.6.1</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
@@ -1492,7 +1524,6 @@
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
           <executions>
             <execution>
               <id>unpack-license</id>
@@ -1979,8 +2010,9 @@
 
       <!-- Blueprint dependency injection -->
       <!-- Remove when upgrading to plugin 1.5.0, and use
-           <configuration><generatedDir>org/opendaylight/blueprint/</...></...> -->
-      <!-- See https://issues.apache.org/jira/browse/ARIES-1597 -->
+           <configuration><generatedDir>org/opendaylight/blueprint/</...></...>
+           See https://issues.apache.org/jira/browse/ARIES-1597
+           BUT beware that the directory is now conditional... -->
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -1995,10 +2027,19 @@
             </goals>
             <configuration>
               <target>
-                <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
-                <move file="${project.build.directory}/generated-resources/OSGI-INF/blueprint/autowire.xml"
-                      todir="${project.build.directory}/generated-resources/org/opendaylight/blueprint"
-                      failonerror="false" quiet="true" />
+                <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+                <if>
+                  <available file="${project.basedir}/src/main/resources/org/opendaylight/blueprint" type="dir"/>
+                  <then>
+                    <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
+                    <move file="${project.build.directory}/generated-resources/OSGI-INF/blueprint/autowire.xml"
+                          todir="${project.build.directory}/generated-resources/org/opendaylight/blueprint"
+                          failonerror="false" quiet="true" />
+                  </then>
+                  <else>
+                    <echo>NOT moving autowire.xml (to org/opendaylight/blueprint)</echo>
+                  </else>
+                </if>
               </target>
             </configuration>
           </execution>
@@ -2010,14 +2051,41 @@
             </goals>
             <configuration>
               <target>
-                <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
-                <move file="${project.build.directory}/generated-resources/OSGI-INF/blueprint/autowire.xml"
-                      todir="${project.build.directory}/generated-resources/org/opendaylight/blueprint"
-                      failonerror="false" quiet="true" />
+                <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+                <if>
+                  <available file="${project.basedir}/src/main/resources/org/opendaylight/blueprint" type="dir"/>
+                  <then>
+                    <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
+                    <move file="${project.build.directory}/generated-resources/OSGI-INF/blueprint/autowire.xml"
+                          todir="${project.build.directory}/generated-resources/org/opendaylight/blueprint"
+                          failonerror="false" quiet="true" />
+                  </then>
+                  <else>
+                    <echo>NOT moving autowire.xml (to org/opendaylight/blueprint)</echo>
+                  </else>
+                </if>
               </target>
             </configuration>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>ant-contrib</groupId>
+            <artifactId>ant-contrib</artifactId>
+            <version>1.0b3</version>
+            <exclusions>
+              <exclusion>
+                <groupId>ant</groupId>
+                <artifactId>ant</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-nodeps</artifactId>
+            <version>1.8.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>
odlparent