From 135e40799545c6cb73a8854340d7eefaaa68b67e Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Mon, 1 Jul 2019 13:08:58 -0400 Subject: Update parent poms for ODL Neon Update third party package versions to align with ODL Neon SR1. Change-Id: I82da85e6a9581726267be0f9cd64c4eb193ceda3 Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) --- changeVersion.sh | 20 ----- dependencies-bom/pom.xml | 8 +- dependencies-odl-bom/pom.xml | 67 ++++++++++------- odlparent/binding-parent/pom.xml | 87 +++++++++++----------- odlparent/bundle-parent/pom.xml | 87 +++++++++++----------- odlparent/client-parent/pom.xml | 2 +- odlparent/feature-repo-parent/pom.xml | 87 +++++++++++----------- odlparent/mdsal-it-parent/pom.xml | 87 +++++++++++----------- odlparent/odlparent-lite/pom.xml | 87 +++++++++++----------- odlparent/odlparent/pom.xml | 87 +++++++++++----------- odlparent/pom.xml | 4 +- odlparent/setup/pom.xml | 4 +- .../src/main/properties/binding-parent.properties | 2 +- .../src/main/properties/bundle-parent.properties | 2 +- .../main/properties/feature-repo-parent.properties | 2 +- .../src/main/properties/mdsal-it-parent.properties | 2 +- .../src/main/properties/odlparent-lite.properties | 2 +- .../setup/src/main/properties/odlparent.properties | 2 +- .../properties/single-feature-parent.properties | 2 +- .../setup/src/main/resources/pom-template.xml | 81 ++++++++++---------- odlparent/single-feature-parent/pom.xml | 87 +++++++++++----------- pom.xml | 2 +- springboot/pom.xml | 4 +- springboot/springboot1/pom.xml | 14 ++-- springboot/springboot2/pom.xml | 14 ++-- standalone/pom.xml | 2 +- tools/changeVersion.sh | 20 +++++ tools/fluorine2neon.sh | 47 ++++++++++++ version.properties | 4 +- 29 files changed, 500 insertions(+), 416 deletions(-) delete mode 100755 changeVersion.sh create mode 100755 tools/changeVersion.sh create mode 100755 tools/fluorine2neon.sh diff --git a/changeVersion.sh b/changeVersion.sh deleted file mode 100755 index 144ca539..00000000 --- a/changeVersion.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/bash - -if [ $# -ne 1 ] -then - echo "Usage: $0 new-version" - exit 1 -fi - - -mvn versions:set versions:update-child-modules versions:commit -B -DnewVersion=$1 - -base_version=$(echo $1 | cut -d- -f1) -major=$(echo $base_version | cut -d. -f1) -minor=$(echo $base_version | cut -d. -f2) -patch=$(echo $base_version | cut -d. -f3) - -if [ -f version.properties ] -then - sed -i '' -e 's/\(release_name=\).*/\1'$major'/;s/\(sprint_number=\).*/\1'$minor'/;s/\(feature_revision=\).*/\1'$patch'/' version.properties -fi diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index e0f3bb9b..d56fad6c 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent dependencies-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT @@ -47,7 +47,7 @@ com.fasterxml.jackson jackson-bom - 2.8.11.20181123 + 2.9.0 pom import @@ -131,12 +131,12 @@ org.apache.httpcomponents httpcore - 4.4.4 + 4.4.10 org.apache.httpcomponents httpclient - 4.5.2 + 4.5.6 org.apache.tomcat diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 4b560159..37d106cc 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent dependencies-odl-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.opendaylight.odlparent @@ -40,19 +40,19 @@ org.opendaylight.controller mdsal-artifacts - 1.8.2 + 1.9.1 pom import org.opendaylight.controller sal-binding-broker-impl - 1.8.2 + 1.9.1 org.opendaylight.controller sal-binding-broker-impl - 1.8.2 + 1.9.1 test-jar tests test @@ -60,33 +60,26 @@ org.opendaylight.controller sal-test-model - 1.8.2 + 1.9.1 org.opendaylight.mdsal mdsal-artifacts - 2.5.2 - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.13.2 + 3.0.8 pom import org.opendaylight.netconf netconf-artifacts - 1.5.2 + 1.6.1 pom import org.opendaylight.netconf restconf-artifacts - 1.8.2 + 1.9.1 pom import @@ -122,7 +115,7 @@ com.fasterxml.jackson jackson-bom - 2.8.11.20181123 + 2.9.0 pom import @@ -185,7 +178,7 @@ commons-io commons-io - 2.5 + 2.6 commons-logging @@ -227,6 +220,11 @@ javaee-api 7.0 + + javax.servlet + javax.servlet-api + 3.1.0 + javax.servlet servlet-api @@ -235,7 +233,7 @@ joda-time joda-time - 2.8.2 + 2.9.7 junit @@ -251,12 +249,12 @@ org.apache.commons commons-lang3 - 3.4 + 3.8.1 org.apache.commons commons-text - 1.1 + 1.6 org.apache.derby @@ -267,12 +265,12 @@ org.apache.httpcomponents httpcore - 4.4.4 + 4.4.10 org.apache.httpcomponents httpclient - 4.5.2 + 4.5.6 org.apache.lucene @@ -352,7 +350,7 @@ org.apache.sshd sshd-core - 0.12.0 + 1.7.0 org.apache.tomcat @@ -369,20 +367,30 @@ jackson-jaxrs 1.9.13 + + org.codehaus.jettison + jettison + 1.3.8 + org.eclipse.jetty jetty-servlet - 9.3.24.v20180605 + 9.4.12.v20180830 + + + org.eclipse.jetty + jetty-servlets + 9.4.12.v20180830 org.eclipse.jetty.websocket websocket-api - 9.3.24.v20180605 + 9.4.12.v20180830 org.eclipse.jetty.websocket websocket-servlet - 9.3.24.v20180605 + 9.4.12.v20180830 org.elasticsearch @@ -456,7 +464,7 @@ org.springframework spring-framework-bom - 4.3.18.RELEASE + 4.3.24.RELEASE pom import @@ -470,6 +478,11 @@ snakeyaml 1.15 + + xml-apis + xml-apis + 1.4.01 + diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 62f02aa5..7f2c2ace 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.opendaylight.mdsal binding-parent - 0.13.2 + 3.0.8 @@ -93,11 +93,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,36 +106,35 @@ - 1.8.2 - 2.5.2 - 0.13.2 - 1.8.2 - 1.5.2 - 1.8.2 + 1.9.1 + 3.0.8 + 1.0.8 + 1.9.1 + 1.6.1 + 1.9.1 + - 1.11 + 1.12 - 3.7 + 3.8.1 2.6 3.6 - 2.7.1 + 2.7.3 4.4.1 2.8.5 - 23.6.1-jre - - 1.3.1 + 25.1-jre - 2.8.11 - 2.8.11.20181123 + 2.9.8 + 2.9.8 - 3.24.0-GA + 3.24.1-GA @@ -150,12 +149,8 @@ 20131018 - - 1.3.8 - - 3.0.0 - + + 4.12 @@ -163,22 +158,20 @@ 1.10.19 - 4.1.31.Final + 4.1.34.Final 1.7.25 - 4.3.18.RELEASE + 4.3.24.RELEASE - 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.7.1 - 5.1.39 + 4.7.2 1.0.0 @@ -189,16 +182,11 @@ 10.14.2.0 1.0.0 1.17.1 - 2.8.11.20181123 - 2.25.1 - 4.12 - 1.2.3 2.1.1 2.2.3 - 4.3.18.RELEASE - 1.7.25 6.11 8.5.14 + 9.4.12.v20180830 true @@ -515,19 +503,34 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT pom import - + + + + org.eclipse.jetty + jetty-server + 9.4.12.v20180830 + + + org.eclipse.jetty + jetty-servlets + 9.4.12.v20180830 + junit junit 4.12 test - + + org.codehaus.jettison + jettison + 1.3.8 + com.google.protobuf protobuf-java diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 6645aa11..4fcd2852 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent bundle-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.opendaylight.odlparent bundle-parent - 3.1.5 + 4.0.10 @@ -93,11 +93,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,36 +106,35 @@ - 1.8.2 - 2.5.2 - 0.13.2 - 1.8.2 - 1.5.2 - 1.8.2 + 1.9.1 + 3.0.8 + 1.0.8 + 1.9.1 + 1.6.1 + 1.9.1 + - 1.11 + 1.12 - 3.7 + 3.8.1 2.6 3.6 - 2.7.1 + 2.7.3 4.4.1 2.8.5 - 23.6.1-jre - - 1.3.1 + 25.1-jre - 2.8.11 - 2.8.11.20181123 + 2.9.8 + 2.9.8 - 3.24.0-GA + 3.24.1-GA @@ -150,12 +149,8 @@ 20131018 - - 1.3.8 - - 3.0.0 - + + 4.12 @@ -163,22 +158,20 @@ 1.10.19 - 4.1.31.Final + 4.1.34.Final 1.7.25 - 4.3.18.RELEASE + 4.3.24.RELEASE - 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.7.1 - 5.1.39 + 4.7.2 1.0.0 @@ -189,16 +182,11 @@ 10.14.2.0 1.0.0 1.17.1 - 2.8.11.20181123 - 2.25.1 - 4.12 - 1.2.3 2.1.1 2.2.3 - 4.3.18.RELEASE - 1.7.25 6.11 8.5.14 + 9.4.12.v20180830 true @@ -515,19 +503,34 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT pom import - + + + + org.eclipse.jetty + jetty-server + 9.4.12.v20180830 + + + org.eclipse.jetty + jetty-servlets + 9.4.12.v20180830 + junit junit 4.12 test - + + org.codehaus.jettison + jettison + 1.3.8 + com.google.protobuf protobuf-java diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index 37f35feb..374b6f4b 100644 --- a/odlparent/client-parent/pom.xml +++ b/odlparent/client-parent/pom.xml @@ -6,7 +6,7 @@ pom org.onap.ccsdk.parent client-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} http://wiki.onap.org diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 55648133..963a3dd2 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.opendaylight.odlparent feature-repo-parent - 3.1.5 + 4.0.10 @@ -93,11 +93,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,36 +106,35 @@ - 1.8.2 - 2.5.2 - 0.13.2 - 1.8.2 - 1.5.2 - 1.8.2 + 1.9.1 + 3.0.8 + 1.0.8 + 1.9.1 + 1.6.1 + 1.9.1 + - 1.11 + 1.12 - 3.7 + 3.8.1 2.6 3.6 - 2.7.1 + 2.7.3 4.4.1 2.8.5 - 23.6.1-jre - - 1.3.1 + 25.1-jre - 2.8.11 - 2.8.11.20181123 + 2.9.8 + 2.9.8 - 3.24.0-GA + 3.24.1-GA @@ -150,12 +149,8 @@ 20131018 - - 1.3.8 - - 3.0.0 - + + 4.12 @@ -163,22 +158,20 @@ 1.10.19 - 4.1.31.Final + 4.1.34.Final 1.7.25 - 4.3.18.RELEASE + 4.3.24.RELEASE - 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.7.1 - 5.1.39 + 4.7.2 1.0.0 @@ -189,16 +182,11 @@ 10.14.2.0 1.0.0 1.17.1 - 2.8.11.20181123 - 2.25.1 - 4.12 - 1.2.3 2.1.1 2.2.3 - 4.3.18.RELEASE - 1.7.25 6.11 8.5.14 + 9.4.12.v20180830 true @@ -515,19 +503,34 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT pom import - + + + + org.eclipse.jetty + jetty-server + 9.4.12.v20180830 + + + org.eclipse.jetty + jetty-servlets + 9.4.12.v20180830 + junit junit 4.12 test - + + org.codehaus.jettison + jettison + 1.3.8 + com.google.protobuf protobuf-java diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 6ae848fb..9f6e6c4a 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent mdsal-it-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.opendaylight.controller mdsal-it-parent - 1.8.2 + 1.9.1 @@ -93,11 +93,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,36 +106,35 @@ - 1.8.2 - 2.5.2 - 0.13.2 - 1.8.2 - 1.5.2 - 1.8.2 + 1.9.1 + 3.0.8 + 1.0.8 + 1.9.1 + 1.6.1 + 1.9.1 + - 1.11 + 1.12 - 3.7 + 3.8.1 2.6 3.6 - 2.7.1 + 2.7.3 4.4.1 2.8.5 - 23.6.1-jre - - 1.3.1 + 25.1-jre - 2.8.11 - 2.8.11.20181123 + 2.9.8 + 2.9.8 - 3.24.0-GA + 3.24.1-GA @@ -150,12 +149,8 @@ 20131018 - - 1.3.8 - - 3.0.0 - + + 4.12 @@ -163,22 +158,20 @@ 1.10.19 - 4.1.31.Final + 4.1.34.Final 1.7.25 - 4.3.18.RELEASE + 4.3.24.RELEASE - 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.7.1 - 5.1.39 + 4.7.2 1.0.0 @@ -189,16 +182,11 @@ 10.14.2.0 1.0.0 1.17.1 - 2.8.11.20181123 - 2.25.1 - 4.12 - 1.2.3 2.1.1 2.2.3 - 4.3.18.RELEASE - 1.7.25 6.11 8.5.14 + 9.4.12.v20180830 true @@ -515,19 +503,34 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT pom import - + + + + org.eclipse.jetty + jetty-server + 9.4.12.v20180830 + + + org.eclipse.jetty + jetty-servlets + 9.4.12.v20180830 + junit junit 4.12 test - + + org.codehaus.jettison + jettison + 1.3.8 + com.google.protobuf protobuf-java diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index e2b76338..e1e59394 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.opendaylight.odlparent odlparent-lite - 3.1.5 + 4.0.10 @@ -93,11 +93,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,36 +106,35 @@ - 1.8.2 - 2.5.2 - 0.13.2 - 1.8.2 - 1.5.2 - 1.8.2 + 1.9.1 + 3.0.8 + 1.0.8 + 1.9.1 + 1.6.1 + 1.9.1 + - 1.11 + 1.12 - 3.7 + 3.8.1 2.6 3.6 - 2.7.1 + 2.7.3 4.4.1 2.8.5 - 23.6.1-jre - - 1.3.1 + 25.1-jre - 2.8.11 - 2.8.11.20181123 + 2.9.8 + 2.9.8 - 3.24.0-GA + 3.24.1-GA @@ -150,12 +149,8 @@ 20131018 - - 1.3.8 - - 3.0.0 - + + 4.12 @@ -163,22 +158,20 @@ 1.10.19 - 4.1.31.Final + 4.1.34.Final 1.7.25 - 4.3.18.RELEASE + 4.3.24.RELEASE - 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.7.1 - 5.1.39 + 4.7.2 1.0.0 @@ -189,16 +182,11 @@ 10.14.2.0 1.0.0 1.17.1 - 2.8.11.20181123 - 2.25.1 - 4.12 - 1.2.3 2.1.1 2.2.3 - 4.3.18.RELEASE - 1.7.25 6.11 8.5.14 + 9.4.12.v20180830 true @@ -515,19 +503,34 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT pom import - + + + + org.eclipse.jetty + jetty-server + 9.4.12.v20180830 + + + org.eclipse.jetty + jetty-servlets + 9.4.12.v20180830 + junit junit 4.12 test - + + org.codehaus.jettison + jettison + 1.3.8 + com.google.protobuf protobuf-java diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 27100124..216934b4 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.opendaylight.odlparent odlparent - 3.1.5 + 4.0.10 @@ -93,11 +93,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,36 +106,35 @@ - 1.8.2 - 2.5.2 - 0.13.2 - 1.8.2 - 1.5.2 - 1.8.2 + 1.9.1 + 3.0.8 + 1.0.8 + 1.9.1 + 1.6.1 + 1.9.1 + - 1.11 + 1.12 - 3.7 + 3.8.1 2.6 3.6 - 2.7.1 + 2.7.3 4.4.1 2.8.5 - 23.6.1-jre - - 1.3.1 + 25.1-jre - 2.8.11 - 2.8.11.20181123 + 2.9.8 + 2.9.8 - 3.24.0-GA + 3.24.1-GA @@ -150,12 +149,8 @@ 20131018 - - 1.3.8 - - 3.0.0 - + + 4.12 @@ -163,22 +158,20 @@ 1.10.19 - 4.1.31.Final + 4.1.34.Final 1.7.25 - 4.3.18.RELEASE + 4.3.24.RELEASE - 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.7.1 - 5.1.39 + 4.7.2 1.0.0 @@ -189,16 +182,11 @@ 10.14.2.0 1.0.0 1.17.1 - 2.8.11.20181123 - 2.25.1 - 4.12 - 1.2.3 2.1.1 2.2.3 - 4.3.18.RELEASE - 1.7.25 6.11 8.5.14 + 9.4.12.v20180830 true @@ -515,19 +503,34 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT pom import - + + + + org.eclipse.jetty + jetty-server + 9.4.12.v20180830 + + + org.eclipse.jetty + jetty-servlets + 9.4.12.v20180830 + junit junit 4.12 test - + + org.codehaus.jettison + jettison + 1.3.8 + com.google.protobuf protobuf-java diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 012fa73e..a0483e3b 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent odlparent-aggregator - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.parent parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index e113541f..85563e7b 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -8,12 +8,12 @@ pom org.onap.ccsdk.parent setup - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.parent odlparent-aggregator - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/odlparent/setup/src/main/properties/binding-parent.properties b/odlparent/setup/src/main/properties/binding-parent.properties index 81b803ea..f6d52513 100644 --- a/odlparent/setup/src/main/properties/binding-parent.properties +++ b/odlparent/setup/src/main/properties/binding-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=binding-parent odlparent.groupId=org.opendaylight.mdsal -odlparent.version=0.13.2 \ No newline at end of file +odlparent.version=3.0.8 \ No newline at end of file diff --git a/odlparent/setup/src/main/properties/bundle-parent.properties b/odlparent/setup/src/main/properties/bundle-parent.properties index 0c254c59..8bba8066 100644 --- a/odlparent/setup/src/main/properties/bundle-parent.properties +++ b/odlparent/setup/src/main/properties/bundle-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=bundle-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.5 +odlparent.version=4.0.10 diff --git a/odlparent/setup/src/main/properties/feature-repo-parent.properties b/odlparent/setup/src/main/properties/feature-repo-parent.properties index 27347cb6..92c2fcfe 100644 --- a/odlparent/setup/src/main/properties/feature-repo-parent.properties +++ b/odlparent/setup/src/main/properties/feature-repo-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=feature-repo-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.5 +odlparent.version=4.0.10 diff --git a/odlparent/setup/src/main/properties/mdsal-it-parent.properties b/odlparent/setup/src/main/properties/mdsal-it-parent.properties index 39ec0371..acb5ec77 100644 --- a/odlparent/setup/src/main/properties/mdsal-it-parent.properties +++ b/odlparent/setup/src/main/properties/mdsal-it-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=mdsal-it-parent odlparent.groupId=org.opendaylight.controller -odlparent.version=1.8.2 +odlparent.version=1.9.1 diff --git a/odlparent/setup/src/main/properties/odlparent-lite.properties b/odlparent/setup/src/main/properties/odlparent-lite.properties index 46bf9fd3..e57359b6 100644 --- a/odlparent/setup/src/main/properties/odlparent-lite.properties +++ b/odlparent/setup/src/main/properties/odlparent-lite.properties @@ -1,3 +1,3 @@ odlparent.artifactId=odlparent-lite odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.5 +odlparent.version=4.0.10 diff --git a/odlparent/setup/src/main/properties/odlparent.properties b/odlparent/setup/src/main/properties/odlparent.properties index e32f2d2f..8341a6f9 100644 --- a/odlparent/setup/src/main/properties/odlparent.properties +++ b/odlparent/setup/src/main/properties/odlparent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=odlparent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.5 +odlparent.version=4.0.10 diff --git a/odlparent/setup/src/main/properties/single-feature-parent.properties b/odlparent/setup/src/main/properties/single-feature-parent.properties index 9fa116df..70c1c4c8 100644 --- a/odlparent/setup/src/main/properties/single-feature-parent.properties +++ b/odlparent/setup/src/main/properties/single-feature-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=single-feature-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.5 +odlparent.version=4.0.10 diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index f9d36c17..61ee8747 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -93,11 +93,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT \${ccsdk.sli.core.version} \${ccsdk.sli.adaptors.version} \${ccsdk.sli.core.version} @@ -106,36 +106,35 @@ - 1.8.2 - 2.5.2 - 0.13.2 - 1.8.2 - 1.5.2 - 1.8.2 + 1.9.1 + 3.0.8 + 1.0.8 + 1.9.1 + 1.6.1 + 1.9.1 + - 1.11 + 1.12 - 3.7 + 3.8.1 2.6 3.6 - 2.7.1 + 2.7.3 4.4.1 2.8.5 - 23.6.1-jre - - 1.3.1 + 25.1-jre - 2.8.11 - 2.8.11.20181123 + 2.9.8 + 2.9.8 - 3.24.0-GA + 3.24.1-GA @@ -150,12 +149,8 @@ 20131018 - - 1.3.8 - - 3.0.0 - + + 4.12 @@ -163,22 +158,20 @@ 1.10.19 - 4.1.31.Final + 4.1.34.Final 1.7.25 - 4.3.18.RELEASE + 4.3.24.RELEASE - 3.8.1.v20120830-144521 \${jackson.version} 0.6.4 - 4.7.1 - 5.1.39 + 4.7.2 1.0.0 @@ -189,16 +182,11 @@ 10.14.2.0 1.0.0 1.17.1 - 2.8.11.20181123 - 2.25.1 - 4.12 - 1.2.3 2.1.1 2.2.3 - 4.3.18.RELEASE - 1.7.25 6.11 8.5.14 + 9.4.12.v20180830 true @@ -520,14 +508,29 @@ import - + + + + org.eclipse.jetty + jetty-server + 9.4.12.v20180830 + + + org.eclipse.jetty + jetty-servlets + 9.4.12.v20180830 + junit junit 4.12 test - + + org.codehaus.jettison + jettison + 1.3.8 + com.google.protobuf protobuf-java diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index dbb80174..34dd90f6 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.opendaylight.odlparent single-feature-parent - 3.1.5 + 4.0.10 @@ -93,11 +93,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,36 +106,35 @@ - 1.8.2 - 2.5.2 - 0.13.2 - 1.8.2 - 1.5.2 - 1.8.2 + 1.9.1 + 3.0.8 + 1.0.8 + 1.9.1 + 1.6.1 + 1.9.1 + - 1.11 + 1.12 - 3.7 + 3.8.1 2.6 3.6 - 2.7.1 + 2.7.3 4.4.1 2.8.5 - 23.6.1-jre - - 1.3.1 + 25.1-jre - 2.8.11 - 2.8.11.20181123 + 2.9.8 + 2.9.8 - 3.24.0-GA + 3.24.1-GA @@ -150,12 +149,8 @@ 20131018 - - 1.3.8 - - 3.0.0 - + + 4.12 @@ -163,22 +158,20 @@ 1.10.19 - 4.1.31.Final + 4.1.34.Final 1.7.25 - 4.3.18.RELEASE + 4.3.24.RELEASE - 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.7.1 - 5.1.39 + 4.7.2 1.0.0 @@ -189,16 +182,11 @@ 10.14.2.0 1.0.0 1.17.1 - 2.8.11.20181123 - 2.25.1 - 4.12 - 1.2.3 2.1.1 2.2.3 - 4.3.18.RELEASE - 1.7.25 6.11 8.5.14 + 9.4.12.v20180830 true @@ -515,19 +503,34 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT pom import - + + + + org.eclipse.jetty + jetty-server + 9.4.12.v20180830 + + + org.eclipse.jetty + jetty-servlets + 9.4.12.v20180830 + junit junit 4.12 test - + + org.codehaus.jettison + jettison + 1.3.8 + com.google.protobuf protobuf-java diff --git a/pom.xml b/pom.xml index 39d8f546..6ec100b1 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ pom org.onap.ccsdk.parent parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/pom.xml b/springboot/pom.xml index 9a0a95c2..16a07cf9 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent springboot-aggregator - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.parent parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 4eacef31..1f208aec 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -6,7 +6,7 @@ pom org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.springframework.boot @@ -82,11 +82,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -341,7 +341,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT pom import diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 05045b2a..407a0375 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -6,7 +6,7 @@ pom org.onap.ccsdk.parent spring-boot-starter-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.springframework.boot @@ -82,11 +82,11 @@ - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -366,7 +366,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT pom import diff --git a/standalone/pom.xml b/standalone/pom.xml index 3125d48b..c55dc856 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -8,7 +8,7 @@ pom org.onap.ccsdk.parent standalone-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT http://wiki.onap.org diff --git a/tools/changeVersion.sh b/tools/changeVersion.sh new file mode 100755 index 00000000..144ca539 --- /dev/null +++ b/tools/changeVersion.sh @@ -0,0 +1,20 @@ +#! /bin/bash + +if [ $# -ne 1 ] +then + echo "Usage: $0 new-version" + exit 1 +fi + + +mvn versions:set versions:update-child-modules versions:commit -B -DnewVersion=$1 + +base_version=$(echo $1 | cut -d- -f1) +major=$(echo $base_version | cut -d. -f1) +minor=$(echo $base_version | cut -d. -f2) +patch=$(echo $base_version | cut -d. -f3) + +if [ -f version.properties ] +then + sed -i '' -e 's/\(release_name=\).*/\1'$major'/;s/\(sprint_number=\).*/\1'$minor'/;s/\(feature_revision=\).*/\1'$patch'/' version.properties +fi diff --git a/tools/fluorine2neon.sh b/tools/fluorine2neon.sh new file mode 100755 index 00000000..4a513435 --- /dev/null +++ b/tools/fluorine2neon.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash + +updatePom() { +export XMLLINT_INDENT=" " +cat $1 | xsltproc -o $1 /tmp/rebase-pom.xslt - +} + +export -f updatePom + +# Copy blueprints to new directory structure +find . -path '*/src/main/resources/org/opendaylight/blueprint/*.xml' -execdir sh -c "mkdir -p ../../../OSGI-INF/blueprint; cp {} ../../../OSGI-INF/blueprint" \; + +# Update ietf-net-types dependencies + +cat < /tmp/rebase-pom.xslt + + + + + + + + + + + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + + + + + + + + + + +END + +find . -name pom.xml -exec bash -c 'updatePom "$0" .' '{}' \; diff --git a/version.properties b/version.properties index 40509d7a..4b7acda2 100644 --- a/version.properties +++ b/version.properties @@ -5,8 +5,8 @@ release_name=1 -sprint_number=3 -feature_revision=3 +sprint_number=4 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg