[MSITE-829] use jetty 9.4.43.v20210629

- build from 8 only and we do not support anymore 3.0.x - improve gh action Signed-off-by: Olivier Lamy <[email protected]>
apache · Sep 2, 2021 · 88aa108 · 88aa108
1 parent 0cd2070
commit 88aa108
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,7 +25,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        java: [8, 11, 14, 15-ea]
+        java: [8, 11, 17-ea]
+        jdk: [temurin, zulu]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -34,18 +35,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up cache for ~./m2/repository
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2/repository
-          key: maven-${{ matrix.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            maven-${{ matrix.os }}-java${{ matrix.java }}-
-            maven-${{ matrix.os }}-
-
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          cache: 'maven'
+          distribution: ${{ matrix.jdk }}
           java-version: ${{ matrix.java }}
 
       - name: Build with Maven

diff --git 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
@@ -196,11 +196,12 @@ under the License.
 
   <properties>
     <mavenVersion>3.0.5</mavenVersion>
-    <javaVersion>7</javaVersion>
+    <javaVersion>8</javaVersion>
+
     <!-- for dependencies -->
     <doxiaVersion>1.10</doxiaVersion>
     <doxiaSitetoolsVersion>1.10</doxiaSitetoolsVersion>
-    <jettyVersion>9.2.29.v20191105</jettyVersion>
+    <jettyVersion>9.4.43.v20210629</jettyVersion>
     <plexusVersion>1.5.4</plexusVersion>
     <scmVersion>1.4</scmVersion>
     <wagonVersion>3.3.1</wagonVersion>
@@ -211,8 +212,10 @@ under the License.
     <pmdPluginVersion>3.11.0</pmdPluginVersion>
     <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
     <surefirePluginVersion>2.22.2</surefirePluginVersion>
-	<surefire.version>2.22.2</surefire.version>
+	  <surefire.version>2.22.2</surefire.version>
     <project.build.outputTimestamp>2020-06-21T16:21:18Z</project.build.outputTimestamp>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
 
   <dependencies>
@@ -383,7 +386,6 @@ under the License.
       <version>${doxiaVersion}</version>
       <scope>runtime</scope>
     </dependency>
-
     <!-- Doxia Sitetools -->
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
@@ -531,6 +533,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
@@ -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>