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 2026-09-07 11:30:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-javadoc-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-javadoc-plugin.new.1265 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-javadoc-plugin"
Mon Sep 7 11:30:47 2026 rev:26 rq:1375930 version:3.12.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-javadoc-plugin/maven-javadoc-plugin.changes
2025-10-22 12:19:32.271693800 +0200
+++
/work/SRC/openSUSE:Factory/.maven-javadoc-plugin.new.1265/maven-javadoc-plugin.changes
2026-09-07 11:32:58.993680804 +0200
@@ -1,0 +2,28 @@
+Sat Sep 5 12:04:11 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Added patch:
+ * 0001-Consider-empty-release-and-source-strings-as-null.patch
+ + Normally, <maven.compiler.release/> and
+ <maven.compiler.source/> are used to actually override the
+ variables from parents. And themaven-compiler-plugin considers
+ them as such. However, maven-javadoc-plugin appends an empty
+ --release "" which results in errors like "-author is not a
+ valid release number"...
+
+-------------------------------------------------------------------
+Fri Sep 4 11:18:14 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Do not build the bootstrap plugin, build the non-bootstrap version
+ using ant and generating the HelpMojo.java and the plugin
+ descriptors by an execution of maven-plugin-plugin goals outside
+ of maven lifecycle
+
+-------------------------------------------------------------------
+Wed Sep 2 13:26:02 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Removed patch:
+ * maven-javadoc-plugin-bootstrap-resources.patch
+ + use the new standalone plugin descriptor generator for
+ the bootstrap build
+
+-------------------------------------------------------------------
Old:
----
_multibuild
maven-javadoc-plugin-bootstrap-resources.patch
New:
----
0001-Consider-empty-release-and-source-strings-as-null.patch
----------(Old B)----------
Old:- Removed patch:
* maven-javadoc-plugin-bootstrap-resources.patch
+ use the new standalone plugin descriptor generator for
----------(Old E)----------
----------(New B)----------
New:- Added patch:
* 0001-Consider-empty-release-and-source-strings-as-null.patch
+ Normally, <maven.compiler.release/> and
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-javadoc-plugin.spec ++++++
--- /var/tmp/diff_new_pack.Gx8peg/_old 2026-09-07 11:32:59.762707749 +0200
+++ /var/tmp/diff_new_pack.Gx8peg/_new 2026-09-07 11:32:59.765707854 +0200
@@ -1,7 +1,7 @@
#
# spec file for package maven-javadoc-plugin
#
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2026 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,23 +16,18 @@
#
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "bootstrap"
-%bcond_without bootstrap
-%else
-%bcond_with bootstrap
-%endif
-%global base_name maven-javadoc-plugin
+Name: maven-javadoc-plugin
Version: 3.12.0
Release: 0
Summary: Maven plugin for creating javadocs
License: Apache-2.0
Group: Development/Libraries/Java
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
+Source0: %{name}-%{version}.tar.xz
+Source1: %{name}-build.xml
+Patch0: 0001-Consider-empty-release-and-source-strings-as-null.patch
Patch1: expected-encoding.patch
+BuildRequires: ant
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3
BuildRequires: apache-commons-text
@@ -48,6 +43,7 @@
BuildRequires: maven-invoker
BuildRequires: maven-lib
BuildRequires: maven-plugin-annotations
+BuildRequires: maven-plugin-plugin
BuildRequires: maven-reporting-api
BuildRequires: maven-reporting-impl
BuildRequires: maven-resolver-api
@@ -55,6 +51,7 @@
BuildRequires: maven-resolver-util
BuildRequires: maven-shared-utils
BuildRequires: maven-wagon-provider-api
+BuildRequires: modello >= 2.0.0
BuildRequires: objectweb-asm
BuildRequires: plexus-archiver
BuildRequires: plexus-interactivity-api
@@ -68,32 +65,11 @@
BuildRequires: slf4j
BuildRequires: unzip
BuildRequires: xmvn-install
+BuildRequires: xmvn-minimal
BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) >= 40
+Obsoletes: %{name}-bootstrap
BuildArch: noarch
-%if %{with bootstrap}
-Name: %{base_name}-bootstrap
-BuildRequires: ant
-BuildRequires: modello >= 2.0.0
-%else
-Name: %{base_name}
-BuildRequires: xmvn
-BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-jar-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
-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.eclipse.sisu:sisu-maven-plugin)
-Obsoletes: %{base_name}-bootstrap
-#!BuildRequires: maven-compiler-plugin-bootstrap
-#!BuildRequires: maven-jar-plugin-bootstrap
-#!BuildRequires: maven-javadoc-plugin-bootstrap
-#!BuildRequires: maven-plugin-plugin-bootstrap
-#!BuildRequires: maven-resources-plugin-bootstrap
-#!BuildRequires: maven-surefire-plugin-bootstrap
-%endif
%description
The Maven Javadoc Plugin is a plugin that uses the javadoc tool for
@@ -109,17 +85,14 @@
%endif
%prep
-%setup -q -n %{base_name}-%{version}
-%if %{with bootstrap}
+%setup -q
cp %{SOURCE1} build.xml
%patch -P 0 -p1
-%endif
%patch -P 1 -p1
%pom_remove_dep :::test:
%build
-%if %{with bootstrap}
mkdir -p lib
build-jar-repository -s lib \
apache-commons-lang3 \
@@ -151,6 +124,7 @@
org.eclipse.sisu.inject \
org.eclipse.sisu.plexus \
plexus/archiver \
+ plexus-classworlds \
plexus/interactivity-api \
plexus/io \
plexus-languages/plexus-java \
@@ -158,17 +132,9 @@
plexus/xml \
qdox \
slf4j/api
-ant -Dtest.skip=true jar
-%else
-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=8 \
-%endif
- package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
-%endif
+ant -Dtest.skip=true jar javadoc
-%{mvn_artifact} pom.xml target/%{base_name}-%{version}.jar
+%{mvn_artifact} pom.xml target/%{name}-%{version}.jar
%install
%mvn_install
@@ -176,7 +142,5 @@
%files -f .mfiles
-%if %{without bootstrap}
%files javadoc -f .mfiles-javadoc
-%endif
++++++ 0001-Consider-empty-release-and-source-strings-as-null.patch ++++++
>From a5e0189fde417eb4712dec5876bd78bf92eb8d9d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <[email protected]>
Date: Sat, 5 Sep 2026 13:56:36 +0200
Subject: [PATCH] Consider empty release and source strings as null
Normally, <maven.compiler.release/> and <maven.compiler.source/>
are used to actually override the variables from parents. And the
maven-compiler-plugin considers them as such. However,
maven-javadoc-plugin appends an empty --release "" which results
in things like "-author is not a valid release number"...
---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index a4350365..79bdf40c 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -2099,9 +2099,9 @@ public abstract class AbstractJavadocMojo extends
AbstractMojo {
// or source values specified
boolean autoExclude = legacyMode;
if (!autoExclude) {
- if (release != null) {
+ if (release != null && !release.trim().isEmpty()) {
autoExclude = JavaVersion.parse(release).isBefore("9");
- } else if (source != null) {
+ } else if (source != null && !source.trim().isEmpty()) {
autoExclude = JavaVersion.parse(source).isBefore("9");
}
}
@@ -4334,9 +4334,9 @@ public abstract class AbstractJavadocMojo extends
AbstractMojo {
if (supportModulePath) {
supportModulePath &= javadocRuntimeVersion.isAtLeast("9");
- if (release != null) {
+ if (release != null && !release.trim().isEmpty()) {
supportModulePath &= JavaVersion.parse(release).isAtLeast("9");
- } else if (source != null) {
+ } else if (source != null && !source.trim().isEmpty()) {
supportModulePath &= JavaVersion.parse(source).isAtLeast("9");
}
}
@@ -4579,7 +4579,7 @@ public abstract class AbstractJavadocMojo extends
AbstractMojo {
addArgIf(arguments, quiet, "-quiet");
- if (javadocRuntimeVersion.isAtLeast("9") && release != null) {
+ if (javadocRuntimeVersion.isAtLeast("9") && release != null &&
!release.trim().isEmpty()) {
arguments.add("--release");
arguments.add(release);
} else {
@@ -5509,9 +5509,9 @@ public abstract class AbstractJavadocMojo extends
AbstractMojo {
}
final JavaVersion javaApiversion;
- if (release != null) {
+ if (release != null && !release.trim().isEmpty()) {
javaApiversion = JavaVersion.parse(release);
- } else if (source != null && !source.isEmpty()) {
+ } else if (source != null && !source.trim().isEmpty()) {
javaApiversion = JavaVersion.parse(source);
} else {
final String pluginId =
"org.apache.maven.plugins:maven-compiler-plugin";
--
2.55.0
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.Gx8peg/_old 2026-09-07 11:32:59.835710307 +0200
+++ /var/tmp/diff_new_pack.Gx8peg/_new 2026-09-07 11:32:59.842710552 +0200
@@ -1,6 +1,6 @@
-mtime: 1760772506
-commit: 8a5288c33f02d67914c37be879e7ebd6ab64e1e2f4fe7e34b6a949fb8b6f263f
-url: https://src.opensuse.org/java-packages/maven-javadoc-plugin.git
-revision: 8a5288c33f02d67914c37be879e7ebd6ab64e1e2f4fe7e34b6a949fb8b6f263f
+mtime: 1788610363
+commit: 586c905e08c0219371f8f6a7697431d55350d1c0e1de7e720d78faffe2570e05
+url: https://src.opensuse.org/java-packages/maven-javadoc-plugin
+revision: 586c905e08c0219371f8f6a7697431d55350d1c0e1de7e720d78faffe2570e05
projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj
++++++ build.specials.obscpio ++++++
++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore 2026-09-05 14:12:43.000000000 +0200
@@ -0,0 +1 @@
+.osc
++++++ maven-javadoc-plugin-build.xml ++++++
--- /var/tmp/diff_new_pack.Gx8peg/_old 2026-09-07 11:33:00.072718612 +0200
+++ /var/tmp/diff_new_pack.Gx8peg/_new 2026-09-07 11:33:00.077718787 +0200
@@ -9,9 +9,6 @@
<property file="build.properties"/>
<property name="project.name" value="Apache Maven Javadoc Plugin"/>
- <!-- not used in this build.xml file, but used for filtering the bootstrap
resources -->
- <property name="project.description"
- 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.12.0"/>
@@ -96,10 +93,22 @@
</target>
<!-- ======================================================================
-->
+ <!-- HelpMojo.java generation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="helpmojo" description="Generate the HelpMojo.java">
+ <exec executable="xmvn" failonerror="true">
+ <arg value="--batch-mode" />
+ <arg value="--offline" />
+ <arg value="org.apache.maven.plugins:maven-plugin-plugin:helpmojo" />
+ </exec>
+ </target>
+
+ <!-- ======================================================================
-->
<!-- Compilation target
-->
<!-- ======================================================================
-->
- <target name="compile" depends="mdo" description="Compile the code">
+ <target name="compile" depends="mdo,helpmojo" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
nowarn="false"
@@ -114,26 +123,13 @@
<src>
<pathelement location="${build.srcDir}"/>
<pathelement location="${build.mdoOutputDir}"/>
+ <pathelement location="${build.dir}/generated-sources/plugin"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir}"/>
</copy>
- <copy todir="${build.outputDir}">
- <fileset dir="${build.filteredResourceDir}"/>
- <filterchain>
- <expandproperties>
- <propertyset>
- <propertyref name="project.name"/>
- <propertyref name="project.version"/>
- <propertyref name="project.groupId"/>
- <propertyref name="project.artifactId"/>
- <propertyref name="project.description"/>
- </propertyset>
- </expandproperties>
- </filterchain>
- </copy>
<mkdir
dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/>
<propertyfile
file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties">
<entry key="artifactId" value="${project.artifactId}"/>
@@ -166,6 +162,18 @@
</target>
<!-- ======================================================================
-->
+ <!-- Plugin descriptor generation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="plugin" depends="compile" description="Generate plugin
descriptors">
+ <exec executable="xmvn" failonerror="true">
+ <arg value="--batch-mode" />
+ <arg value="--offline" />
+ <arg value="org.apache.maven.plugins:maven-plugin-plugin:descriptor" />
+ </exec>
+ </target>
+
+ <!-- ======================================================================
-->
<!-- Test-compilation target
-->
<!-- ======================================================================
-->
@@ -264,10 +272,11 @@
<!-- Javadoc target
-->
<!-- ======================================================================
-->
- <target name="javadoc" depends="mdo" description="Generates the Javadoc of
the application">
+ <target name="javadoc" depends="mdo,helpmojo" description="Generates the
Javadoc of the application">
<path id="src.path">
<pathelement location="${build.srcDir}"/>
<pathelement location="${build.mdoOutputDir}"/>
+ <pathelement location="${build.dir}/generated-sources/plugin"/>
</path>
<javadoc sourcepathref="src.path"
packagenames="*"
@@ -298,7 +307,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="sisu,test" description="Package the
application">
+ <target name="package" depends="plugin,sisu,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
