You are viewing a plain text version of this content. The canonical link for it is here.
Posted to gitbox@yetus.apache.org by aw...@apache.org on 2022/02/01 21:03:24 UTC
[yetus] branch main updated: YETUS-1154. Clean-up some build issues now that JDK8 has been removed (#249)
This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/main by this push:
new 1ea8ef7 YETUS-1154. Clean-up some build issues now that JDK8 has been removed (#249)
1ea8ef7 is described below
commit 1ea8ef7ffd456a9bfae380b5e2832a4121935872
Author: Allen Wittenauer <aw...@apache.org>
AuthorDate: Tue Feb 1 13:03:16 2022 -0800
YETUS-1154. Clean-up some build issues now that JDK8 has been removed (#249)
---
.circleci/config.yml | 2 +-
.cirrus.yml | 2 +-
.github/workflows/action-test.yml | 1 +
.github/workflows/yetus.yml | 2 +-
.gitlab-ci.yml | 2 +-
.travis.yml | 2 +-
Jenkinsfile | 2 +-
pom.xml | 22 ++++++++++++++++------
8 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7666fb0..7b68ed7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,7 +38,7 @@ jobs:
- run: >
~/repo/precommit/src/main/shell/test-patch.sh
--plugins=all
- --java-home=/usr/lib/jvm/java-8-openjdk-amd64
+ --java-home=/usr/lib/jvm/java-11-openjdk-amd64
--patch-dir=/tmp/yetus-out
--html-report-file=/tmp/yetus-out/report.html
--console-report-file=/tmp/yetus-out/console.txt
diff --git a/.cirrus.yml b/.cirrus.yml
index e54fc9b..517de74 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -25,7 +25,7 @@ yetus_task:
--bugcomments=briefreport,htmlout,junit
--console-report-file=/tmp/yetus-out/console.txt
--html-report-file=/tmp/yetus-out/report.html
- --java-home=/usr/lib/jvm/java-8-openjdk-amd64
+ --java-home=/usr/lib/jvm/java-11-openjdk-amd64
--junit-report-xml=/tmp/yetus-out/junit.xml
--plugins=all
--tests-filter=checkstyle,test4tests
diff --git a/.github/workflows/action-test.yml b/.github/workflows/action-test.yml
index 262458e..3cdd4dd 100644
--- a/.github/workflows/action-test.yml
+++ b/.github/workflows/action-test.yml
@@ -38,6 +38,7 @@ jobs:
uses: apache/yetus-test-patch-action@main
with:
basedir: ./src
+ javahome: /usr/lib/jvm/java-11-openjdk-amd64
patchdir: ./out
buildtool: maven
githubtoken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/yetus.yml b/.github/workflows/yetus.yml
index f9d9874..32cb962 100644
--- a/.github/workflows/yetus.yml
+++ b/.github/workflows/yetus.yml
@@ -50,7 +50,7 @@ jobs:
--docker-cache-from=apache/yetus-base:main
--github-token="${{ secrets.GITHUB_TOKEN }}"
--html-report-file="${GITHUB_WORKSPACE}/out/report.html"
- --java-home=/usr/lib/jvm/java-8-openjdk-amd64
+ --java-home=/usr/lib/jvm/java-11-openjdk-amd64
--junit-report-xml="${GITHUB_WORKSPACE}/out/junit-report.xml"
--patch-dir="${GITHUB_WORKSPACE}/out"
--plugins=all
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bec0520..e138a65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ buretoolbox-job:
precommit/src/main/shell/test-patch.sh
--patch-dir=/tmp/yetus-out
--plugins=all
- --java-home=/usr/lib/jvm/java-8-openjdk-amd64
+ --java-home=/usr/lib/jvm/java-11-openjdk-amd64
--html-report-file=/tmp/yetus-out/report.html
--console-report-file=/tmp/yetus-out/console.txt
--brief-report-file=/tmp/yetus-out/brief.txt
diff --git a/.travis.yml b/.travis.yml
index 9312498..022ed61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ script:
precommit/src/main/shell/test-patch.sh
--docker
--patch-dir=/tmp/yetus-out
- --java-home=/usr/lib/jvm/java-8-openjdk-amd64
+ --java-home=/usr/lib/jvm/java-11-openjdk-amd64
--plugins=all,-detsecrets
--docker-cache-from=apache/yetus:main
--html-report-file=/tmp/yetus-out/report.html
diff --git a/Jenkinsfile b/Jenkinsfile
index 250191b..b9305ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ pipeline {
# enable writing back to Github
YETUS_ARGS+=(--github-token="${GITHUB_TOKEN}")
- YETUS_ARGS+=(--java-home=/usr/lib/jvm/java-8-openjdk-amd64)
+ YETUS_ARGS+=(--java-home=/usr/lib/jvm/java-11-openjdk-amd64)
# enable writing back to ASF JIRA
YETUS_ARGS+=(--jira-issue-re='^YETUS-[0-9]*$')
diff --git a/pom.xml b/pom.xml
index 7b4c3f7..7007b59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<!-- 22 and 23 are broken due to MASSEMBLY-941 -->
- <version>21</version>
+ <version>24</version>
<relativePath/>
<!-- no parent resolution -->
</parent>
@@ -60,21 +60,22 @@
<maven.min.version>3.2.0</maven.min.version>
<maven.api.version>3.2</maven.api.version>
<maven.plugin.api.version>3.5.4</maven.plugin.api.version>
- <java.min.version>1.8</java.min.version>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <java.min.version>11</java.min.version>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<checkstyle.version>9.0</checkstyle.version>
- <commons.io.version>2.7</commons.io.version>
+ <commons.io.version>2.11.0</commons.io.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<junit.version>5.8.2</junit.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+ <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
<maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
<mockito.version>4.2.0</mockito.version>
<spotbugs-maven-plugin.version>4.4.1</spotbugs-maven-plugin.version>
<sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
-
+ <project.build.outputTimestamp>n</project.build.outputTimestamp>
</properties>
<scm>
@@ -135,6 +136,15 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ <configuration>
+ <notimestamp>true</notimestamp><!-- avoid noise for svn/gitpubsub -->
+ </configuration>
+ </plugin>
+
+ <plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<failOnError>false</failOnError>