Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-javadoc-plugin for
openSUSE:Factory checked in at 2023-09-20 13:31:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-javadoc-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-javadoc-plugin.new.16627 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-javadoc-plugin"
Wed Sep 20 13:31:35 2023 rev:11 rq:1112488 version:3.6.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-javadoc-plugin/maven-javadoc-plugin.changes
2022-10-26 12:31:29.520273989 +0200
+++
/work/SRC/openSUSE:Factory/.maven-javadoc-plugin.new.16627/maven-javadoc-plugin.changes
2023-09-20 13:35:26.632089165 +0200
@@ -1,0 +2,85 @@
+Wed Sep 20 07:04:26 UTC 2023 - Fridrich Strba <[email protected]>
+
+- Upgrade to upstream version 3.6.0
+ * Bug
+ + MJAVADOC-642: Setting maven.javadoc.isoffline seems to have no
+ effect
+ + MJAVADOC-701: javadoc site is broken for projects that contain
+ modules
+ + MJAVADOC-733: Alternative doclet page points to an SEO spammy
+ page
+ + MJAVADOC-742: [REGRESSION] Transitive dependencies of
+ docletArtifact missing
+ + MJAVADOC-757: Unresolvable link in javadoc tag with value
+ ResourcesBundleMojo#getAttachmentClassifier() found in
+ ResourcesBundleMojo
+ + MJAVADOC-758: IOException --> NullPointerException in
+ JavadocUtil.copyResource
+ + MJAVADOC-763: JavadocReportTest.testExceptions is broken
+ + MJAVADOC-767: javadoc creates invalid --patch-module
+ statements
+ + MJAVADOC-769: javadoc plugin can not deal with transitive
+ filename based modules
+ * Improvement
+ + MJAVADOC-755: Clean up deprecated and unpreferred methods in
+ JavadocUtil
+ + MJAVADOC-760: Cleanup dependency declarations as best possible
+ + MJAVADOC-770: Allow building javadoc "the old fashioned way"
+ after Java 8
+ * Task
+ + MJAVADOC-743: Drop use of deprecated localRepository mojo
+ parameter
+ + MJAVADOC-765: Make build pass with Java 20
+ + MJAVADOC-772: Refresh download page
+ * Dependency upgrade
+ + MJAVADOC-761: Update to commons-io 2.13.0
+ + MJAVADOC-766: Update plexus-archiver from 4.7.1 to 4.8.0
+ + MJAVADOC-771: Upgrade Parent to 40
+- Modified patches:
+ * maven-javadoc-plugin-bootstrap-resources.patch
+ + regenerate in cycle
+ * no-override.patch
+ * stale-data-encoding.patch
+ + rediff to changed line-endings
+
+-------------------------------------------------------------------
+Wed Sep 20 06:25:32 UTC 2023 - Fridrich Strba <[email protected]>
+
+- Upgrade to upstream version 3.5.0
+ * Bug
+ + MJAVADOC-696: Invalid anchors in Javadoc and plugin mojo
+ + MJAVADOC-700: Plugin duplicates classes in Java 8 all-classes
+ lists
+ + MJAVADOC-702: javadoc site creation ignores configuration
+ parameters
+ * Improvement
+ + MJAVADOC-685: Deprecate parameter "stylesheet"
+ + MJAVADOC-721: Parse stderr output and suppress informational
+ lines
+ + MJAVADOC-729: Link to Javadoc references from JDK 17
+ + MJAVADOC-731: Migrate components to JSR 330, get rid of
+ maven-artifact-transfer, update to parent 37
+ * Task
+ + MJAVADOC-712: Remove remains of org.codehaus.doxia.sink.Sink
+ * Dependency upgrade
+ + MJAVADOC-711: Upgrade plugins in ITs
+ + MJAVADOC-714: Upgrade to Maven 3.2.5
+ + MJAVADOC-719: Update Maven Archiver to 3.6.0
+ + MJAVADOC-723: Upgrade Maven Reporting API to 3.1.1/Complete
+ with Maven Reporting Impl 3.2.0
+ + MJAVADOC-738: Upgrade commons-text to 1.10.0
+ + MJAVADOC-740: Upgrade Parent to 39
+ + MJAVADOC-741: Upgrade plugins and components
+- Modified patches:
+ * maven-javadoc-plugin-bootstrap-resources.patch
+ + regenerate in cycle
+ * stale-data-encoding.patch
+ + rediff to changed context
+- Added patch:
+ * no-override.patch
+ + allow building with older version of maven-reporting-api
+- Removed patch:
+ * maven-javadoc-plugin-ioexception.patch
+ + not necessary with this version
+
+-------------------------------------------------------------------
Old:
----
maven-javadoc-plugin-3.3.2-source-release.zip
maven-javadoc-plugin-ioexception.patch
New:
----
maven-javadoc-plugin-3.6.0-source-release.zip
no-override.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-javadoc-plugin.spec ++++++
--- /var/tmp/diff_new_pack.COcpRY/_old 2023-09-20 13:35:28.988173574 +0200
+++ /var/tmp/diff_new_pack.COcpRY/_new 2023-09-20 13:35:28.992173717 +0200
@@ -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.6.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
@@ -47,7 +47,6 @@
BuildRequires: javapackages-local
BuildRequires: jdom2
BuildRequires: maven-archiver
-BuildRequires: maven-artifact-transfer
BuildRequires: maven-common-artifact-filters
BuildRequires: maven-doxia-core
BuildRequires: maven-doxia-logging-api
@@ -58,6 +57,8 @@
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 +95,7 @@
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
@@ -143,7 +145,6 @@
httpcomponents/httpcore \
jdom2/jdom2 \
maven-archiver/maven-archiver \
- maven-artifact-transfer/maven-artifact-transfer \
maven-common-artifact-filters/maven-common-artifact-filters \
maven-doxia/doxia-core \
maven-doxia/doxia-logging-api \
@@ -159,6 +160,8 @@
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 \
++++++ maven-javadoc-plugin-3.3.2-source-release.zip ->
maven-javadoc-plugin-3.6.0-source-release.zip ++++++
++++ 112629 lines of diff (skipped)
++++++ maven-javadoc-plugin-bootstrap-resources.patch ++++++
++++ 35394 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/maven-javadoc-plugin/maven-javadoc-plugin-bootstrap-resources.patch
++++ and
/work/SRC/openSUSE:Factory/.maven-javadoc-plugin.new.16627/maven-javadoc-plugin-bootstrap-resources.patch
++++++ maven-javadoc-plugin-build.xml ++++++
--- /var/tmp/diff_new_pack.COcpRY/_old 2023-09-20 13:35:29.928207251 +0200
+++ /var/tmp/diff_new_pack.COcpRY/_new 2023-09-20 13:35:29.928207251 +0200
@@ -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.6.0"/>
<property name="project.organization.name" value="The Apache Software
Foundation"/>
- <property name="spec.version" value="3.3"/>
+ <property name="spec.version" value="3.6"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
@@ -171,6 +171,28 @@
</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"
++++++ no-override.patch ++++++
---
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 ++++++
--- /var/tmp/diff_new_pack.COcpRY/_old 2023-09-20 13:35:29.960208398 +0200
+++ /var/tmp/diff_new_pack.COcpRY/_new 2023-09-20 13:35:29.960208398 +0200
@@ -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.3.2/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
2022-03-14 07:46:55.466835949 +0100
-@@ -43,6 +43,19 @@
- public class StaleHelper
- {
+---
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.5.0/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
2023-09-14 14:25:18.258705774 +0200
+@@ -41,6 +41,19 @@
+ */
+ public class StaleHelper {
+ private static Charset getDataCharset()
+ {
@@ -20,35 +20,34 @@
/**
* 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" )
-- && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
-- {
+- if (JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast("9")
+- && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore("12"))
{
- cs = StandardCharsets.UTF_8;
-- }
-- else
-- {
+- } else {
- cs = Charset.defaultCharset();
- }
+ final Charset cs = getDataCharset();
-
- for ( String arg : args )
- {
-@@ -141,9 +145,11 @@
- {
- try
- {
+
+ for (String arg : args) {
+ if (arg.startsWith("@")) {
+@@ -116,9 +123,11 @@
+ */
+ public static void writeStaleData(Commandline cmd, Path path) throws
MavenReportException {
+ try {
+ final Charset cs = getDataCharset();
-+
- String curdata = getStaleData( cmd );
- Files.createDirectories( path.getParent() );
-- Files.write( path, Collections.singleton( curdata ),
Charset.defaultCharset() );
-+ Files.write( path, Collections.singleton( curdata ), cs);
++
+ String curdata = getStaleData(cmd);
+ Files.createDirectories(path.getParent());
+- Files.write(path, Collections.singleton(curdata),
Charset.defaultCharset());
++ 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
