<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>3.1.4</version>
+ <version>3.1.5</version>
<relativePath />
</parent>
<!-- CCSDK component versions -->
- <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.core.version>0.5.0-SNAPSHOT</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>0.5.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>0.5.0-SNAPSHOT</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>0.5.0-SNAPSHOT</ccsdk.sli.plugins.version>
+ <ccsdk.distribution.version>0.5.0-SNAPSHOT</ccsdk.distribution.version>
<sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
<sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
<sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.8.1</odl.controller.mdsal.version>
- <odl.mdsal.version>2.5.1</odl.mdsal.version>
- <odl.mdsal.model.version>0.13.1</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.8.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.5.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.8.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.8.2</odl.controller.mdsal.version>
+ <odl.mdsal.version>2.5.2</odl.mdsal.version>
+ <odl.mdsal.model.version>0.13.2</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.8.2</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.5.2</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.8.2</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.11</commons.codec.version>
<!-- Used by netconf, ovsdb -->
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
<jackson.version>2.8.11</jackson.version>
+ <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.23.1-GA</javassist.version>
+ <javassist.version>3.24.0-GA</javassist.version>
<!-- FIXME remove all dependencies for jersey 1.17 after migration all
projects -->
<!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560
is fixed (either in PowerMock or with a new JUnit release) -->
<!-- Used everywhere -->
- <junit.version>4.11</junit.version>
+ <junit.version>4.12</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
<logback.version>1.2.3</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>1.10.19</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.30.Final</netty.version>
+ <netty.version>4.1.31.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
toolkit -->
<slf4j.version>1.7.25</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
tsdr, ttp -->
- <spring.version>3.2.17.RELEASE</spring.version>
+ <spring.version>4.3.18.RELEASE</spring.version>
<equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
<jackson-annotations-version>${jackson.version}</jackson-annotations-version>
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
- <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
<antlr.version>4.7.1</antlr.version>
<mysql.connector.version>5.1.39</mysql.connector.version>
- <mariadb.connector.version>2.1.1</mariadb.connector.version>
- <h2database.version>1.4.196</h2database.version>
- <derby.version>10.14.2.0</derby.version>
- <eelf.version>1.0.0</eelf.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
- <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
- <glassfish.version>2.27</glassfish.version>
+ <!-- Managed dependency versions -->
+ <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+ <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+ <derby.version>10.14.2.0</derby.version>
+ <eelf.version>1.0.0</eelf.version>
+ <grpc.version>1.17.1</grpc.version>
+ <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+ <jersey.version>2.25.1</jersey.version>
+ <junit.version>4.12</junit.version>
+ <logback.version>1.2.3</logback.version>
+ <mariadb.connector.version>2.1.1</mariadb.connector.version>
+ <mariadb4j.version>2.2.3</mariadb4j.version>
+ <spring.version>4.3.18.RELEASE</spring.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ <testng.version>6.11</testng.version>
+ <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
</properties>
<!-- End of profiles from ONAP oparent -->
<profile>
+ <id>yang-compile</id>
<activation>
<file>
<exists>src/main/yang</exists>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
+ <version>2.1.8</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<dependencyManagement>
<dependencies>
+
+ <!-- Note: If value in BOM conflicts with value inherited from
+ parent pom, inherited value takes precedence. This seems more like
+ a bug than a feature, but this is how maven 3.6 works -->
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>${odl.controller.mdsal.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>${odl.mdsal.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>mdsal-model-artifacts</artifactId>
- <version>${odl.mdsal.model.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-artifacts</artifactId>
- <version>${odl.netconf.netconf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>restconf-artifacts</artifactId>
- <version>${odl.netconf.restconf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-core-artifacts</artifactId>
- <version>${ccsdk.sli.core.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>sli-adaptors-artifacts</artifactId>
- <version>${ccsdk.sli.adaptors.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.northbound</groupId>
- <artifactId>sli-northbound-artifacts</artifactId>
- <version>${ccsdk.sli.northbound.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>sli-plugins-artifacts</artifactId>
- <version>${ccsdk.sli.plugins.version}</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-odl-bom</artifactId>
+ <version>1.3.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
-
+ <!-- Override versions in ODL parent poms -->
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-test-model</artifactId>
- <version>${odl.controller.mdsal.version}</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-broker-impl</artifactId>
- <version>${odl.controller.mdsal.version}</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-broker-impl</artifactId>
- <version>${odl.controller.mdsal.version}</version>
- <type>test-jar</type>
- <classifier>tests</classifier>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.11</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>com.att.eelf</groupId>
- <artifactId>eelf-core</artifactId>
- <version>${eelf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>3.6.1</version>
</dependency>
</dependencies>
<plugins>
<!-- Plugins from ONAP version (parent of oparent) -->
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${onap.nexus.url}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<requireReleaseDeps>
<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
<onlyWhenRelease>true</onlyWhenRelease>
- <level>ERROR</level>
+ <level>WARN</level>
</requireReleaseDeps>
</rules>
</configuration>
<plugins>
<!-- Plugins from oparent version (parent of oparent) -->
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
- <failsOnViolation>false</failsOnViolation>
+ <failOnViolation>false</failOnViolation>
</configuration>
</execution>
<execution>
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
- <failsOnViolation>false</failsOnViolation>
+ <failOnViolation>false</failOnViolation>
</configuration>
</execution>
</executions>
Code Review / ccsdk / parent.git / blobdiff