Update ci/cd (#60)

Author: Tim Middleton

.github/workflows/test-against-snapshot-1440.yml

@@ -43,8 +43,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch:
-          - v14.1.1.0
+        coherenceVersion:
+          - 14.1.1-0-13-SNAPSHOT
 
     steps:
     - name: Checkout
@@ -66,22 +66,6 @@ jobs:
     - name: Print Versions
       run: mvn -version && ant -version
 
-    - name: Build Coherence Snapshot
-      shell: bash
-      env:
-        COH_BRANCH: ${{ matrix.branch }} 
-        MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-      run: |
-        # Checkout the git repo for coherence snapshot and build
-        DIR=`pwd`
-        CLONE_DIR=coherence-$COH_BRANCH
-        cd /tmp
-        git clone https://github.com/oracle/coherence.git $CLONE_DIR
-        cd $CLONE_DIR
-        git checkout $COH_BRANCH
-        mvn --file prj/pom.xml --batch-mode -e -DskipTests clean install
-        cd $DIR
-
     - name: Set up JDK 11 for Plugin
       uses: actions/setup-java@v3
       with:
@@ -95,22 +79,12 @@ jobs:
 
     - name: Verify
       env:
-        COH_BRANCH: ${{ matrix.branch }} 
+        COH_VERSION: ${{ matrix.coherenceVersion }}
       shell: bash
       run: |
-        CLONE_DIR=coherence-$COH_BRANCH
-        POM_FILE=/tmp/${CLONE_DIR}/prj/coherence-bom/pom.xml
-        if [ ! -r $POM_FILE ] ; then
-           POM_FILE=/tmp/${CLONE_DIR}/prj/pom.xml
-        fi
-        COH_VERSION=`cat ${POM_FILE} | grep '<revision>' | sed -e 's,^.*<revision>,,' -e 's,</revision>.*$,,'`
-
         echo "Running verify against $COH_VERSION"
         mvn --file coherence-visualvm-tests/coherence-visualvm-tests-ce/pom.xml --batch-mode -nsu -e -Dcoherence.version=$COH_VERSION clean install
 
-        echo "Removing Coherence cloned directory"
-        CLONE_DIR=coherence-$COH_BRANCH
-        rm -rf /tmp/${CLONE_DIR}
 
     - name: Build Artifacts test logs
       uses: actions/upload-artifact@v3

.github/workflows/test-against-snapshot.yml

@@ -43,8 +43,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch:
-          - main
+        coherenceVersion:
+          - 23.03-SNAPSHOT
+          - 22.06.5-SNAPSHOT
+          - 22.06.4-SNAPSHOT
 
     steps:
     - name: Checkout
@@ -66,48 +68,22 @@ jobs:
     - name: Print Versions
       run: mvn -version && ant -version
 
-    - name: Build Coherence Snapshot
-      shell: bash
-      env:
-        COH_BRANCH: ${{ matrix.branch }} 
-        MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-      run: |
-        # Checkout the git repo for coherence snapshot and build
-        DIR=`pwd`
-        CLONE_DIR=coherence-$COH_BRANCH
-        cd /tmp
-        git clone https://github.com/oracle/coherence.git $CLONE_DIR
-        cd $CLONE_DIR/prj
-        make all
-        cd $DIR
-
     - name: Build Plugin
       shell: bash
       run: |
         mvn --file pom.xml --batch-mode -e -DskipTests clean install
 
     - name: Verify
       env:
-        COH_BRANCH: ${{ matrix.branch }} 
+        COH_VERSION: ${{ matrix.coherenceVersion }}
       shell: bash
       run: |
-        CLONE_DIR=coherence-$COH_BRANCH
-        POM_FILE=/tmp/${CLONE_DIR}/prj/coherence-bom/pom.xml
-        if [ ! -r $POM_FILE ] ; then
-           POM_FILE=/tmp/${CLONE_DIR}/prj/pom.xml
-        fi
-        COH_VERSION=`cat ${POM_FILE} | grep '<revision>' | sed -e 's,^.*<revision>,,' -e 's,</revision>.*$,,'`
-
         echo "Running verify against $COH_VERSION"
         mvn --file coherence-visualvm-tests/coherence-visualvm-tests-ce/pom.xml --batch-mode -nsu -e -Dcoherence.version=$COH_VERSION clean install
         
         echo "Running Topics tests"
         mvn --file coherence-visualvm-tests/coherence-visualvm-tests-topics/pom.xml -P topics --batch-mode -nsu -e -Dcoherence.version=$COH_VERSION clean install
 
-        echo "Removing Coherence cloned directory"
-        CLONE_DIR=coherence-$COH_BRANCH
-        rm -rf /tmp/${CLONE_DIR}
-
     - name: Build Artifacts test logs
       uses: actions/upload-artifact@v3
       if: failure()

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-  Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
   This code is free software; you can redistribute it and/or modify it
@@ -365,4 +365,29 @@
       </build>
     </profile>
   </profiles>
+
+  <repositories>
+    <repository>
+      <id>ossrh-staging</id>
+      <name>OSS Sonatype Staging</name>
+      <url>https://oss.sonatype.org/content/groups/staging/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+
+    <repository>
+      <id>snapshots-repo</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 </project>