diff options
| author |   Dan Timoney <dtimoney@att.com> | 2023-06-06 06:41:11 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2023-06-06 06:58:49 -0400 |
| commit | 6ea1b9009ecc674b0e3000b7a50326908cdba711 (patch) | |
| tree | 50110268e8d1492da016be53f503743055273ed1 | |
| parent | 7b646d6e462e3c4ea19c6c710ca1364cc484b0f1 (diff) | |
Roll master for Montreal
Roll version to initial snapshot for Montreal release
Issue-ID: CCSDK-3903
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I7e8a5c03fb236b5ea4f2d0f31460fabfcb047591
26 files changed, 52 insertions, 60 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index bd0878a6..ccaf436c 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index d2b4e0f9..7f8e39a7 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index 833e1aa9..00000000 --- a/docs/index.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. - -TODO Add files to toctree and delete this header ------------------------------------------------- -.. toctree:: - :maxdepth: 1 - - diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml index 5cb6a87c..b845db6a 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 16c15d47..ce171afd 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,14 +191,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.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 657897c2..c459dd8d 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,14 +191,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.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 d7b2fd9c..24a6195a 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.5.5-SNAPSHOT</version> + <version>2.6.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 66fbe728..21a251e1 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,14 +191,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.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 51580cb6..5a77c35e 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,14 +191,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.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 bf2354da..baf68319 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,14 +191,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.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 4c082641..492a90ef 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,14 +191,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index d61ddb3a..8659b420 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,14 +191,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 4fe55b83..d3735167 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-aggregator</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.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 4616c0ce..0460edb3 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>setup</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index ecf5228a..8bcde43a 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,14 +191,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/oparent/pom.xml b/oparent/pom.xml index e9f357e2..fcdc4ec3 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>oparent</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,7 +97,7 @@ otherwise ccsdk/distribution/dependencies is not resolving correctly --> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/springboot/pom.xml b/springboot/pom.xml index c87407d1..2e0c826e 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>springboot-aggregator</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.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 88357699..a75027c1 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-setup</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 75e327f6..504bc70a 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -150,7 +150,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot23/pom.xml b/springboot/springboot23/pom.xml index 3d071e7e..e303ef8a 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -150,7 +150,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml index 0cfdbcf4..88fae6ee 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -150,7 +150,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot26/pom.xml b/springboot/springboot26/pom.xml index 04056eef..6b7e4d75 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -150,7 +150,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot30/pom.xml b/springboot/springboot30/pom.xml index c3b21056..b5b158a7 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -125,7 +125,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/standalone/pom.xml b/standalone/pom.xml index da7e9c11..b8df7bcd 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.5.5-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/version.properties b/version.properties index 2f76b861..cc90e4e5 100644 --- a/version.properties +++ b/version.properties @@ -5,8 +5,8 @@ release_name=2 -sprint_number=5 -feature_revision=5 +sprint_number=6 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} |