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-fileupload.git
The following commit(s) were added to refs/heads/master by this push:
new b69ae918 Bump Java from 8 to 11
b69ae918 is described below
commit b69ae9183333c3bcad3974e55546b79bbfe232de
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jul 21 18:23:57 2023 -0400
Bump Java from 8 to 11
- Hack defaultGoal for weird Javadoc error
- Add Java 20 to GitHub builds
---
.github/workflows/coverage.yml | 2 +-
.github/workflows/maven.yml | 4 ++--
pom.xml | 11 ++++++++---
src/changes/changes.xml | 6 ++++++
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index f752485e..6e654308 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 8 ]
+ java: [ 11 ]
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2691223f..ad011a18 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,10 +27,10 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- java: [ 8, 11, 17 ]
+ java: [ 11, 17, 20 ]
experimental: [false]
# include:
-# - java: 18-ea
+# - java: 21-ea
# experimental: true
steps:
diff --git a/pom.xml b/pom.xml
index d64bf557..23c1851c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,8 +223,9 @@
</distributionManagement>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <commons.compiler.release>11</commons.compiler.release>
<commons.parent.dir>${basedir}</commons.parent.dir>
<commons.componentid>fileupload</commons.componentid>
<commons.module.name>org.apache.commons.fileupload2</commons.module.name>
@@ -251,7 +252,10 @@
<commons.lang3.version>3.12.0</commons.lang3.version>
<japicmp.skip>true</japicmp.skip>
<clirr.skip>true</clirr.skip>
+ <animal.sniffer.skip>true</animal.sniffer.skip>
<moditect-maven-plugin.version>1.0.0.Final</moditect-maven-plugin.version>
+
<commons.javadoc.java.link>${commons.javadoc11.java.link}</commons.javadoc.java.link>
+
<commons.javadoc.javaee.link>https://jakarta.ee/specifications/platform/9.1/apidocs/</commons.javadoc.javaee.link>
<!-- Commons Release Plugin -->
<commons.bc.version>2.0.0</commons.bc.version>
@@ -323,7 +327,8 @@
</plugin>
</plugins>
</pluginManagement>
- <defaultGoal>clean verify apache-rat:check checkstyle:check pmd:check
javadoc:javadoc spotbugs:check</defaultGoal>
+ <!-- javadoc:javadoc fails if later in the sequence -->
+ <defaultGoal>clean javadoc:javadoc verify apache-rat:check
checkstyle:check pmd:check spotbugs:check</defaultGoal>
</build>
<reporting>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7c956922..c31c899d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -43,6 +43,12 @@ The <action> type attribute can be add,update,fix,remove.
</properties>
<body>
+ <release version="2.0.0-M1" date="2023-07-14" description="2.0.0-M1
Release">
+ <!-- FIX -->
+ <!-- ADD -->
+ <!-- UDPATE -->
+ <action dev="ggregory" type="update"
due-to="Dependabot">Bump Java from 8 to 11.</action>
+ </release>
<release version="2.0.0-M1" date="2023-07-14" description="2.0.0-M1
Release">
<!-- FIX -->
<action dev="jochen" type="fix">Changing Maven
coordinates, and package name, due to binary incompatible changes.</action>
