<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../odlparent-lite</relativePath>
</parent>
toolkit -->
<checkstyle.version>2.17</checkstyle.version>
<!-- Used in controller, packetcable -->
- <odl.checkstyle.version>0.4.0-SNAPSHOT</odl.checkstyle.version>
+ <odl.checkstyle.version>2.1.0-SNAPSHOT</odl.checkstyle.version>
<!-- Used in snmp4sdn; see also toolkit -->
<compiler.version>${maven.compile.plugin.version}</compiler.version>
<!-- Used in controller, l2switch, netide, openflowjava, openflowplugin, snbi, tsdr, ttp; see also toolkit -->
<!-- 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>
<jacoco.version>0.7.7.201606060606</jacoco.version>
<!-- Used in aaa, controller, coretutorials, integration/distribution, l2switch, lacp, lispflowmapping, netide,
nic, openflowplugin, ovsdb, persistence, sfc, snbi, snmp4sdn?, sxp, topoprocessing, unimgr, vtn -->
- <karaf.version>3.0.8</karaf.version>
- <karaf4.version>4.0.9</karaf4.version>
- <karaf4.plugin.version>4.0.9</karaf4.plugin.version>
+ <karaf.version>4.0.9</karaf.version>
+ <karaf.plugin.version>4.0.9</karaf.plugin.version>
<!-- Used in lispflowmapping, snmp4sdn, vtn -->
<projectinfo>2.8.1</projectinfo>
<!-- Used in of-config; see also snmp4sdn -->
<!-- Supporting Libraries -->
<!-- Used by controller -->
- <bouncycastle.version>1.56</bouncycastle.version>
+ <bouncycastle.version>1.57</bouncycastle.version>
<!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
<osgi.core.version>5.0.0</osgi.core.version>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-artifacts</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<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 -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>1.1.9</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.9</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>22.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
- <version>18.0</version>
+ <version>22.0</version>
<scope>test</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.5</version>
+ <version>3.6</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.3.2</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>2.3.2</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-json-org</artifactId>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-osgi</artifactId>
- <version>1.3.3</version>
+ <version>1.3.6</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<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>
<version>${exam.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-forked</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
<version>${exam.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-extender-service</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-inject</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-invoker-junit</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-features</artifactId>
+ <version>${exam.version}</version>
+ <type>xml</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-link</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-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>
<version>1.6</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<artifactId>jetty-webapp</artifactId>
<version>9.2.19.v20160908</version>
</dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.4.2</version>
- </dependency>
<dependency>
<groupId>com.h2database</groupId>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
- <version>2.11.0</version>
+ <version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib.macro</artifactId>
- <version>2.11.0</version>
+ <version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.lib</artifactId>
- <version>2.11.0</version>
+ <version>2.12.0</version>
</dependency>
<!-- Annotations -->
<version>${karaf.version}</version>
</dependency>
+ <!-- When updating this version, consider antl4-maven-plugin below -->
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ <version>4.7</version>
+ </dependency>
+ <!-- Aries' Blueprint version should be kept in sync to the version actually
+ used by our ${karaf[4].version} ... please bump this when increasing that.
+ TODO Find a smarter way to inherit this from a (TBD..) Karaf artifacts BOM! -->
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<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>
<artifactId>checkstyle</artifactId>
- <version>${odl.checkstyle.version}</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.sevntu.checkstyle</groupId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.6</version>
+ <version>3.8</version>
<executions>
<execution>
<id>cpd</id>
<artifactItem>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<!-- Note the '-' for git.properties.. this is required because git-commit-id-plugin has <failOnNoGitDirectory>false,
so that the build doesn't fail if there is no .../.git/ - so git.properties is effectively optional;
and so the '-' there is needed to make the maven-bundle-plugin if that resource is not present. -->
- <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
+ <Include-Resource>{maven-resources},${project.build.directory}/classes/LICENSE,META-INF/git.properties=-${project.build.directory}/classes/META-INF/git.properties</Include-Resource>
</instructions>
</configuration>
</plugin>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>findbugs</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<!-- NOTE: This version MUST be kept in sync with the Xtend version in <dependencyManagement> -->
- <version>2.11.0</version>
+ <version>2.12.0</version>
<executions>
<execution>
<goals>
</execution>
</executions>
</plugin>
+
+ <!-- When updating this version, consider antl4-runtime above -->
+ <plugin>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-maven-plugin</artifactId>
+ <version>4.7</version>
+ </plugin>
</plugins>
</pluginManagement>
<!-- 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>
</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>
</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>
<configuration>
<links>
<link>http://doc.akka.io/japi/akka/${akka.version}/</link>
- <link>https://google.github.io/guava/releases/18.0/api/docs/</link>
- <link>https://google.github.io/guava/releases/19.0/api/docs/</link>
+ <link>https://google.github.io/guava/releases/22.0/api/docs/</link>
<link>http://netty.io/4.1/api/</link>
</links>
</configuration>
Code Review / odlparent.git / blobdiff