You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2022/08/06 01:30:44 UTC

[archiva-components] branch master updated: [MRM-2031] Switch to jdk 11

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/archiva-components.git


The following commit(s) were added to refs/heads/master by this push:
     new df58518  [MRM-2031] Switch to jdk 11
df58518 is described below

commit df58518db2d3d6d94eb83f8a3cd7d31086e7acce
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Aug 5 21:40:10 2022 +1000

    [MRM-2031] Switch to jdk 11
    
    Signed-off-by: Olivier Lamy <ol...@apache.org>
---
 .github/workflows/maven.yml | 2 +-
 pom.xml                     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index d0aff8a..3ae4a11 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        java: [8, 11]
+        java: [11, 17]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
diff --git a/pom.xml b/pom.xml
index 2bbcc97..71125d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,8 +343,8 @@
           <version>${javadocPluginVersion}</version>
           <configuration>
             <notimestamp>true</notimestamp>
-            <javadocVersion>${javaFullVersion}</javadocVersion>
-            <source>${compiler.source}</source>
+            <javadocVersion>${maven.compiler.release}</javadocVersion>
+            <source>${maven.compiler.release}</source>
             <doclint>none</doclint>
             <detectLinks>true</detectLinks>
             <detectJavaApiLink>true</detectJavaApiLink>
@@ -491,8 +491,8 @@
         <inherited>false</inherited>
         <configuration>
           <notimestamp>true</notimestamp>
-          <javadocVersion>${javaFullVersion}</javadocVersion>
-          <source>${compiler.source}</source>
+          <javadocVersion>${maven.compiler.release}</javadocVersion>
+          <source>${maven.compiler.release}</source>
           <doclint>none</doclint>
           <detectLinks>true</detectLinks>
           <detectJavaApiLink>true</detectJavaApiLink>