apache · adelel1 · Dec 2, 2021 · Jan 10, 2022 · Jan 11, 2022 · Oct 23, 2023
diff --git a/.github/maven-settings.xml b/.github/maven-settings.xml
@@ -50,4 +50,11 @@
   <activeProfiles>
     <activeProfile>google-mirror</activeProfile>
   </activeProfiles>
+  <servers>
+    <server>
+      <id>credentals</id>
+      <username>${env.CORDA_ARTIFACTORY_USERNAME}</username>
+      <password>${env.CORDA_ARTIFACTORY_PASSWORD}</password>
+    </server>
+  </servers>
 </settings>
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   test:
     name: Test (${{ matrix.java }})
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -16,7 +16,7 @@ jobs:
 
       - name: Cache Maven Local Repo
         if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-        uses: actions/cache@v2
+        uses: actions/cache@v5
         with:
           path: |
             ~/.m2/repository/*/*/*/*/*
@@ -42,7 +42,7 @@ jobs:
 
   checks:
     name: Checks (${{ matrix.java }})
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -53,7 +53,7 @@ jobs:
 
       - name: Cache Maven Local Repo
         if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-        uses: actions/cache@v2
+        uses: actions/cache@v5
         with:
           path: |
             ~/.m2/repository/*/*/*/*/*
@@ -90,7 +90,8 @@ jobs:
       - name: Javadoc Check (JDK8 / -Prelease)
         if: matrix.java == '8'
         run: |
-          mvn -s .github/maven-settings.xml javadoc:javadoc -Prelease
+          mvn -s .github/maven-settings.xml -DskipTests -Prelease install -pl '!artemis-website' -am
+          mvn -s .github/maven-settings.xml javadoc:javadoc -Prelease -pl '!artemis-website' -am
 
       - name: Javadoc Check (JDK 11+)
         if: matrix.java != '8'

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,85 @@
+#!groovy
+
+/**
+ * Kill already started job.
+ * Assume new commit takes precendence and results from previous
+ * unfinished builds are not required.
+ * This feature doesn't play well with disableConcurrentBuilds() option
+ */
+@Library('corda-shared-build-pipeline-steps')
+import static com.r3.build.BuildControl.killAllExistingBuildsForJob
+
+killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
+
+pipeline {
+    agent { label 'standard' }
+
+    options {
+        timestamps()
+        timeout(time: 1, unit: 'HOURS')
+        buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14'))
+    }
+
+    tools {
+        maven "maven"
+    }
+
+    environment {
+        ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials')
+        CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}"
+        CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}"
+    }
+
+    stages {
+
+        stage('Build ') {
+            steps {
+                sh "mvn -B install -DskipTests -Pjdk8"
+            }
+        }
+
+        stage('Test ') {
+            steps {
+                sh "mvn -B test -Pjdk8"
+            }
+            post {
+                always {
+                    junit allowEmptyResults: true, testResults: '**/target/surefire-reports/**/TEST-*.xml'
+                    archiveArtifacts artifacts: '**/target/surefire-reports/**/TEST-*.xml', fingerprint: true
+                }
+            }
+        }
+
+        stage('Deploy SNAPSHOT to artifactory') {
+            when {
+                expression { return is219xBranch() }
+            }
+            steps {
+                sh "mvn deploy -B -s .github/maven-settings.xml -DskipTests -Pjdk8 -Dartifactory.publish.buildInfo=true"
+            }
+        }
+
+        stage('Deploy Release to artifactory') {
+            // ****** Revert below once tested
+            //when {
+            //    expression { return isReleaseTag() }
+            //}
+            steps {
+                 sh "mvn deploy -B -s .github/maven-settings.xml -DskipTests -Pjdk8 -Dartifactory.publish.buildInfo=true"
+            }
+        }
+    }
+}
+
+
+def isReleaseTag() {
+    return (env.TAG_NAME =~ /^release-.*$/)
+}
+
+def isMainBranch() {
+    return (env.BRANCH_NAME =~ /^master$/)
+}
+
+def is219xBranch() {
+    return (env.BRANCH_NAME =~ /^2.19.x$/)
+}
diff --git a/artemis-boot/pom.xml b/artemis-boot/pom.xml
@@ -22,7 +22,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

diff --git a/artemis-cdi-client/pom.xml b/artemis-cdi-client/pom.xml
@@ -22,7 +22,7 @@
    <parent>
       <artifactId>artemis-pom</artifactId>
       <groupId>org.apache.activemq</groupId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-cli</artifactId>

diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-commons</artifactId>

diff --git a/artemis-core-client-all/pom.xml b/artemis-core-client-all/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-core-client-all</artifactId>

diff --git a/artemis-core-client-osgi/pom.xml b/artemis-core-client-osgi/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-core-client-osgi</artifactId>

diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-core-client</artifactId>

diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
@@ -22,7 +22,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>apache-artemis</artifactId>

diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-dto</artifactId>

diff --git a/artemis-features/pom.xml b/artemis-features/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.apache.activemq</groupId>
 		<artifactId>artemis-pom</artifactId>
-		<version>2.19.2-SNAPSHOT</version>
+		<version>2.19.2_r3-SNAPSHOT</version>
 	</parent>
 	<artifactId>artemis-features</artifactId>
 	<packaging>pom</packaging>

diff --git a/artemis-hawtio/activemq-branding/pom.xml b/artemis-hawtio/activemq-branding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.activemq</groupId>
         <artifactId>artemis-hawtio-pom</artifactId>
-        <version>2.19.2-SNAPSHOT</version>
+        <version>2.19.2_r3-SNAPSHOT</version>
     </parent>
 
     <artifactId>activemq-branding</artifactId>

diff --git a/artemis-hawtio/artemis-console/pom.xml b/artemis-hawtio/artemis-console/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>artemis-hawtio-pom</artifactId>
-    <version>2.19.2-SNAPSHOT</version>
+    <version>2.19.2_r3-SNAPSHOT</version>
   </parent>
 
   <artifactId>artemis-console</artifactId>

diff --git a/artemis-hawtio/artemis-plugin/pom.xml b/artemis-hawtio/artemis-plugin/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>artemis-hawtio-pom</artifactId>
-    <version>2.19.2-SNAPSHOT</version>
+    <version>2.19.2_r3-SNAPSHOT</version>
   </parent>
 
   <artifactId>artemis-plugin</artifactId>

diff --git a/artemis-hawtio/pom.xml b/artemis-hawtio/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.activemq</groupId>
         <artifactId>artemis-pom</artifactId>
-        <version>2.19.2-SNAPSHOT</version>
+        <version>2.19.2_r3-SNAPSHOT</version>
     </parent>
 
     <artifactId>artemis-hawtio-pom</artifactId>

diff --git a/artemis-jakarta-client-all/pom.xml b/artemis-jakarta-client-all/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jakarta-client-all</artifactId>

diff --git a/artemis-jakarta-client/pom.xml b/artemis-jakarta-client/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jakarta-client</artifactId>

diff --git a/artemis-jakarta-ra/pom.xml b/artemis-jakarta-ra/pom.xml
@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jakarta-ra</artifactId>

diff --git a/artemis-jakarta-server/pom.xml b/artemis-jakarta-server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.activemq</groupId>
         <artifactId>artemis-pom</artifactId>
-        <version>2.19.2-SNAPSHOT</version>
+        <version>2.19.2_r3-SNAPSHOT</version>
     </parent>
 
     <artifactId>artemis-jakarta-server</artifactId>

diff --git a/artemis-jakarta-service-extensions/pom.xml b/artemis-jakarta-service-extensions/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jakarta-service-extensions</artifactId>

diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jdbc-store</artifactId>

diff --git a/artemis-jms-client-all/pom.xml b/artemis-jms-client-all/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jms-client-all</artifactId>

diff --git a/artemis-jms-client-osgi/pom.xml b/artemis-jms-client-osgi/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jms-client-osgi</artifactId>

diff --git a/artemis-jms-client/pom.xml b/artemis-jms-client/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jms-client</artifactId>

diff --git a/artemis-jms-server/pom.xml b/artemis-jms-server/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jms-server</artifactId>

diff --git a/artemis-journal/pom.xml b/artemis-journal/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-journal</artifactId>

diff --git a/artemis-junit/pom.xml b/artemis-junit/pom.xml
@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-junit</artifactId>

diff --git a/artemis-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-pom</artifactId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-maven-plugin</artifactId>

diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml
@@ -20,7 +20,7 @@
    <parent>
       <artifactId>artemis-protocols</artifactId>
       <groupId>org.apache.activemq</groupId>
-      <version>2.19.2-SNAPSHOT</version>
+      <version>2.19.2_r3-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-amqp-protocol</artifactId>