diff --git a/.github/workflows/maven-build-jdk21.yml b/.github/workflows/maven-build-jdk21.yml deleted file mode 100644 index 2b19c57..0000000 --- a/.github/workflows/maven-build-jdk21.yml +++ /dev/null @@ -1,47 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Java CI with Maven JDK21 - -on: - push: - branches: - - '*' - schedule: - # Every day at 1am - - cron: '0 1 * * *' - -jobs: - build: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - version: - - 22.06.9 - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'zulu' - - - name: Print Versions - run: mvn -version && ant -version - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2-snapshots - - - name: Build with Maven - run: | - git fetch --all --tags - git checkout v5.0.1 - mvn -B package --file pom.xml -Dcoherence.version=${{ matrix.version }} diff --git a/.github/workflows/maven-build-snapshots-14110.yml b/.github/workflows/maven-build-snapshots-14110.yml deleted file mode 100644 index b595159..0000000 --- a/.github/workflows/maven-build-snapshots-14110.yml +++ /dev/null @@ -1,97 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Java CI with Maven - Snapshots - ce-14.1.1.0.x - -on: - push: - branches: - - '*' - schedule: - # Every day at midnight - - cron: '0 0 * * *' - -jobs: - build: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - branch: - - v14.1.1.0 - - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 8 for Build - uses: actions/setup-java@v4 - with: - java-version: 8 - distribution: 'zulu' - - - name: Print Versions - run: mvn -version && ant -version - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2-snapshots - - - 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 Build - uses: actions/setup-java@v4 - with: - java-version: 11 - distribution: 'zulu' - - - name: Build and Verify - env: - COH_BRANCH: ${{ matrix.branch }} - shell: bash - run: | - CLONE_DIR=coherence-$COH_BRANCH - # coherence-bom does not exist in 14.1.1.0 - 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 '' | sed -e 's,^.*,,' -e 's,.*$,,'` - - # checkout the v5.0.1 tag which is the one that works for 14.1.1. - git fetch --all --tags - git checkout v5.0.1 - echo "Running verify against $COH_VERSION and tag v5.0.1" - mvn --file pom.xml -nsu --batch-mode -e -Dcoherence.version=$COH_VERSION clean install - - echo "Removing Coherence cloned directory" - CLONE_DIR=coherence-$COH_BRANCH - rm -rf /tmp/${CLONE_DIR} - - - name: Coherence Demo Jar - uses: actions/upload-artifact@v4 - with: - name: coherence-demo-jar-${{ matrix.branch }} - path: target/coherence-demo-*.jar - - - name: Coherence Demo Javadoc - uses: actions/upload-artifact@v4 - with: - name: coherence-demo-javadoc-${{ matrix.branch }} - path: target/coherence-demo-*-javadoc.jar diff --git a/.github/workflows/maven-build-snapshots.yml b/.github/workflows/maven-build-snapshots.yml index ed75806..798d806 100644 --- a/.github/workflows/maven-build-snapshots.yml +++ b/.github/workflows/maven-build-snapshots.yml @@ -19,15 +19,17 @@ jobs: matrix: coherenceVersion: - 24.09 + javaVersion: + - 21 + - 22 steps: - uses: actions/checkout@v4 - - - name: Set up JDK 21 + - name: Set up JDK ${{ matrix.javaVersion }} uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '${{ matrix.javaVersion }}' distribution: 'zulu' - name: Print Versions diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index f227609..ada740a 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -18,8 +18,8 @@ jobs: fail-fast: false matrix: version: - - 14.1.1-0-17 - - 22.06.8 + - 14.1.1-0-18 + - 22.06.9 steps: - name: Checkout diff --git a/.github/workflows/polyglot-build-jdk21.yml b/.github/workflows/polyglot-build-jdk21.yml index 7177f13..dd98e2f 100644 --- a/.github/workflows/polyglot-build-jdk21.yml +++ b/.github/workflows/polyglot-build-jdk21.yml @@ -12,15 +12,19 @@ jobs: runs-on: ubuntu-latest strategy: fail-fast: false + matrix: + javaVersion: + - 21 + - 22 steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 21 + - name: Set up JDK ${{ matrix.javaVersion }} uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '${{ matrix.javaVersion }}' distribution: 'zulu' - name: Print Versions @@ -36,7 +40,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.23' - name: Set up Python 3.11 uses: actions/setup-python@v5