OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-javadoc-plugin?expand=0&rev=40

maven-javadoc-plugin-3.3.2-source-release.zip

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

maven-javadoc-plugin-3.5.0-source-release.zip

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

maven-javadoc-plugin-build.xml

@@ -14,10 +14,10 @@
             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.3.2"/>
+  <property name="project.version" value="3.5.0"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.3"/>
+  <property name="spec.version" value="3.5"/>
 
   <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
@@ -170,6 +170,28 @@
     </java>
   </target>
 
+  <!-- ====================================================================== -->
+  <!-- Sisu javax.inject.Named generation target                              -->
+  <!-- ====================================================================== -->
+
+  <target name="sisu"
+          depends="compile"
+          description="Generate javax.inject.Name index">
+    <sequential>
+	  <java classname="org.eclipse.sisu.space.SisuIndex"
+	        failonerror="true"
+			fork="true">
+        <classpath>
+          <path refid="build.classpath"/>
+        </classpath>
+        <arg value="${build.outputDir}"/>
+      </java>
+      <move todir="${build.outputDir}/META-INF">
+        <fileset dir="META-INF"/>
+      </move>
+	</sequential>
+  </target>
+
   <!-- ====================================================================== -->
   <!-- Test-compilation target                                                -->
   <!-- ====================================================================== -->
@@ -333,7 +355,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="plexus,test" description="Package the application">
+  <target name="package" depends="sisu,plexus,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"

maven-javadoc-plugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,17 +23,17 @@
 %bcond_with bootstrap
 %endif
 %global base_name maven-javadoc-plugin
-Version:        3.3.2
+Version:        3.5.0
 Release:        0
 Summary:        Maven plugin for creating javadocs
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/plugins/maven-javadoc-plugin
+URL:            https://maven.apache.org/plugins/maven-javadoc-plugin
 Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
 Source1:        %{base_name}-build.xml
 Patch0:         %{base_name}-bootstrap-resources.patch
 Patch1:         stale-data-encoding.patch
-Patch2:         maven-javadoc-plugin-ioexception.patch
+Patch2:         no-override.patch
 BuildRequires:  apache-commons-cli
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
@@ -58,6 +58,8 @@ BuildRequires:  maven-invoker
 BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
 BuildRequires:  maven-reporting-api >= 3.1.0
+BuildRequires:  maven-resolver-api
+BuildRequires:  maven-resolver-util
 BuildRequires:  maven-shared-utils
 BuildRequires:  maven-wagon-provider-api
 BuildRequires:  objectweb-asm
@@ -94,6 +96,7 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-resources-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-surefire-plugin)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 Obsoletes:      %{base_name}-bootstrap
 #!BuildRequires: maven-compiler-plugin-bootstrap
 #!BuildRequires: maven-jar-plugin-bootstrap
@@ -159,6 +162,8 @@ build-jar-repository -s lib \
 	maven/maven-plugin-api \
 	maven/maven-settings \
 	maven-plugin-tools/maven-plugin-annotations \
+    maven-resolver/maven-resolver-api \
+    maven-resolver/maven-resolver-util \
 	maven-reporting-api/maven-reporting-api \
 	maven-shared-utils/maven-shared-utils \
 	maven-wagon/provider-api \

no-override.patch

@@ -0,0 +1,10 @@
+--- maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java	2023-09-14 14:27:44.286360008 +0200
++++ maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java	2023-09-14 14:34:08.848960654 +0200
+@@ -118,7 +118,6 @@
+     }
+ 
+     /** {@inheritDoc} */
+-    @Override
+     public void generate(org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException {
+         generate(sink, null, locale);
+     }

stale-data-encoding.patch

@@ -1,8 +1,8 @@
---- maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java	2022-02-07 20:52:42.000000000 +0100
+--- maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java	2023-09-14 14:20:14.049981880 +0200
-+++ maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java	2022-03-14 07:46:55.466835949 +0100
++++ maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java	2023-09-14 14:25:18.258705774 +0200
-@@ -43,6 +43,19 @@
+@@ -41,6 +41,19 @@
- public class StaleHelper
+  */
- {
+ public class StaleHelper {
  
 +    private static Charset getDataCharset()
 +    {
@@ -20,34 +20,33 @@
      /**
       * Compute the data used to detect a stale javadoc
       *
-@@ -61,16 +74,7 @@
+@@ -56,13 +69,7 @@
              String[] args = cmd.getArguments();
-             Collections.addAll( options, args );
+             Collections.addAll(options, args);
-             
+ 
 -            final Charset cs;
--            if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" )
+-            if (JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast("9")
--                && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
+-                    && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore("12")) {
--            {
 -                cs = StandardCharsets.UTF_8;
--            }
+-            } else {
--            else
--            {
 -                cs = Charset.defaultCharset();
 -            }
 +            final Charset cs = getDataCharset();
-             
+ 
-             for ( String arg : args )
+             for (String arg : args) {
-             {
+                 if (arg.startsWith("@")) {
-@@ -141,9 +145,11 @@
+@@ -116,9 +123,11 @@
-     {
+      */
-         try
+     public static void writeStaleData(Commandline cmd, Path path) throws MavenReportException {
-         {
+         try {
 +            final Charset cs = getDataCharset();
-+            
++
-             String curdata = getStaleData( cmd );
+             String curdata = getStaleData(cmd);
-             Files.createDirectories( path.getParent() );
+             Files.createDirectories(path.getParent());
--            Files.write( path, Collections.singleton( curdata ), Charset.defaultCharset() );
+-            Files.write(path, Collections.singleton(curdata), Charset.defaultCharset());
-+            Files.write( path, Collections.singleton( curdata ), cs);
++            Files.write(path, Collections.singleton(curdata), cs);
+         } catch (IOException e) {
+             throw new MavenReportException("Error checking stale data", e);
          }
-         catch ( IOException e )
+Only in maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc: StaleHelper.java.orig
-         {
+Only in maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc: StaleHelper.java.rej