diff --git a/.azure/templates/jobs/build_docs.yaml b/.azure/templates/jobs/build_docs.yaml index 2f4c5163..eb046136 100644 --- a/.azure/templates/jobs/build_docs.yaml +++ b/.azure/templates/jobs/build_docs.yaml @@ -3,9 +3,9 @@ jobs: displayName: 'Build Docs' strategy: matrix: - 'java-11': + 'java-17': image: 'Ubuntu-22.04' - jdk_version: '11' + jdk_version: '17' # Strategy for the job # Set timeout for jobs timeoutInMinutes: 60 diff --git a/.azure/templates/jobs/build_java.yaml b/.azure/templates/jobs/build_java.yaml index e2486dbe..458fe808 100644 --- a/.azure/templates/jobs/build_java.yaml +++ b/.azure/templates/jobs/build_java.yaml @@ -4,14 +4,10 @@ jobs: # Strategy for the job strategy: matrix: - 'java-11': - image: 'Ubuntu-22.04' - jdk_version: '11' - main_build: 'true' 'java-17': image: 'Ubuntu-22.04' jdk_version: '17' - main_build: 'false' + main_build: 'true' # Set timeout for jobs timeoutInMinutes: 60 # Base system diff --git a/.azure/templates/steps/prerequisites/install_java.yaml b/.azure/templates/steps/prerequisites/install_java.yaml index fad0b09b..ca431014 100644 --- a/.azure/templates/steps/prerequisites/install_java.yaml +++ b/.azure/templates/steps/prerequisites/install_java.yaml @@ -1,7 +1,7 @@ # Step to configure JAVA on the agent parameters: - name: JDK_VERSION - default: '11' + default: '17' steps: - task: JavaToolInstaller@0 inputs: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fd096beb..2cb0a1fe 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -37,11 +37,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - # Setup OpenJDK 11 + # Setup OpenJDK 17 - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'maven' # Initializes the CodeQL tools for scanning. diff --git a/.travis.yml b/.travis.yml index 926a3587..2ed36686 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ jobs: - build: ppc64le os: linux arch: ppc64le - jdk: openjdk11 + jdk: openjdk17 script: mvn install -Dmaven.javadoc.skip=true addons: apt: @@ -17,7 +17,7 @@ jobs: - build: s390x os: linux arch: s390x - jdk: openjdk11 + jdk: openjdk17 # because of flakiness of tests on s390x, adding automatic retries on failure script: mvn install -Dmaven.javadoc.skip=true -Dfailsafe.rerunFailingTestsCount=10 addons: diff --git a/CHANGELOG.md b/CHANGELOG.md index 725aa30b..2efa49d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 0.32.0 * Dependency updates (JMX exporter 1.1.0) +* Dropped support for Java 11 and replaced with Java 17. ## 0.31.1 diff --git a/pom.xml b/pom.xml index 60002aac..aad50858 100644 --- a/pom.xml +++ b/pom.xml @@ -103,8 +103,7 @@ UTF-8 - 11 - 11 + 17 2.17.2 4.5.11 4.5.11