diff options
33 files changed, 213 insertions, 208 deletions
diff --git a/.gitreview b/.gitreview new file mode 100644 index 00000000..35dc54a5 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.onap.org +port=29418 +project=ccsdk/parent +defaultbranch=master diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index e3c721bc..1bfc2b04 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 13863fcc..dd436852 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml index 26fa20d8..0de28c82 100644 --- a/installed-odl-bom/pom.xml +++ b/installed-odl-bom/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>installed-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 4944f9ef..6076d567 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -192,14 +192,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 6e784478..114f999d 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>bundle-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -192,14 +192,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index de748b6e..1a1f1e70 100644 --- a/odlparent/client-parent/pom.xml +++ b/odlparent/client-parent/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>client-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 196ff318..3b2af9bc 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -192,14 +192,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index d3671b0a..d2019812 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>karaf4-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -192,14 +192,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 67a40f3c..50947ea5 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>mdsal-it-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -192,14 +192,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 380c85e4..93dad2f4 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -192,14 +192,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 5b0acb71..55b9c7c4 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -192,14 +192,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/pom.xml b/odlparent/pom.xml index dccd750f..bfd2bf0e 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-aggregator</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index b0ef03a8..e4a26809 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-aggregator</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>setup</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 68289fff..e34806e1 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>\${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>\${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>\${ccsdk.sli.version}</ccsdk.sli.northbound.version> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index e376f8c9..c22297fa 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -192,14 +192,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/oparent/pom.xml b/oparent/pom.xml index bf2cbcc4..ac08a5d2 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>oparent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -69,9 +69,9 @@ <logback.version>1.2.12</logback.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.9999, 1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.9999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -98,7 +98,7 @@ otherwise ccsdk/distribution/dependencies is not resolving correctly --> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/springboot/pom.xml b/springboot/pom.xml index 5b8d8e08..0e82e8c9 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>springboot-aggregator</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index a737b682..aae5b9c6 100644 --- a/springboot/spring-boot-setup/pom.xml +++ b/springboot/spring-boot-setup/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>springboot-aggregator</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-setup</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml index fb07a334..ae15c2b0 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml @@ -92,10 +92,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT,2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml index 394ab82d..c793d4ee 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> diff --git a/springboot/springboot23/pom.xml b/springboot/springboot23/pom.xml index e6ca7a73..d1606d2f 100644 --- a/springboot/springboot23/pom.xml +++ b/springboot/springboot23/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -103,15 +103,15 @@ <spring.version>5.2.15.RELEASE</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> - <kotlin.version>1.5.32</kotlin.version> - <kotlin.maven.version>1.5.32</kotlin.maven.version> - <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> - <kotlinpoet.version>1.5.0</kotlinpoet.version> - <kroto-plus.version>0.5.0</kroto-plus.version> - <nats.version>2.6.6</nats.version> + <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget> + <kotlin.version>1.7.0</kotlin.version> + <kotlin.maven.version>1.7.0</kotlin.maven.version> + <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kroto-plus.version>0.6.1</kroto-plus.version> + <nats.version>2.15.0</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.9.3</mockk.version> + <mockk.version>1.13.12</mockk.version> <antlr.version>4.12.0</antlr.version> @@ -129,7 +129,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml index b333b8fd..c27dd384 100644 --- a/springboot/springboot25/pom.xml +++ b/springboot/springboot25/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-25-starter-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -103,15 +103,15 @@ <spring.version>5.3.16</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> - <kotlin.version>1.5.32</kotlin.version> - <kotlin.maven.version>1.5.32</kotlin.maven.version> - <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> - <kotlinpoet.version>1.5.0</kotlinpoet.version> - <kroto-plus.version>0.5.0</kroto-plus.version> - <nats.version>2.6.6</nats.version> + <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget> + <kotlin.version>1.7.0</kotlin.version> + <kotlin.maven.version>1.7.0</kotlin.maven.version> + <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kroto-plus.version>0.6.1</kroto-plus.version> + <nats.version>2.15.0</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.9.3</mockk.version> + <mockk.version>1.13.12</mockk.version> <antlr.version>4.12.0</antlr.version> @@ -129,7 +129,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot26/pom.xml b/springboot/springboot26/pom.xml index 6d52cc8a..2d96e825 100644 --- a/springboot/springboot26/pom.xml +++ b/springboot/springboot26/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-26-starter-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -103,15 +103,15 @@ <spring.version>5.3.22</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> - <kotlin.version>1.5.32</kotlin.version> - <kotlin.maven.version>1.5.32</kotlin.maven.version> - <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> - <kotlinpoet.version>1.5.0</kotlinpoet.version> - <kroto-plus.version>0.5.0</kroto-plus.version> - <nats.version>2.6.6</nats.version> + <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget> + <kotlin.version>1.7.0</kotlin.version> + <kotlin.maven.version>1.7.0</kotlin.maven.version> + <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kroto-plus.version>0.6.1</kroto-plus.version> + <nats.version>2.15.0</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.9.3</mockk.version> + <mockk.version>1.13.12</mockk.version> <antlr.version>4.12.0</antlr.version> @@ -129,7 +129,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot27-jdk17/pom.xml b/springboot/springboot27-jdk17/pom.xml index 94b77225..5b0ca4e4 100644 --- a/springboot/springboot27-jdk17/pom.xml +++ b/springboot/springboot27-jdk17/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-27-jdk-17-starter-parent</artifactId> - <version>2.8.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -129,7 +129,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot27/pom.xml b/springboot/springboot27/pom.xml index 188e430c..39055047 100644 --- a/springboot/springboot27/pom.xml +++ b/springboot/springboot27/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-27-starter-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -103,15 +103,15 @@ <spring.version>5.3.27</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> - <kotlin.version>1.5.32</kotlin.version> - <kotlin.maven.version>1.5.32</kotlin.maven.version> - <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> - <kotlinpoet.version>1.5.0</kotlinpoet.version> - <kroto-plus.version>0.5.0</kroto-plus.version> - <nats.version>2.6.6</nats.version> + <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget> + <kotlin.version>1.7.0</kotlin.version> + <kotlin.maven.version>1.7.0</kotlin.maven.version> + <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kroto-plus.version>0.6.1</kroto-plus.version> + <nats.version>2.15.0</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.9.3</mockk.version> + <mockk.version>1.13.12</mockk.version> <antlr.version>4.12.0</antlr.version> @@ -129,7 +129,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot30/pom.xml b/springboot/springboot30/pom.xml index bc2fcc44..deffd797 100644 --- a/springboot/springboot30/pom.xml +++ b/springboot/springboot30/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-30-starter-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -103,15 +103,15 @@ <spring.version>6.0.4</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> - <kotlin.version>1.5.32</kotlin.version> - <kotlin.maven.version>1.5.32</kotlin.maven.version> - <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> - <kotlinpoet.version>1.5.0</kotlinpoet.version> - <kroto-plus.version>0.5.0</kroto-plus.version> - <nats.version>2.6.6</nats.version> + <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget> + <kotlin.version>1.7.0</kotlin.version> + <kotlin.maven.version>1.7.0</kotlin.maven.version> + <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kroto-plus.version>0.6.1</kroto-plus.version> + <nats.version>2.15.0</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.9.3</mockk.version> + <mockk.version>1.13.12</mockk.version> <antlr.version>4.12.0</antlr.version> @@ -129,7 +129,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot31/pom.xml b/springboot/springboot31/pom.xml index dfd462f8..533f8ac9 100644 --- a/springboot/springboot31/pom.xml +++ b/springboot/springboot31/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-31-starter-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -103,15 +103,15 @@ <spring.version>6.0.9</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> - <kotlin.version>1.5.32</kotlin.version> - <kotlin.maven.version>1.5.32</kotlin.maven.version> - <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> - <kotlinpoet.version>1.5.0</kotlinpoet.version> - <kroto-plus.version>0.5.0</kroto-plus.version> - <nats.version>2.6.6</nats.version> + <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget> + <kotlin.version>1.7.0</kotlin.version> + <kotlin.maven.version>1.7.0</kotlin.maven.version> + <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kroto-plus.version>0.6.1</kroto-plus.version> + <nats.version>2.15.0</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.9.3</mockk.version> + <mockk.version>1.13.12</mockk.version> <antlr.version>4.12.0</antlr.version> @@ -129,7 +129,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot32/pom.xml b/springboot/springboot32/pom.xml index 4eb09c82..f83dae04 100644 --- a/springboot/springboot32/pom.xml +++ b/springboot/springboot32/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-32-starter-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -103,15 +103,15 @@ <spring.version>6.1.1</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> - <kotlin.version>1.5.32</kotlin.version> - <kotlin.maven.version>1.5.32</kotlin.maven.version> - <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> - <kotlinpoet.version>1.5.0</kotlinpoet.version> - <kroto-plus.version>0.5.0</kroto-plus.version> - <nats.version>2.6.6</nats.version> + <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget> + <kotlin.version>1.7.0</kotlin.version> + <kotlin.maven.version>1.7.0</kotlin.maven.version> + <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kroto-plus.version>0.6.1</kroto-plus.version> + <nats.version>2.15.0</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.9.3</mockk.version> + <mockk.version>1.13.12</mockk.version> <antlr.version>4.12.0</antlr.version> @@ -129,7 +129,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot33/pom.xml b/springboot/springboot33/pom.xml index 7de84011..580b1f3f 100644 --- a/springboot/springboot33/pom.xml +++ b/springboot/springboot33/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-33-starter-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.6.99999,1.7.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.7.99999, 1.8.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.8.99999, 1.9.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>[2.0.0-SNAPSHOT, 2.0.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -103,15 +103,15 @@ <spring.version>6.1.10</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> - <kotlin.version>1.5.32</kotlin.version> - <kotlin.maven.version>1.5.32</kotlin.maven.version> - <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> - <kotlinpoet.version>1.5.0</kotlinpoet.version> - <kroto-plus.version>0.5.0</kroto-plus.version> - <nats.version>2.6.6</nats.version> + <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget> + <kotlin.version>1.7.0</kotlin.version> + <kotlin.maven.version>1.7.0</kotlin.maven.version> + <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kroto-plus.version>0.6.1</kroto-plus.version> + <nats.version>2.15.0</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.9.3</mockk.version> + <mockk.version>1.13.12</mockk.version> <antlr.version>4.12.0</antlr.version> @@ -129,7 +129,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/standalone/pom.xml b/standalone/pom.xml index a655225b..c5f4ca73 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>2.8.1-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/version.properties b/version.properties index 92545ee0..8872fb15 100644 --- a/version.properties +++ b/version.properties @@ -4,9 +4,9 @@ # because they are used in Jenkins, whose plug-in doesn't support -release_name=2 -sprint_number=8 -feature_revision=1 +release_name=3 +sprint_number=0 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} |