summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-11-30 14:36:39 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-30 14:36:39 +0000
commit6cafba255685486b37e9bd6e357b053320189779 (patch)
tree7a4f8a91446416c69ea0b27a4c34125b922e585e
parent3b56b4ff40eba05108651d04df4b9a2ef3a4eb1d (diff)
parent7f767b4455af5ea65bb69ce40a8ac998ddbca04f (diff)
Merge "Release version 1.1.0 of ccsdk/oran"
-rw-r--r--a1-adapter/a1-adapter-api/feature/pom.xml4
-rw-r--r--a1-adapter/a1-adapter-api/installer/pom.xml4
-rw-r--r--a1-adapter/a1-adapter-api/model/pom.xml4
-rw-r--r--a1-adapter/a1-adapter-api/pom.xml4
-rw-r--r--a1-adapter/a1-adapter-api/provider/pom.xml4
-rw-r--r--a1-adapter/features/a1-adapter-northbound/pom.xml4
-rw-r--r--a1-adapter/features/installer/pom.xml4
-rw-r--r--a1-adapter/features/pom.xml4
-rw-r--r--a1-adapter/pom.xml4
-rw-r--r--a1-policy-management/pom.xml4
-rw-r--r--pom.xml4
-rw-r--r--releases/1.1.0.yaml5
-rw-r--r--version.properties2
13 files changed, 28 insertions, 23 deletions
diff --git a/a1-adapter/a1-adapter-api/feature/pom.xml b/a1-adapter/a1-adapter-api/feature/pom.xml
index e8b7be6f..cd53f8d1 100644
--- a/a1-adapter/a1-adapter-api/feature/pom.xml
+++ b/a1-adapter/a1-adapter-api/feature/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-feature</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-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
index c49dabfb..2a77788a 100644
--- a/a1-adapter/a1-adapter-api/installer/pom.xml
+++ b/a1-adapter/a1-adapter-api/installer/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-installer</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-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
index 9e923bd9..82c1c7b3 100644
--- a/a1-adapter/a1-adapter-api/model/pom.xml
+++ b/a1-adapter/a1-adapter-api/model/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-model</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-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
index 4a83068f..40689f9d 100644
--- a/a1-adapter/a1-adapter-api/pom.xml
+++ b/a1-adapter/a1-adapter-api/pom.xml
@@ -25,13 +25,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-api</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-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
index e2d52877..c6b32d79 100644
--- a/a1-adapter/a1-adapter-api/provider/pom.xml
+++ b/a1-adapter/a1-adapter-api/provider/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-provider</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-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
index a9bfd9dc..fe4fca34 100644
--- a/a1-adapter/features/a1-adapter-northbound/pom.xml
+++ b/a1-adapter/features/a1-adapter-northbound/pom.xml
@@ -25,13 +25,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-northbound</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-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
index a0df9319..1d551fd8 100644
--- a/a1-adapter/features/installer/pom.xml
+++ b/a1-adapter/features/installer/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-northbound-installer</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-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
index f9970239..4b6a794a 100644
--- a/a1-adapter/features/pom.xml
+++ b/a1-adapter/features/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>ccsdk-a1-adapter-feature-aggregator</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-adapter/pom.xml b/a1-adapter/pom.xml
index a30bf47b..f70d36b3 100644
--- a/a1-adapter/pom.xml
+++ b/a1-adapter/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>ccsdk-a1-adapter</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-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
index 495b882d..be8838ba 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-policy-management-service</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/pom.xml b/pom.xml
index 72a4a637..fe0f143a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>ccsdk-oran</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/releases/1.1.0.yaml b/releases/1.1.0.yaml
new file mode 100644
index 00000000..6cfd2e2a
--- /dev/null
+++ b/releases/1.1.0.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.1.0'
+project: 'ccsdk-oran'
+log_dir: 'ccsdk-oran-maven-stage-master/15/'
diff --git a/version.properties b/version.properties
index caf86c71..b5d10a70 100644
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
release_name=1
sprint_number=1
-feature_revision=0
+feature_revision=1
base_version=${release_name}.${sprint_number}.${feature_revision}