This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit b9e879de2a19f67e62eb73377fc349f0c3e28b54 Author: Gary Gregory <[email protected]> AuthorDate: Thu Jul 20 20:37:48 2023 -0400 Bump Java from 8 to 17 --- .github/workflows/{maven.yml => maven-pool2.yml} | 10 +++++++--- .github/workflows/{maven.yml => maven-pool3.yml} | 12 ++++++++---- pom.xml | 6 ++++-- src/changes/changes.xml | 4 ++++ 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven-pool2.yml similarity index 93% copy from .github/workflows/maven.yml copy to .github/workflows/maven-pool2.yml index d74eae20..bf11f8f9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven-pool2.yml @@ -15,8 +15,12 @@ name: Java CI -on: [push, pull_request] - +on: + push: + branches: [ POOL_2_X ] + pull_request: + branches: [ POOL_2_X ] + permissions: contents: read @@ -30,7 +34,7 @@ jobs: java: [ 8, 11, 17 ] experimental: [false] # include: -# - java: 18-ea +# - java: 21-ea # experimental: true steps: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven-pool3.yml similarity index 92% rename from .github/workflows/maven.yml rename to .github/workflows/maven-pool3.yml index d74eae20..72881d2a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven-pool3.yml @@ -15,8 +15,12 @@ name: Java CI -on: [push, pull_request] - +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + permissions: contents: read @@ -27,10 +31,10 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - java: [ 8, 11, 17 ] + java: [ 17, 20 ] experimental: [false] # include: -# - java: 18-ea +# - java: 21-ea # experimental: true steps: diff --git a/pom.xml b/pom.xml index a0216d34..e672358c 100644 --- a/pom.xml +++ b/pom.xml @@ -182,8 +182,9 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> + <commons.compiler.release>17</commons.compiler.release> <commons.componentid>pool</commons.componentid> <commons.module.name>org.apache.commons.pool3</commons.module.name> <commons.rc.version>RC1</commons.rc.version> @@ -207,6 +208,7 @@ <japicmp.skip>true</japicmp.skip> <spotbugs.skip>false</spotbugs.skip> + <animal.sniffer.skip>true</animal.sniffer.skip> </properties> <build> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index c44a7827..fb03d76d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -50,6 +50,10 @@ The <action> type attribute can be add,update,fix,remove. <action dev="ggregory" type="remove"> Deprecations from version 2.x have been removed. </action> + <!-- UPDATE --> + <action dev="ggregory" type="update"> + Bump Java from 8 to 17. + </action> </release> <release version="2.12.0" date="2023-MM-DD" description="This is a feature and maintenance release (Java 8)."> <!-- FIX -->
