This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 0b1c775 [MSITE-829] [MSITE-828] Upgrade Jetty to 9.4.x implicit java8
requirement now (#21)
0b1c775 is described below
commit 0b1c775fec6b98b433230645aeaf387d9b908385
Author: Olivier Lamy <[email protected]>
AuthorDate: Wed Feb 23 16:40:22 2022 +1000
[MSITE-829] [MSITE-828] Upgrade Jetty to 9.4.x implicit java8 requirement
now (#21)
* [MSITE-829] use jetty 9.4.43.v20210629
* [MSITE-828] Upgrade to Java 8
Signed-off-by: Olivier Lamy <[email protected]>
---
Jenkinsfile | 2 +-
pom.xml | 9 ++++++---
src/it/projects/MSITE-497/pom.xml | 1 +
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e9f05f7..a6f5f3d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpPlgnBuild()
+asfMavenTlpPlgnBuild(jdk:['8','11','14'], maven:['3.3.x', '3.5.x', '3.8.x'])
diff --git a/pom.xml b/pom.xml
index 69d4d6e..9d8987d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,11 +196,13 @@ under the License.
<properties>
<mavenVersion>3.0.5</mavenVersion>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
+
<!-- for dependencies -->
<doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
- <jettyVersion>9.2.29.v20191105</jettyVersion>
+ <jettyVersion>9.4.44.v20210927</jettyVersion>
+
<plexusVersion>1.5.4</plexusVersion>
<scmVersion>1.4</scmVersion>
<wagonVersion>3.3.1</wagonVersion>
@@ -214,6 +216,7 @@ under the License.
<surefirePluginVersion>2.22.2</surefirePluginVersion>
<surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2022-02-13T11:25:26Z</project.build.outputTimestamp>
+
</properties>
<dependencies>
@@ -384,7 +387,6 @@ under the License.
<version>${doxiaVersion}</version>
<scope>runtime</scope>
</dependency>
-
<!-- Doxia Sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
@@ -533,6 +535,7 @@ under the License.
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
</properties>
+ <javaHome>${java.home}</javaHome>
</configuration>
</plugin>
<plugin>
diff --git a/src/it/projects/MSITE-497/pom.xml
b/src/it/projects/MSITE-497/pom.xml
index df20b82..2e21291 100644
--- a/src/it/projects/MSITE-497/pom.xml
+++ b/src/it/projects/MSITE-497/pom.xml
@@ -65,6 +65,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>@javadocPluginVersion@</version>
</plugin>
</plugins>
</reporting>
