diff options
author | Dan Timoney <dtimoney@att.com> | 2020-03-04 11:02:01 -0500 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2020-03-04 11:02:01 -0500 |
commit | 8c76c9880d88085d28fc33da582ff63d93d1e467 (patch) | |
tree | f8fad25e4c92267bf7d9293d7f053b2de5d143ed | |
parent | 35d607979da73ddb70ec9231491a43b50b1df8e3 (diff) |
Roll master version to Guilin numbering
Roll master branch of ccsdk parent to 2.0.0-SNAPSHOT for Guilin. Since
we anticipate breaking changes associated with Java 8 -> 11 and
Sodium, the Guilin version will be a major version update (1.x -> 2.0)
Change-Id: I3bf2c447fbecff4aa1973b9087190a2e41961457
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
-rw-r--r-- | dependencies-bom/pom.xml | 2 | ||||
-rw-r--r-- | dependencies-odl-bom/pom.xml | 2 | ||||
-rw-r--r-- | odlparent/binding-parent/pom.xml | 4 | ||||
-rw-r--r-- | odlparent/bundle-parent/pom.xml | 4 | ||||
-rw-r--r-- | odlparent/client-parent/pom.xml | 2 | ||||
-rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 4 | ||||
-rw-r--r-- | odlparent/karaf4-parent/pom.xml | 4 | ||||
-rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 4 | ||||
-rw-r--r-- | odlparent/odlparent-lite/pom.xml | 4 | ||||
-rw-r--r-- | odlparent/odlparent/pom.xml | 4 | ||||
-rwxr-xr-x | odlparent/pom.xml | 4 | ||||
-rwxr-xr-x | odlparent/setup/pom.xml | 4 | ||||
-rw-r--r-- | odlparent/single-feature-parent/pom.xml | 4 | ||||
-rwxr-xr-x | pom.xml | 2 | ||||
-rwxr-xr-x | springboot/pom.xml | 4 | ||||
-rw-r--r-- | springboot/spring-boot-setup/pom.xml | 4 | ||||
-rwxr-xr-x | springboot/springboot1/pom.xml | 4 | ||||
-rwxr-xr-x | springboot/springboot2/pom.xml | 4 | ||||
-rwxr-xr-x | standalone/pom.xml | 2 | ||||
-rw-r--r-- | version.properties | 6 |
20 files changed, 36 insertions, 36 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 4e40997d..5d42b876 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 80f1b862..88a103de 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 16bb11b2..769c3165 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,7 +191,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.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 4ae75c79..5d970db9 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,7 +191,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.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 d268dff5..0f5aefe2 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>1.5.2-SNAPSHOT</version> + <version>2.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 1b8dc79c..c7480267 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,7 +191,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.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 04193fa1..10887cf7 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,7 +191,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.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 030f6dc2..33cb294f 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,7 +191,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.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 fff41013..00c32c86 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,7 +191,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 49fd86d4..c3560cf5 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,7 +191,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/pom.xml b/odlparent/pom.xml index d9af42d5..c301f431 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-aggregator</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.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 4a90cec0..e3e5e2ba 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>setup</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.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 beaab1f7..2f304067 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -191,7 +191,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.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>1.5.2-SNAPSHOT</version> + <version>2.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 5b7f69fe..536791db 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>springboot-aggregator</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.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 9709d212..53a8a596 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-setup</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.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 9cc72f8f..9fcddd08 100755 --- 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>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -143,7 +143,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index f5ca3300..d51a657d 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -143,7 +143,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/standalone/pom.xml b/standalone/pom.xml index 9d2e9cfd..c850d029 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/version.properties b/version.properties index 99005bfb..1e23756d 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=1 -sprint_number=5 -feature_revision=2 +release_name=2 +sprint_number=0 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} |