[Git][java-team/maven-javadoc-plugin][master] 3 commits: Adjust the source level automatically (Closes: #981967)

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-javadoc-plugin


Commits:
09a4efa5 by Emmanuel Bourg at 2023-01-16T09:28:14+01:00
Adjust the source level automatically (Closes: #981967)

- - - - -
8d62d156 by Emmanuel Bourg at 2023-01-16T09:28:19+01:00
Standards-Version updated to 4.6.2

- - - - -
889cde35 by Emmanuel Bourg at 2023-01-16T09:28:57+01:00
Upload to unstable

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+maven-javadoc-plugin (3.4.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Adjust the source level automatically (Closes: #981967)
+  * Standards-Version updated to 4.6.2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 Jan 2023 09:28:52 +0100
+
 maven-javadoc-plugin (3.4.1-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -27,7 +27,7 @@ Build-Depends:
  libplexus-languages-java (>= 1.1),
  libqdox2-java,
  maven-debian-helper
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/maven-javadoc-plugin.git
 Vcs-Browser: https://salsa.debian.org/java-team/maven-javadoc-plugin
 Homepage: https://maven.apache.org/plugins/maven-javadoc-plugin/


=====================================
debian/patches/auto-adjust-language-level.patch
=====================================
@@ -0,0 +1,34 @@
+Description: Adjust the source/release level automatically for building with recent JDKs
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
++++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+@@ -158,6 +158,8 @@
+ public abstract class AbstractJavadocMojo
+     extends AbstractMojo
+ {
++    private List<String> unsupportedLanguageLevels = java.util.Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5", "1.6", "6"});
++
+     /**
+      * Classifier used in the name of the javadoc-options XML file, and in the resources bundle
+      * artifact that gets attached to the project. This one is used for non-test javadocs.
+@@ -2028,6 +2030,19 @@
+     public void execute()
+         throws MojoExecutionException, MojoFailureException
+     {
++	String defaultLevel = "7";
++        if ( unsupportedLanguageLevels.contains( release ) )
++        {
++            System.err.println( "Use of release " + release + " is no longer supported, switching to " + defaultLevel );
++            release = defaultLevel;
++        }
++
++        if ( unsupportedLanguageLevels.contains( source ) )
++        {
++            System.err.println( "Use of source " + source + " is no longer supported, switching to " + defaultLevel );
++            source = defaultLevel;
++        }
++
+         verifyRemovedParameter( "aggregator" );
+         verifyRemovedParameter( "proxyHost" );
+         verifyRemovedParameter( "proxyPort" );


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ reproducible-footer.patch
 ignore-source-errors.patch
 default-detectJavaApiLink-to-false.patch
 disable-doclint.patch
+auto-adjust-language-level.patch



View it on GitLab: https://salsa.debian.org/java-team/maven-javadoc-plugin/-/compare/8efefccf5195085ce8b7d8f87268da2b80dbad75...889cde35488f35ff69a1a7c7a44ef186251f8896

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven-javadoc-plugin/-/compare/8efefccf5195085ce8b7d8f87268da2b80dbad75...889cde35488f35ff69a1a7c7a44ef186251f8896
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/20230116/ad0cad63/attachment.htm>