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

0001-Port-to-current-plexus-utils.patch

@@ -1,43 +0,0 @@
-From 2da6ad1c0a941423490a74119966ea403f3ca246 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Fri, 29 Jun 2018 12:35:54 +0200
-Subject: [PATCH] Port to current plexus-utils
-
----
- .../maven/plugins/javadoc/JavadocUtil.java    | 20 +++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-index a740c6e..0fbf00c 100644
---- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-@@ -1178,14 +1178,18 @@ public class JavadocUtil
-         InvocationOutputHandler outputHandler = new PrintStreamHandler( ps, false );
-         request.setOutputHandler( outputHandler );
- 
--        outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with "
--            + ( properties == null ? "no properties" : "properties=" + properties ) );
--        outputHandler.consumeLine( "" );
--        outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) );
--        outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) );
--        outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) );
--        outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) );
--        outputHandler.consumeLine( "" );
-+        try {
-+            outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with "
-+                + ( properties == null ? "no properties" : "properties=" + properties ) );
-+            outputHandler.consumeLine( "" );
-+            outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) );
-+            outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) );
-+            outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) );
-+            outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) );
-+            outputHandler.consumeLine( "" );
-+        } catch (IOException e) {
-+            throw new MavenInvocationException("Failed to output lines", e);
-+        }
- 
-         try
-         {
--- 
-2.17.1
-

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

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

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

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

maven-javadoc-plugin-build.xml

@@ -14,12 +14,12 @@
             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.1.1"/>
+  <property name="project.version" value="3.3.1"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.1"/>
+  <property name="spec.version" value="3.3"/>
 
-  <property name="compiler.source" value="1.7"/>
+  <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -83,7 +83,7 @@
     </macrodef>
     <macrodef name="modello">
       <attribute name="file"/>
-      <attribute name="version" default="1.1.0"/>
+      <attribute name="version" default="1.1.1"/>
       <sequential>
         <echo taskname="modello" message="Generating sources for @{file}"/>
         <modello-single-mode file="@{file}" version="@{version}" mode="java"/>

maven-javadoc-plugin.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package maven-javadoc-plugin-bootstrap
+# spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 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.1.1
+Version:        3.3.1
 Release:        0
 Summary:        Maven plugin for creating javadocs
 License:        Apache-2.0
@@ -32,12 +32,10 @@ URL:            http://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:         0001-Port-to-current-plexus-utils.patch
-# PATCH-FIX-OPENSUSE bmwiedemann -- https://issues.apache.org/jira/browse/MJAVADOC-619
-Patch2:         reproducible-footer.patch
 BuildRequires:  apache-commons-cli
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
+BuildRequires:  apache-commons-text
 BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  google-guice
@@ -123,9 +121,6 @@ cp %{SOURCE1} build.xml
 %patch0 -p1
 %endif
 
-%patch1 -p1
-%patch2 -p1
-
 %pom_xpath_remove pom:project/pom:parent/pom:relativePath
 %pom_remove_dep :::test:
 
@@ -134,6 +129,7 @@ cp %{SOURCE1} build.xml
 mkdir -p lib
 build-jar-repository -s lib \
 	apache-commons-lang3 \
+	apache-commons-text \
 	atinject \
 	commons-cli \
 	commons-io \
@@ -181,7 +177,7 @@ build-jar-repository -s lib \
 xmvn --batch-mode --offline \
 	-Dmaven.test.skip=true -DmavenVersion=3.5.0 \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-	-Dmaven.compiler.release=7 \
+	-Dmaven.compiler.release=8 \
 %endif
 	package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
 %endif

reproducible-footer.patch

@@ -1,29 +0,0 @@
-https://salsa.debian.org/java-team/maven-javadoc-plugin/blob/master/debian/patches/reproducible-footer.patch
-for https://issues.apache.org/jira/browse/MJAVADOC-619
-
-Description: Use the SOURCE_DATE_EPOCH variable to set the current year displayed in the javadoc footer
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
---- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-@@ -2821,6 +2821,20 @@
-     private String getBottomText()
-     {
-         int currentYear = Calendar.getInstance().get( Calendar.YEAR );
-+        if ( System.getenv("SOURCE_DATE_EPOCH") != null )
-+        {
-+            try
-+            {
-+                Calendar calendar = Calendar.getInstance( java.util.TimeZone.getTimeZone("UTC") );
-+                calendar.setTimeInMillis(Long.parseLong( System.getenv("SOURCE_DATE_EPOCH") ) * 1000);
-+                currentYear = calendar.get( Calendar.YEAR );
-+            }
-+            catch (Exception e)
-+            {
-+                e.printStackTrace();
-+            }
-+        }
-+
-         String year = String.valueOf( currentYear );
- 
-         String inceptionYear = project.getInceptionYear();