[Git][java-team/plexus-compiler][master] 3 commits: Adjust the release level from 6 to 7 to support Java 12 or later

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / plexus-compiler


Commits:
1a59d57e by Emmanuel Bourg at 2022-05-24T23:50:55+02:00
Adjust the release level from 6 to 7 to support Java 12 or later

- - - - -
bca5cdde by Emmanuel Bourg at 2022-05-24T23:51:02+02:00
Standards-Version updated to 4.6.1

- - - - -
cc1e958b by Emmanuel Bourg at 2022-05-24T23:51:22+02:00
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/auto-adjust-language-level.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+plexus-compiler (2.8.8-3) unstable; urgency=medium
+
+  * Team upload.
+  * Adjust the release level from 6 to 7 to support Java 12 or later
+  * Standards-Version updated to 4.6.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 24 May 2022 23:51:17 +0200
+
 plexus-compiler (2.8.8-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends:
  libplexus-container-default-java,
  libplexus-utils2-java,
  maven-debian-helper (>= 1.5)
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/plexus-compiler.git
 Vcs-Browser: https://salsa.debian.org/java-team/plexus-compiler
 Homepage: https://codehaus-plexus.github.io/plexus-compiler/


=====================================
debian/patches/auto-adjust-language-level.patch
=====================================
@@ -3,14 +3,29 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
 +++ b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
-@@ -348,12 +348,20 @@
+@@ -341,10 +341,20 @@
+             args.add( "-Werror" );
+         }
+ 
++        List<String> unsupportedLanguageLevels = java.util.Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5", "1.6", "6"});
++
+         if ( !StringUtils.isEmpty( config.getReleaseVersion() ) )
+         {
+             args.add( "--release" );
+-            args.add( config.getReleaseVersion() );
++            if ( unsupportedLanguageLevels.contains( config.getReleaseVersion() ) )
++            {
++                System.err.println( "Use of release " + config.getReleaseVersion() + " is no longer supported, switching to 7" );
++                args.add( "7" );
++            }
++            else
++            {
++                args.add( config.getReleaseVersion() );
++            }
          }
          else
          {
-+            List<String> unsupportedLanguageLevels = java.util.Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5", "1.6", "6"});
-+
-             // TODO: this could be much improved
-             if ( StringUtils.isEmpty( config.getTargetVersion() ) )
+@@ -353,7 +363,13 @@
              {
                  // Required, or it defaults to the target of your JDK (eg 1.5)
                  args.add( "-target" );
@@ -25,7 +40,7 @@ Forwarded: not-needed
              }
              else
              {
-@@ -365,7 +373,13 @@
+@@ -365,7 +381,13 @@
              {
                  // If omitted, later JDKs complain about a 1.1 target
                  args.add( "-source" );



View it on GitLab: https://salsa.debian.org/java-team/plexus-compiler/-/compare/d101ea7d4e7a7f81572d24d8f7a10d4016615f8b...cc1e958b44f209a84e3497b7b8c336d9259e19f1

-- 
View it on GitLab: https://salsa.debian.org/java-team/plexus-compiler/-/compare/d101ea7d4e7a7f81572d24d8f7a10d4016615f8b...cc1e958b44f209a84e3497b7b8c336d9259e19f1
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220524/86954b63/attachment.htm>