v1.0.0 Release Preparation

.circleci/config.yml

@@ -10,6 +10,8 @@ executors:
 orbs:
   cloudsmith: cloudsmith/[email protected]
   sign-packages: opennms/[email protected]
+  branch-management: opennms/[email protected]
+
 
 workflows:
   build-deploy:
@@ -39,6 +41,14 @@ workflows:
                 - /^v.*/
             branches:
               ignore: /.*/     
+      #- merge:
+      #    requires:
+      #      - test
+      #    filters:
+      #      branches:
+      #        only:
+      #         - /^release-.*/
+
 
 jobs:
   build:
@@ -134,3 +144,28 @@ jobs:
               gh release upload $tag ~/output/*.kar
             fi
 
+  merge:
+    executor: build-executor
+    environment:
+      MAVEN_OPTS: -Xmx1024m
+
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "27:c8:b4:c2:27:cf:78:ae:5f:1f:3a:ee:d7:bb:e8:ca"
+
+      - cached-checkout
+      - branch-management/merge-branch:
+          committer_email: "[email protected]"
+          committer_name: "CI/CD System"
+          from: release-1.x
+          to: master
+
+      # make sure the build passes after merge
+      - build
+
+      - run:
+          name: "Push to Main"
+          command: git push --no-verify origin master:master
+
+

assembly/kar/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opennms.plugins.velocloud</groupId>
         <artifactId>assembly</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kar</artifactId>

assembly/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms.plugins.velocloud</groupId>
     <artifactId>velocloud-plugin-parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>assembly</artifactId>

client/api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opennms.plugins.velocloud</groupId>
         <artifactId>velocloud-client</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>velocloud-plugin-parent</artifactId>
         <groupId>org.opennms.plugins.velocloud</groupId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
     <packaging>pom</packaging>
 

client/v1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opennms.plugins.velocloud</groupId>
         <artifactId>velocloud-client</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>velocloud-client-v1</artifactId>

client/v2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opennms.plugins.velocloud</groupId>
         <artifactId>velocloud-client</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>velocloud-client-v2</artifactId>

karaf-features/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opennms.plugins.velocloud</groupId>
         <artifactId>velocloud-plugin-parent</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>karaf-features</artifactId>

plugin/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opennms.plugins.velocloud</groupId>
         <artifactId>velocloud-plugin-parent</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>velocloud-plugin</artifactId>

pom.xml

@@ -70,7 +70,7 @@
         <lombok.version>1.18.24</lombok.version>
     </properties>
 
-    <version>0.1.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <dependencyManagement>
         <dependencies>