This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e9ada9b35 Only build with Java >= 17
9e9ada9b35 is described below

commit 9e9ada9b35848be23d79a45aa4b250c271d5d67e
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Thu Dec 7 22:05:02 2023 +0000

    Only build with Java >= 17
    
    This will allow us to upgrade some Maven plugins and test dependencies.
---
 .devcontainer/devcontainer.json | 2 +-
 .devcontainer/rhel/Dockerfile   | 6 +++---
 .github/workflows/ci.yml        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 785ef3b940..feaf76dafc 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
        "features": {
                "ghcr.io/devcontainers/features/java:1": {
-                       "version": "11",
+                       "version": "17",
                        "jdkDistro": "zulu",
                        "installMaven": "true",
                        "mavenVersion": "3.9.1"
diff --git a/.devcontainer/rhel/Dockerfile b/.devcontainer/rhel/Dockerfile
index 27c4dd6ac3..0dc72d4cf5 100644
--- a/.devcontainer/rhel/Dockerfile
+++ b/.devcontainer/rhel/Dockerfile
@@ -1,6 +1,6 @@
 FROM redhat/ubi9
 RUN groupadd --gid 1000 vscode \
     && useradd -s /bin/bash --uid 1000 --gid 1000 -m vscode
-RUN yum install -y java-11-openjdk-devel maven git
-RUN for c in java javac; do alternatives --set $c java-11-openjdk.x86_64; done
-RUN echo JAVA_HOME=/usr/lib/jvm/java-11-openjdk >> /etc/java/java.conf
+RUN yum install -y java-17-openjdk-devel maven git
+RUN for c in java javac; do alternatives --set $c java-17-openjdk.x86_64; done
+RUN echo JAVA_HOME=/usr/lib/jvm/java-17-openjdk >> /etc/java/maven.conf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90b6f9d3fd..d45ce8b412 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 11, 17, 19 ]
+        java: [ 17, 19 ]
     name: "Java ${{ matrix.java }}"
     runs-on: ubuntu-22.04
     steps:
@@ -70,7 +70,7 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v4
       with:
-        java-version: 15
+        java-version: 17
         distribution: 'zulu'
         server-id: apache.snapshots.https
         server-username: NEXUS_USER

Reply via email to