You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2024/09/23 12:06:08 UTC
(myfaces-tobago) branch tobago-5.x updated: fix: using "release" option (#5442)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/tobago-5.x by this push:
new cc8a3db3a9 fix: using "release" option (#5442)
cc8a3db3a9 is described below
commit cc8a3db3a9ff0e0b40fecaaddbba9dbf8cc77eeb
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Mon Sep 23 14:06:02 2024 +0200
fix: using "release" option (#5442)
* fix: using "release" option
* replace maven-animal-sniffer plugin with
the -release option
* remove animal-sniffer
issue: TOBAGO-2356
---
.github/workflows/codeql-analysis.yml | 8 +++++--
.github/workflows/tobago-ci.yml | 8 +++----
Jenkinsfile | 10 ++++----
RELEASE_CHECKLIST.md | 2 +-
pom.xml | 38 +++---------------------------
tobago-core/pom.xml | 2 --
tobago-example/tobago-example-demo/pom.xml | 9 -------
tobago-tool/tobago-tool-apt/pom.xml | 16 -------------
8 files changed, 18 insertions(+), 75 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5fecd907f7..c0b0f0c7dc 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -27,12 +27,10 @@ name: "CodeQL"
on:
push:
branches:
- - master
- tobago-5.x
pull_request:
# The branches below must be a subset of the branches above
branches:
- - master
- tobago-5.x
schedule:
- cron: '31 15 * * 5'
@@ -56,6 +54,12 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
+ - name: Set up JDK 17
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: '17'
+
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
diff --git a/.github/workflows/tobago-ci.yml b/.github/workflows/tobago-ci.yml
index 4cb2675b35..26d5f33d38 100644
--- a/.github/workflows/tobago-ci.yml
+++ b/.github/workflows/tobago-ci.yml
@@ -32,11 +32,11 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- - name: Set up JDK 1.8
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
- distribution: 'zulu'
- java-version: '8'
+ distribution: 'temurin'
+ java-version: '17'
- name: Cache Maven packages
uses: actions/cache@v4
with:
@@ -46,7 +46,7 @@ jobs:
- name: Build with Maven
# -DossindexAnalyzerEnabled=false to ignore Sonatype OSS (when it is out of order)
run: |
- if ! mvn -B checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check -Pgenerate-assembly -Pfrontend package -Dformats=XML -f pom.xml; then
+ if ! mvn -B checkstyle:check apache-rat:check dependency-check:check -Pgenerate-assembly -Pfrontend package -Dformats=XML -f pom.xml; then
find . \( -path '*/target/surefire-reports/*.xml' -o -path '*/target/failsafe-reports/*.xml' -o -path '*/target/rat.txt' -o -path '*/target/checkstyle-result.xml' -o -path '*/target/dependency-check-report.xml' \) | zip -q reports.zip -@
exit 1
fi
diff --git a/Jenkinsfile b/Jenkinsfile
index 80e7b82260..a099e129ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,9 +43,7 @@ pipeline {
axes {
axis {
name 'JAVA_VERSION'
-// values 'jdk_1.8_latest', 'jdk_11_latest', 'jdk_16_latest'
-// XXX turned off because of Jenkins random fails
- values 'jdk_1.8_latest'
+ values 'jdk_17_latest'
}
}
@@ -57,7 +55,7 @@ pipeline {
stages {
stage('BuildAndTest') {
steps {
- sh "mvn -U clean package checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check -Pgenerate-assembly -Pfrontend"
+ sh "mvn -U clean package checkstyle:check apache-rat:check dependency-check:check -Pgenerate-assembly -Pfrontend"
}
post {
always {
@@ -73,7 +71,7 @@ pipeline {
stage('Deploy') {
tools {
maven "maven_latest"
- jdk "jdk_11_latest"
+ jdk "jdk_17_latest"
}
steps {
sh "mvn clean deploy -Pgenerate-assembly -Ptomcat -Pfrontend"
@@ -150,4 +148,4 @@ Director of Continuous Integration
}
}
}
-}
\ No newline at end of file
+}
diff --git a/RELEASE_CHECKLIST.md b/RELEASE_CHECKLIST.md
index 73b4e5e07b..01c8197e87 100644
--- a/RELEASE_CHECKLIST.md
+++ b/RELEASE_CHECKLIST.md
@@ -46,7 +46,7 @@ Checklist of tasks to perform for each release. For general information about Ap
* Perform basic checks on an unmodified checkout for all modules. Use JDK 8 or higher for Tobago 2, 4 and 5. Since
Tobago 6, use JDK 11 or higher.
```
- mvn clean install && mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check
+ mvn clean install && mvn checkstyle:check apache-rat:check dependency-check:check
```
## Building the Release
diff --git a/pom.xml b/pom.xml
index a1d4c3e3be..3c172bbc13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,8 +42,7 @@
<openwebbeans.version>2.0.27</openwebbeans.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.13</logback.version>
- <maven.compile.source>1.8</maven.compile.source>
- <maven.compile.target>1.8</maven.compile.target>
+ <maven.compiler.release>8</maven.compiler.release>
<maven.compile.encoding>UTF-8</maven.compile.encoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -409,8 +408,8 @@
</unCheckedPlugins>
</requirePluginVersions>
<requireJavaVersion>
- <message>Tobago must be compiled with Java 8 or higher</message>
- <version>[1.8,)</version>
+ <message>Tobago must be compiled with Java 17 or higher</message>
+ <version>[17,)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -453,17 +452,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -586,8 +574,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
<encoding>${maven.compile.encoding}</encoding>
<showWarnings>true</showWarnings>
<useIncrementalCompilation>false</useIncrementalCompilation><!-- see MCOMPILER-209 -->
@@ -626,7 +612,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<configuration>
- <source>${maven.compile.source}</source>
<!-- switched off check in Java 8 -->
<additionalparam>
-Xdoclint:accessibility
@@ -789,11 +774,6 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.24</version>
- </plugin>
<!--
usage: $ mvn versions:display-dependency-updates
usage: $ mvn versions:display-plugin-updates
@@ -927,18 +907,6 @@
<revisionOnScmFailure>unknown</revisionOnScmFailure>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.owasp</groupId>
diff --git a/tobago-core/pom.xml b/tobago-core/pom.xml
index 26fd7bfd1c..07c83b3f04 100644
--- a/tobago-core/pom.xml
+++ b/tobago-core/pom.xml
@@ -37,8 +37,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
<encoding>${maven.compile.encoding}</encoding>
<showWarnings>true</showWarnings>
<!-- <compilerArgument>-Xlint:all,-serial,-fallthrough</compilerArgument>-->
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 3e78e1f16c..78c69659bb 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -47,15 +47,6 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <!-- this is needed for ShrinkWrap to use java 8 (QUnitTests) -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
diff --git a/tobago-tool/tobago-tool-apt/pom.xml b/tobago-tool/tobago-tool-apt/pom.xml
index cfa9efb69e..fa7f66eb9c 100644
--- a/tobago-tool/tobago-tool-apt/pom.xml
+++ b/tobago-tool/tobago-tool-apt/pom.xml
@@ -26,22 +26,6 @@
<packaging>jar</packaging>
<name>Tobago Tool Apt</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>