Code Review / ccsdk / parent.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Changing spring.version property in all parent poms
[ccsdk/parent.git] / odlparent / setup / src / main / resources / pom-template.xml
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index cc038a8..6ed32b2 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -93,11 +93,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.1-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>
@@ -106,12 +106,12 @@
 
 
                <!-- 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 -->
@@ -133,8 +133,9 @@
                <!-- 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 -->
@@ -156,19 +157,19 @@
                <!-- 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>
 
 
 
@@ -440,7 +441,29 @@
                </profile>
 
                <!-- End of profiles from ONAP oparent -->
-
+               <profile>
+                       <id>nexus-staging</id>
+                       <activation>
+                           <property>
+                               <name>!altDeploymentRepository</name>
+                           </property>
+                       </activation>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.sonatype.plugins</groupId>
+                                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                                               <version>1.6.7</version>
+                                               <extensions>true</extensions>
+                                               <configuration>
+                                                       <nexusUrl>https://${onap.nexus.host}</nexusUrl>
+                                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <activation>
                                <file>
@@ -452,6 +475,7 @@
                                        <plugin>
                                                <groupId>org.opendaylight.yangtools</groupId>
                                                <artifactId>yang-maven-plugin</artifactId>
+                                               <version>2.1.8</version>
                                                <dependencies>
                                                        <dependency>
                                                                <groupId>org.opendaylight.mdsal</groupId>
@@ -532,6 +556,13 @@
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
+                       <dependency>
+                           <groupId>com.fasterxml.jackson</groupId>
+                           <artifactId>jackson-bom</artifactId>
+                           <version>\${jackson.bom.version}</version>
+                           <type>pom</type>
+                           <scope>import</scope>
+                       </dependency>
 
                        <dependency>
                                <groupId>org.opendaylight.controller</groupId>
@@ -551,7 +582,12 @@
                                <classifier>tests</classifier>
                                <scope>test</scope>
                        </dependency>
-
+                       <dependency>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               <version>\${junit.version}</version>
+                               <scope>test</scope>
+                       </dependency>
 
                        <dependency>
                                <groupId>org.testng</groupId>
@@ -747,17 +783,7 @@
                        <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>
@@ -810,7 +836,7 @@
                                                                        <requireReleaseDeps>
                                                                                <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
                                                                                <onlyWhenRelease>true</onlyWhenRelease>
-                                                                               <level>ERROR</level>
+                                                                               <level>WARN</level>
                                                                        </requireReleaseDeps>
                                                                </rules>
                                                        </configuration>
@@ -983,10 +1009,6 @@
                <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>
Parent POMs to be used by CCSDK clients