forked from pool/maven-javadoc-plugin
Compare commits
25 Commits
Author | SHA256 | Date | |
---|---|---|---|
72670980ac | |||
2faf59ff75 | |||
f125c3d4c2 | |||
aca051d3cb | |||
a7a7f3ba5f | |||
db6efdb020 | |||
30c2b5789a | |||
74ec0e37b7 | |||
449ee971c5 | |||
8a19e5fd0a | |||
01702e7d0e | |||
00bc2930c6 | |||
2e72ce1928 | |||
c3ac7d526a | |||
09a0ed68a9 | |||
6a317bd530 | |||
06f1423e15 | |||
1c69fd2eb4 | |||
54dcffc152 | |||
0cfa9367cd | |||
9ab5f70a65 | |||
b9bcdc8c60 | |||
26089ed5b5 | |||
266f28b837 | |||
a590f14c39 |
@@ -0,0 +1,67 @@
|
||||
From 33c9f01af9a3d4d28decbabd0bc02c4b3a875c2d Mon Sep 17 00:00:00 2001
|
||||
From: Fridrich Strba <fridrich@users.noreply.github.com>
|
||||
Date: Tue, 15 Jul 2025 02:23:18 +0200
|
||||
Subject: [PATCH 1/3] Be consistent about data encoding when copying files
|
||||
(#1215)
|
||||
|
||||
---
|
||||
.../maven/plugins/javadoc/StaleHelper.java | 26 ++++++++++++-------
|
||||
1 file changed, 16 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java b/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
|
||||
index aabe9840..7517d0fb 100644
|
||||
--- 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,20 @@ import org.codehaus.plexus.util.cli.Commandline;
|
||||
*/
|
||||
public class StaleHelper {
|
||||
|
||||
+ /**
|
||||
+ * Compute the encoding of the stale javadoc
|
||||
+ *
|
||||
+ * @return the the encoding of the stale data
|
||||
+ */
|
||||
+ 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,18 +69,10 @@ 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();
|
||||
- }
|
||||
-
|
||||
for (String arg : args) {
|
||||
if (arg.startsWith("@")) {
|
||||
String name = arg.substring(1);
|
||||
- options.addAll(Files.readAllLines(dir.resolve(name), cs));
|
||||
+ options.addAll(Files.readAllLines(dir.resolve(name), getDataCharset()));
|
||||
ignored.add(name);
|
||||
}
|
||||
}
|
||||
@@ -117,7 +123,7 @@ public class StaleHelper {
|
||||
try {
|
||||
List<String> curdata = getStaleData(cmd);
|
||||
Files.createDirectories(path.getParent());
|
||||
- Files.write(path, curdata, StandardCharsets.UTF_8);
|
||||
+ Files.write(path, curdata, getDataCharset());
|
||||
} catch (IOException e) {
|
||||
throw new MavenReportException("Error checking stale data", e);
|
||||
}
|
||||
--
|
||||
2.50.1
|
||||
|
@@ -0,0 +1,78 @@
|
||||
From 6535af41fdb17f29df87194c12f7dc725990f647 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||
Date: Sat, 12 Jul 2025 09:48:17 +0200
|
||||
Subject: [PATCH 2/3] Make the legacyMode consistent and actually useful
|
||||
|
||||
* Filter out all of the module-info.java files in legacy mode
|
||||
* Do not use --source-path in legacy mode as not to suck any
|
||||
of those module-info.java files back
|
||||
* Generate the javadoc from list of files and not list of
|
||||
packages, which is not working if --source-path is not
|
||||
specified
|
||||
---
|
||||
.../plugins/javadoc/AbstractJavadocMojo.java | 29 ++++++++++---------
|
||||
1 file changed, 16 insertions(+), 13 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 42a20b9d..2c258c7e 100644
|
||||
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
|
||||
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
|
||||
@@ -2022,7 +2022,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
|
||||
getLog().warn("sourceFileIncludes and sourceFileExcludes have no effect when subpackages are specified!");
|
||||
includesExcludesActive = false;
|
||||
}
|
||||
- if (!packageNames.isEmpty() && !includesExcludesActive) {
|
||||
+ if (!packageNames.isEmpty() && !includesExcludesActive && !legacyMode) {
|
||||
addCommandLinePackages(cmd, javadocOutputDirectory, packageNames);
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
@@ -2093,23 +2093,26 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
|
||||
if (subpackages == null || subpackages.isEmpty()) {
|
||||
Collection<String> excludedPackages = getExcludedPackages();
|
||||
|
||||
- final boolean autoExclude;
|
||||
- if (release != null) {
|
||||
- autoExclude = JavaVersion.parse(release).isBefore("9");
|
||||
- } else if (source != null) {
|
||||
- autoExclude = JavaVersion.parse(source).isBefore("9");
|
||||
- } else {
|
||||
- // if legacy mode is active, treat it like pre-Java 9 (exclude module-info),
|
||||
- // otherwise don't auto-exclude anything.
|
||||
- autoExclude = legacyMode;
|
||||
+ // if legacy mode is active, treat it like pre-Java 9 (exclude module-info),
|
||||
+ // otherwise don't auto-exclude anything. Do this regardless of the release
|
||||
+ // or source values specified
|
||||
+ boolean autoExclude = legacyMode;
|
||||
+ if (!autoExclude) {
|
||||
+ if (release != null) {
|
||||
+ autoExclude = JavaVersion.parse(release).isBefore("9");
|
||||
+ } else if (source != null) {
|
||||
+ autoExclude = JavaVersion.parse(source).isBefore("9");
|
||||
+ }
|
||||
}
|
||||
|
||||
for (Path sourcePath : sourcePaths) {
|
||||
File sourceDirectory = sourcePath.toFile();
|
||||
- List<String> files = new ArrayList<>(JavadocUtil.getFilesFromSource(
|
||||
+ ArrayList<String> files = new ArrayList<>(JavadocUtil.getFilesFromSource(
|
||||
sourceDirectory, sourceFileIncludes, sourceFileExcludes, excludedPackages));
|
||||
|
||||
- if (autoExclude && files.remove("module-info.java")) {
|
||||
+ // in the aggregate goal (and theoretically in others too), there can be
|
||||
+ // more then one module-info.java. Filter out all of them.
|
||||
+ if (autoExclude && files.removeIf(s -> s.endsWith("module-info.java"))) {
|
||||
getLog().debug("Auto exclude module-info.java due to source value");
|
||||
}
|
||||
mappedFiles.put(sourcePath, files);
|
||||
@@ -4603,7 +4606,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
|
||||
}
|
||||
|
||||
if (moduleSourceDir == null) {
|
||||
- if (!disableSourcepathUsage) {
|
||||
+ if (!disableSourcepathUsage && !legacyMode) {
|
||||
addArgIfNotEmpty(
|
||||
arguments,
|
||||
"-sourcepath",
|
||||
--
|
||||
2.50.0
|
||||
|
15
_service
Normal file
15
_service
Normal file
@@ -0,0 +1,15 @@
|
||||
<services>
|
||||
<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.2</param>
|
||||
<param name="match-tag">maven-javadoc-plugin-*</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">maven-javadoc-plugin-(.*)</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
</services>
|
BIN
maven-javadoc-plugin-3.11.2.tar.xz
(Stored with Git LFS)
Normal file
BIN
maven-javadoc-plugin-3.11.2.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
maven-javadoc-plugin-3.6.0-source-release.zip
(Stored with Git LFS)
BIN
maven-javadoc-plugin-3.6.0-source-release.zip
(Stored with Git LFS)
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -14,12 +14,13 @@
|
||||
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.6.0"/>
|
||||
<property name="project.version" value="3.11.2"/>
|
||||
<property name="project.organization.name" value="The Apache Software Foundation"/>
|
||||
|
||||
<property name="spec.version" value="3.6"/>
|
||||
<property name="spec.version" value="3.11"/>
|
||||
|
||||
<property name="compiler.source" value="1.8"/>
|
||||
<property name="compiler.release" value="8"/>
|
||||
<property name="compiler.source" value="1.${compiler.release}"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
|
||||
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
|
||||
|
@@ -1,3 +1,174 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Upgrade to upstream version 3.11.2
|
||||
* New Feature
|
||||
+ MJAVADOC-814: Ability to split grouped packages over multiple
|
||||
lines
|
||||
* Improvement
|
||||
+ MJAVADOC-823: legacyMode keeps using module-info.java
|
||||
(-sourcedirectory still use as well as java files input)
|
||||
* Task
|
||||
+ MJAVADOC-822: parameter skippedModules should scale and easier
|
||||
to use
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 4 10:11:17 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream version 3.11.1
|
||||
- Version 3.11.1
|
||||
* Bug
|
||||
+ MJAVADOC-820: [REGRESSION] MJAVADOC-787 was merged
|
||||
incompletely
|
||||
* New Feature
|
||||
+ MJAVADOC-787: Automatic detection of release option for
|
||||
JDK < 9
|
||||
* Task
|
||||
+ MJAVADOC-819: Align archive generation code with Maven Source
|
||||
Plugin
|
||||
+ MJAVADOC-821: Align toolchain discovery code with Maven
|
||||
Compiler Plugin
|
||||
* Dependency upgrade
|
||||
+ MJAVADOC-816: Bump org.codehaus.plexus:plexus-java from
|
||||
1.2.0 to 1.3.0
|
||||
+ MJAVADOC-817: Upgrade to Doxia 2.0.0 GA Stack
|
||||
- Modified patches:
|
||||
* maven-javadoc-plugin-bootstrap-resources.patch
|
||||
+ Regenerate from non-bootstrap build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 3 22:19:41 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream version 3.10.1
|
||||
- Version 3.10.1
|
||||
* Bug
|
||||
+ MJAVADOC-810: [REGRESSION] MJAVADOC-791 causes forked Maven
|
||||
execution fail if any toolchains or settings file isn't
|
||||
present
|
||||
+ MJAVADOC-811: javadoc.bat fails to execute on Windows when
|
||||
project is not on drive C and AutoRun is configured
|
||||
+ MJAVADOC-812: [REGRESSION] maven-javadoc-plugin 3.10.0 creates
|
||||
empty JARs
|
||||
- Version 3.10.0
|
||||
* Bug
|
||||
+ MJAVADOC-560: Clarify outputDirectory, reportOutputDirectory
|
||||
in javadoc:javadoc documentation
|
||||
* Task
|
||||
+ MJAVADOC-776: Plugin depends on plexus-container-default,
|
||||
which is EOL
|
||||
+ MJAVADOC-785: Align plugin implementation with
|
||||
AbstractMavenReport (maven-reporting-impl)
|
||||
+ MJAVADOC-807: Simplify IT for MJAVADOC-498
|
||||
+ MJAVADOC-809: Align Mojo class names
|
||||
- Version 3.8.0
|
||||
* Bug
|
||||
+ MJAVADOC-603: javadoc:fix failure on JDK10:
|
||||
java.lang.ClassNotFoundException: java.sql.Connection
|
||||
+ MJAVADOC-751: No warnings for localized output
|
||||
+ MJAVADOC-775: Option 'taglets/taglet/tagletpath' ignored when
|
||||
pointing to a JAR
|
||||
+ MJAVADOC-783: Invalid path when using TagletArtifact and
|
||||
TagletPath
|
||||
+ MJAVADOC-791: maven-javadoc-plugin not working correctly
|
||||
together with maven-toolchains-plugin
|
||||
* Improvement
|
||||
+ MJAVADOC-796: Do not follow links for Java 12+
|
||||
+ MJAVADOC-798: Consider passing user settings when using
|
||||
invoker
|
||||
+ MJAVADOC-802: Set default value of defaultAuthor parameter
|
||||
in fix goals to ${user.name}
|
||||
+ MJAVADOC-803: Add default parameter to force root locale
|
||||
* Test
|
||||
+ MJAVADOC-804: Temporary files are left after test execution
|
||||
* Task
|
||||
+ MJAVADOC-799: Remove inconsistent
|
||||
'AbstractFixJavadocMojo#defaultVersion' default value
|
||||
- Version 3.7.0
|
||||
* Bug
|
||||
+ MJAVADOC-793: java.lang.NullPointerException: Cannot invoke
|
||||
"String.length()" because "text" is null
|
||||
- Version 3.6.3
|
||||
* Bug
|
||||
+ MJAVADOC-682: Reactor builds fail when multiple modules with
|
||||
same groupId:artifactId, but different versions
|
||||
+ MJAVADOC-780: Unit tests create null-null.jar in build root
|
||||
directory
|
||||
* Improvement
|
||||
+ MJAVADOC-779: Upgrade maven-plugin parent to 41
|
||||
* Task
|
||||
+ MJAVADOC-782: Align read-only parameters naming with other
|
||||
plugins
|
||||
- Version 3.6.2
|
||||
* Bug
|
||||
+ MJAVADOC-713: Skipping Javadoc reportset leaves empty Javadoc
|
||||
link in site
|
||||
+ MJAVADOC-716: The stale file detection does not work
|
||||
+ MJAVADOC-726: Maven Java Doc Plugin downloads Log4j-1.2.12
|
||||
dependency transitively
|
||||
+ MJAVADOC-762: createTestRepo in JavaDocReportTest shares state
|
||||
+ MJAVADOC-774: 3.6.0 release is not reproducible
|
||||
* Improvement
|
||||
+ MJAVADOC-730: Deprecate parameter "old"
|
||||
- Removed patches:
|
||||
* no-override.patch
|
||||
+ not needed with this version
|
||||
- Modified patches:
|
||||
* maven-javadoc-plugin-bootstrap-resources.patch
|
||||
+ Regenerate using maven-plugin-plugin 3.15 from non-bootstrap
|
||||
build
|
||||
* reproducible-from-environment.patch
|
||||
* stale-data-encoding.patch
|
||||
+ adapt to changed context
|
||||
- Fetch sources from Github using source service
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 24 15:00:28 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* reproducible-from-environment.patch
|
||||
+ SOURCE_DATE_EPOCH environmental variable triggers reproducible
|
||||
use of the maven-javadoc-plugin if it is not requested already
|
||||
using the project.build.outputTimestamp option.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 10 16:33:19 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
@@ -114,7 +285,7 @@ Tue Oct 25 14:16:58 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
* maven-javadoc-plugin-ioexception.patch
|
||||
+ allow building with wider range of plexus-utils versions,
|
||||
including the 3.5.0 that does not declare IOException as
|
||||
thrown in functions where it is actually not thrown.
|
||||
thrown in functions where it is actually not thrown.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 13 09:41:52 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package maven-javadoc-plugin
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 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,18 @@
|
||||
%bcond_with bootstrap
|
||||
%endif
|
||||
%global base_name maven-javadoc-plugin
|
||||
Version: 3.6.0
|
||||
Version: 3.11.2
|
||||
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: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
|
||||
Source0: %{base_name}-%{version}.tar.xz
|
||||
Source1: %{base_name}-build.xml
|
||||
Patch0: %{base_name}-bootstrap-resources.patch
|
||||
Patch1: stale-data-encoding.patch
|
||||
Patch2: no-override.patch
|
||||
Patch1: 0001-Be-consistent-about-data-encoding-when-copying-files.patch
|
||||
Patch2: 0002-Make-the-legacyMode-consistent-and-actually-useful.patch
|
||||
BuildRequires: apache-commons-io
|
||||
BuildRequires: apache-commons-lang3
|
||||
BuildRequires: apache-commons-text
|
||||
BuildRequires: atinject
|
||||
@@ -43,19 +44,19 @@ BuildRequires: httpcomponents-core
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: maven-archiver
|
||||
BuildRequires: maven-common-artifact-filters
|
||||
BuildRequires: maven-doxia-core
|
||||
BuildRequires: maven-doxia-logging-api
|
||||
BuildRequires: maven-doxia-module-xhtml
|
||||
BuildRequires: maven-doxia-sink-api
|
||||
BuildRequires: maven-doxia-sitetools
|
||||
BuildRequires: maven-invoker
|
||||
BuildRequires: maven-lib
|
||||
BuildRequires: maven-plugin-annotations
|
||||
BuildRequires: maven-reporting-api >= 3.1.0
|
||||
BuildRequires: maven-reporting-api
|
||||
BuildRequires: maven-reporting-impl
|
||||
BuildRequires: maven-resolver-api
|
||||
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
|
||||
@@ -65,10 +66,11 @@ BuildRequires: plexus-xml
|
||||
BuildRequires: qdox
|
||||
BuildRequires: sisu-inject
|
||||
BuildRequires: sisu-plexus
|
||||
BuildRequires: slf4j
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xmvn-install
|
||||
BuildRequires: xmvn-resolve
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) >= 40
|
||||
BuildArch: noarch
|
||||
%if %{with bootstrap}
|
||||
Name: %{base_name}-bootstrap
|
||||
@@ -81,7 +83,6 @@ 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-plugins:pom:) >= 40
|
||||
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)
|
||||
@@ -117,9 +118,6 @@ cp %{SOURCE1} build.xml
|
||||
%patch -P 1 -p1
|
||||
%patch -P 2 -p1
|
||||
|
||||
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0
|
||||
|
||||
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
|
||||
%pom_remove_dep :::test:
|
||||
|
||||
%build
|
||||
@@ -134,10 +132,9 @@ build-jar-repository -s lib \
|
||||
maven-archiver/maven-archiver \
|
||||
maven-common-artifact-filters/maven-common-artifact-filters \
|
||||
maven-doxia/doxia-core \
|
||||
maven-doxia/doxia-logging-api \
|
||||
maven-doxia/doxia-module-xhtml \
|
||||
maven-doxia/doxia-module-xhtml5 \
|
||||
maven-doxia/doxia-sink-api \
|
||||
maven-doxia-sitetools/doxia-integration-tools \
|
||||
maven-doxia-sitetools/doxia-site-renderer \
|
||||
maven-invoker/maven-invoker \
|
||||
maven/maven-artifact \
|
||||
@@ -152,6 +149,7 @@ 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 \
|
||||
@@ -160,8 +158,9 @@ build-jar-repository -s lib \
|
||||
plexus-languages/plexus-java \
|
||||
plexus/utils \
|
||||
plexus/xml \
|
||||
qdox
|
||||
%{ant} -Dtest.skip=true jar
|
||||
qdox \
|
||||
slf4j/api
|
||||
ant -Dtest.skip=true jar
|
||||
%else
|
||||
xmvn --batch-mode --offline \
|
||||
-Dmaven.test.skip=true -DmavenVersion=3.5.0 \
|
||||
@@ -178,13 +177,9 @@ xmvn --batch-mode --offline \
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE
|
||||
%doc NOTICE
|
||||
|
||||
%if %{without bootstrap}
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE
|
||||
%doc NOTICE
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
@@ -1,10 +0,0 @@
|
||||
--- 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);
|
||||
}
|
@@ -1,52 +0,0 @@
|
||||
--- 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()
|
||||
+ {
|
||||
+ 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
|
||||
*
|
||||
@@ -56,13 +69,7 @@
|
||||
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("@")) {
|
||||
@@ -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);
|
||||
} catch (IOException e) {
|
||||
throw new MavenReportException("Error checking stale data", 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
|
Reference in New Issue
Block a user