Merge "Update major versions"

onap · Oct 14, 2024 · 0757111 · 0757111
2 parents 83f0d41 + 0bb5235
commit 0757111
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,9 +42,6 @@ out/
 .tox
 _build/
 .swagger*
-docs/offeredapis/swagger/README.md
-a1-policy-management/api/README.md
-a1-policy-management/api/.openapi-generator*
-a1-policy-management/api/pms-api/.openapi-generator*
-
-
+docs/offeredapis/**/README.md
+a1-policy-management/api/**/README.md
+a1-policy-management/api/**/.openapi-generator**
diff --git a/a1-adapter/a1-adapter-api/feature/pom.xml b/a1-adapter/a1-adapter-api/feature/pom.xml
@@ -20,20 +20,19 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-feature</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/a1-adapter-api/installer/pom.xml b/a1-adapter/a1-adapter-api/installer/pom.xml
@@ -20,20 +20,19 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-installer</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/a1-adapter-api/model/pom.xml b/a1-adapter/a1-adapter-api/model/pom.xml
@@ -20,20 +20,19 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-model</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/a1-adapter-api/pom.xml b/a1-adapter/a1-adapter-api/pom.xml
@@ -20,19 +20,18 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-api</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/a1-adapter-api/provider/pom.xml b/a1-adapter/a1-adapter-api/provider/pom.xml
@@ -20,20 +20,19 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-provider</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/features/a1-adapter-northbound/pom.xml b/a1-adapter/features/a1-adapter-northbound/pom.xml
@@ -20,19 +20,18 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-northbound</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/features/installer/pom.xml b/a1-adapter/features/installer/pom.xml
@@ -20,20 +20,19 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-northbound-installer</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/features/pom.xml b/a1-adapter/features/pom.xml
@@ -20,20 +20,19 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-a1-adapter-feature-aggregator</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/pom.xml b/a1-adapter/pom.xml
@@ -20,20 +20,19 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-a1-adapter</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
@@ -20,18 +20,17 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-33-starter-parent</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-policy-management-service</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>ccsdk-oran :: ${project.artifactId}</name>
     <properties>
         <java.version.source>17</java.version.source>

diff --git a/csit/scripts/healthcheck/.env b/csit/scripts/healthcheck/.env
@@ -18,7 +18,7 @@
 
 #PMS
 PMS_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice"
-PMS_IMAGE_TAG="1.8.1-SNAPSHOT-latest"
+PMS_IMAGE_TAG="2.0.0-SNAPSHOT-latest"
 
 #A1_SIM
 A1_SIM_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator"

diff --git a/pom.xml b/pom.xml
@@ -20,20 +20,19 @@
   ~ ============LICENSE_END=======================================================
   ~
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-oran</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git 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=8
-feature_revision=1
+release_name=2
+sprint_number=0
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}