Accepting request 1229147 from Java:packages

3.11.2

OBS-URL: https://build.opensuse.org/request/show/1229147
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-javadoc-plugin?expand=0&rev=19

_service

@@ -2,7 +2,7 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/apache/maven-javadoc-plugin.git</param>
-		<param name="revision">maven-javadoc-plugin-3.11.3</param>
+		<param name="revision">maven-javadoc-plugin-3.11.2</param>
 		<param name="match-tag">maven-javadoc-plugin-*</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="versionrewrite-pattern">maven-javadoc-plugin-(.*)</param>

maven-javadoc-plugin-3.11.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50af43bddd3429a934a618dc5761051dd27832e46a0db365f1eddc07a36ea127
-size 823220

maven-javadoc-plugin-build.xml

@@ -14,7 +14,7 @@
             value="The Apache Maven Javadoc Plugin is a plugin that uses the javadoc tool for generating javadocs for the specified project."/>
   <property name="project.groupId" value="org.apache.maven.plugins"/>
   <property name="project.artifactId" value="maven-javadoc-plugin"/>
-  <property name="project.version" value="3.11.3"/>
+  <property name="project.version" value="3.11.2"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
   <property name="spec.version" value="3.11"/>

maven-javadoc-plugin.changes

@@ -1,81 +1,3 @@
--------------------------------------------------------------------
-Sun Aug 17 07:08:31 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Upgrade to upstream version 3.11.3
-  * Removed
-    + Remove workaround for long patched CVE in javadoc
-  * New features and improvements
-    + Issue #369 Support --no-fonts option per default for jdk 23+
-  * Bug Fixes
-    + Make the legacyMode consistent (Filter out all of the
-      module-info.java files in legacy mode, do not use
-      --source-path in legacy mode)
-    + MJAVADOC-826: Don't try to modify project source roots
-  * Documentation updates
-    + Correct javadoc-no-fork description on index-page
-    + MNGSITE-529: Rename "Goals" to "Plugin Documentation"
-    + (doc) Close links tag in links parameter javadoc example
-  * Maintenance
-    + Be consistent about data encoding when copying files
-    + Clean up JavadocUtilTest
-    + Use Java 7 relativization instead of hand-rolled code
-    + Rephrase source code fix interactive messages for clarity
-    + Reduce non-debug logging
-    + Delete duplicate @throws clause
-    + Use Java 7 relativization instead of our hand-rolled code
-    + Clean up comments and argument names
-    + Issue #378 Cleanup of code related to old non supported Java
-      version
-    + Cure deprecation warning
-    + MJAVADOC-773: deprecate toRelative
-    + Issue #373 Fix JDK 23 build
-    + Fix aggregate Javadoc typo
-    + Enable GH issues
-    + MJAVADOC-825: Prefer NullPointerExceptions for null arguments
-- Removed patches:
-  * 0001-Be-consistent-about-data-encoding-when-copying-files.patch
-  * 0002-Make-the-legacyMode-consistent-and-actually-useful.patch
-    + integrated in this version
-
--------------------------------------------------------------------
-Thu Jul 17 05:40:16 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Removed patch:
-  * 0003-reproducible-from-environment.patch
-    + We made the modification more central in maven-archiver
-
--------------------------------------------------------------------
-Tue Jul 15 11:40:44 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Modified patches:
-  * 0001-Be-consistent-about-data-encoding.patch ->
-    0001-Be-consistent-about-data-encoding-when-copying-files.patch
-    + Take the version of our PR that was integrated upstream
-  * 0003-reproducible-from-environment.patch
-    + Make the situation exactly the same as before if the
-      SOURCE_DATE_EPOCH is not set
-
--------------------------------------------------------------------
-Sat Jul 12 08:03:13 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Added patch:
-  * 0002-Make-the-legacyMode-consistent-and-actually-useful.patch
-    + fix the legacy mode so that is behaves really as javadoc 8
-      generation
-- Modified patches:
-  * stale-data-encoding.patch
-    --> 0001-Be-consistent-about-data-encoding.patch
-    + rebase and fix the coding style so that it corresponds to
-      our PR to the upstream project
-  * reproducible-from-environment.patch
-    --> 0003-reproducible-from-environment.patch
-    + rebase and make consistent with upstream coding style
-
--------------------------------------------------------------------
-Tue Jun  3 08:26:53 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Add dependency on objectweb-asm to build with sisu 0.9.0.M4
-
 -------------------------------------------------------------------
 Sun Dec  8 19:49:03 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

maven-javadoc-plugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-javadoc-plugin
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 %bcond_with bootstrap
 %endif
 %global base_name maven-javadoc-plugin
-Version:        3.11.3
+Version:        3.11.2
 Release:        0
 Summary:        Maven plugin for creating javadocs
 License:        Apache-2.0
@@ -32,6 +32,8 @@ URL:            https://maven.apache.org/plugins/maven-javadoc-plugin
 Source0:        %{base_name}-%{version}.tar.xz
 Source1:        %{base_name}-build.xml
 Patch0:         %{base_name}-bootstrap-resources.patch
+Patch1:         stale-data-encoding.patch
+Patch2:         reproducible-from-environment.patch
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
 BuildRequires:  apache-commons-text
@@ -54,7 +56,6 @@ BuildRequires:  maven-resolver-impl
 BuildRequires:  maven-resolver-util
 BuildRequires:  maven-shared-utils
 BuildRequires:  maven-wagon-provider-api
-BuildRequires:  objectweb-asm
 BuildRequires:  plexus-archiver
 BuildRequires:  plexus-interactivity-api
 BuildRequires:  plexus-io
@@ -113,6 +114,8 @@ API documentation for %{name}.
 cp %{SOURCE1} build.xml
 %patch -P 0 -p1
 %endif
+%patch -P 1 -p1
+%patch -P 2 -p1
 
 %pom_remove_dep :::test:
 
@@ -145,7 +148,6 @@ build-jar-repository -s lib \
     maven-reporting-api/maven-reporting-api \
     maven-shared-utils/maven-shared-utils \
     maven-wagon/provider-api \
-    objectweb-asm/asm \
     org.eclipse.sisu.inject \
     org.eclipse.sisu.plexus \
     plexus/archiver \

reproducible-from-environment.patch

@@ -0,0 +1,17 @@
+--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
++++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+@@ -2692,6 +2692,14 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
+     private String getBottomText() {
+         final String inceptionYear = project.getInceptionYear();
+ 
++        if ( outputTimestamp == null ||
++            outputTimestamp.length() < 1 ||
++            ( ( outputTimestamp.length() == 1 )
++                && !Character.isDigit( outputTimestamp.charAt(0) ) ) )
++        {
++            outputTimestamp = System.getenv("SOURCE_DATE_EPOCH");
++        }
++
+         // get Reproducible Builds outputTimestamp date value or the current local date.
+         final LocalDate localDate = MavenArchiver.parseBuildOutputTimestamp(outputTimestamp)
+                 .map(instant -> instant.atZone(ZoneOffset.UTC).toLocalDate())

stale-data-encoding.patch

@@ -0,0 +1,50 @@
+--- a/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
++++ b/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
+@@ -40,6 +40,19 @@ import org.codehaus.plexus.util.cli.Commandline;
+  */
+ public class StaleHelper {
+ 
++    private static Charset getDataCharset()
++    {
++        if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" )
++            && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
++        {
++            return StandardCharsets.UTF_8;
++        }
++        else
++        {
++            return Charset.defaultCharset();
++        }
++    }
++
+     /**
+      * Compute the data used to detect a stale javadoc
+      *
+@@ -55,13 +68,7 @@ public class StaleHelper {
+             String[] args = cmd.getArguments();
+             Collections.addAll(options, args);
+ 
+-            final Charset cs;
+-            if (JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast("9")
+-                    && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore("12")) {
+-                cs = StandardCharsets.UTF_8;
+-            } else {
+-                cs = Charset.defaultCharset();
+-            }
++            final Charset cs = getDataCharset();
+ 
+             for (String arg : args) {
+                 if (arg.startsWith("@")) {
+@@ -115,9 +122,11 @@ public class StaleHelper {
+      */
+     public static void writeStaleData(Commandline cmd, Path path) throws MavenReportException {
+         try {
++            final Charset cs = getDataCharset();
++
+             List<String> curdata = getStaleData(cmd);
+             Files.createDirectories(path.getParent());
+-            Files.write(path, curdata, StandardCharsets.UTF_8);
++            Files.write(path, curdata, cs);
+         } catch (IOException e) {
+             throw new MavenReportException("Error checking stale data", e);
+         }