Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-plugin-tools for
openSUSE:Factory checked in at 2023-09-25 20:01:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-plugin-tools (Old)
and /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-plugin-tools"
Mon Sep 25 20:01:58 2023 rev:10 rq:1113344 version:3.9.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-plugin-bootstrap.changes
2023-09-04 22:52:56.566411321 +0200
+++
/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1770/maven-plugin-plugin-bootstrap.changes
2023-09-25 20:03:08.282019555 +0200
@@ -1,0 +2,185 @@
+Fri Sep 22 15:32:33 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to upstream version 3.9.0
+- Changes of version 3.9.0
+ * Bug
+ + MPLUGIN-470: *-mojo.xml (in PluginXdocGenerator) is
+ overwritten when multiple locales are defined
+ + MPLUGIN-471: Generated table by PluginXdocGenerator does not
+ contain default attributes
+ * Improvement
+ + MPLUGIN-469: Omit empty line in generated help goal output if
+ plugin description is empty
+ + MPLUGIN-472: Use Plexus I18N rather than fiddling with
+ * Task
+ + MPLUGIN-467: Remove reporting from maven-plugin-plugin: create
+ maven-plugin-report-plugin
+ * Dependency upgrade
+ + MPLUGIN-468: Upgrade plugins and components (in ITs)
+- Changes of version 3.8.2
+ * Improvement
+ + MPLUGIN-457: Use Resolver API, get rid of localRepository
+ * Dependency upgrade
+ + MPLUGIN-458: Bump httpcore from 4.4.15 to 4.4.16
+ + MPLUGIN-459: Bump httpclient from 4.5.13 to 4.5.14
+ + MPLUGIN-460: Bump antVersion from 1.10.12 to 1.10.13
+ + MPLUGIN-461: Bump slf4jVersion from 1.7.5 to 1.7.36
+ + MPLUGIN-462: Bump plexus-java from 1.1.1 to 1.1.2
+ + MPLUGIN-463: Bump plexus-archiver from 4.6.1 to 4.6.3
+ + MPLUGIN-464: Bump jsoup from 1.15.3 to 1.15.4
+ + MPLUGIN-465: Bump asmVersion from 9.4 to 9.5
+ + MPLUGIN-466: Bump assertj-core from 3.23.1 to 3.24.2
+- Changes of version 3.8.1
+ * Bug
+ + MPLUGIN-443: Javadoc reference containing a link label with
+ spaces are not detected
+ + MPLUGIN-444: JavadocLinkGenerator.createLink: Support nested
+ binary class names
+ + MPLUGIN-446: ERROR during build of m-plugin-report-p and
+ m-plugin-p: Dependencies in wrong scope
+ + MPLUGIN-448: "Executes as an aggregator plugin" documentation:
+ s/plugin/goal/
+ + MPLUGIN-452: Maven scope warning should be logged at WARN
+ level
+ + MPLUGIN-453: Fix Temporary File Information Disclosure
+ Vulnerability
+ * New Feature
+ + MPLUGIN-441: Support mojos using the new maven v4 api
+ * Improvement
+ + MPLUGIN-425: Plugin descriptor should contain the
+ requiredJavaVersion/requiredMavenVersion
+ + MPLUGIN-439: Execute annotation only supports standard
+ lifecycle phases due to use of enum
+ + MPLUGIN-440: Clarify deprecation of all extractors but the
+ maven-plugin-tools-annotations
+ * Dependency upgrade
+ + MPLUGIN-447: Update to Maven Parent POM 39
+ + MPLUGIN-454: Bump junit-bom from 5.9.1 to 5.9.2
+ + MPLUGIN-455: Bump plexus-archiver from 4.5.0 to 4.6.1
+- Changes of version 3.7.1
+ * Bug
+ + MPLUGIN-452: Maven scope warning should be logged at WARN
+ level
+- Changes of version 3.7.0
+ * Bug
+ + MPLUGIN-298: The plugin descriptor generated by
+ plugin:descriptor does not consider @ see javadoc taglets
+ + MPLUGIN-394: Report-Mojo doesn't respect input encoding
+ + MPLUGIN-403: Generating site reports for plugin results in
+ NoSuchMethodError
+ + MPLUGIN-404: JDK Requirements in plugin-info.html: Consider
+ property "maven.compiler.release"
+ + MPLUGIN-420: Parameters documentation inheriting @ since from
+ Mojo can be confusing
+ + MPLUGIN-428: Don't emit warning for missing javadoc URL of
+ primitives
+ + MPLUGIN-429: Don't emit warning for missing javadoc URI if no
+ javadoc sources are configured
+ + MPLUGIN-438: Parameter description should be taken from
+ annotated item
+ * New Feature
+ + MPLUGIN-9: Add link to javadoc in configuration description
+ page for user defined types of Mojos.
+ + MPLUGIN-396: Allow only @ Deprecated annotation without @
+ deprecated javadoc tag
+ + MPLUGIN-400: add system requirements history section
+ + MPLUGIN-402: report: allow to generate usage section in
+ plugin-info.html with true
+ + MPLUGIN-419: Allow @ Parameter on setters methods
+ + MPLUGIN-423: Extract plugin report into its own plugin
+ + MPLUGIN-427: report: Expose generics information of Collection
+ and Map types
+ * Improvement
+ + MPLUGIN-297: plugin-info.html should contain a better Usage
+ section
+ + MPLUGIN-390: Do not overwrite generate files with no content
+ change
+ + MPLUGIN-393: Upgrade to JUnit 5 and @ Inject annotations
+ + MPLUGIN-398: Support for java 20 - ASM 9.4
+ + MPLUGIN-405: Don't print empty Memory, Disk Space in System
+ Requirements
+ + MPLUGIN-408: simplification in helpmojo build
+ + MPLUGIN-411: Get rid of plexus-compiler-manager from tests
+ + MPLUGIN-412: Use Maven core artifacts in provided scope
+ + MPLUGIN-417: report and descriptor goal need to evaluate
+ Javadoc comments differently
+ + MPLUGIN-433: Allow to reference aggregator javadoc from plugin
+ report
+ * Task
+ + MPLUGIN-378: Detect legacy/javadoc Mojo definitions, warn to
+ use Java 5 annotations
+ + MPLUGIN-389: Update level to Java 8
+ + MPLUGIN-391: Deprecate scripting support for mojos
+ + MPLUGIN-406: Deprecate requirements parameter in report Mojo
+ + MPLUGIN-407: Remove duplicate code from PluginReport
+ + MPLUGIN-409: Prepare for Doxia (Sitetools) 2.0.0
+ + MPLUGIN-430: Fix documentation for maven-plugin-report-plugin
+ + MPLUGIN-431: Remove deprecated items from new
+ maven-plugin-report-plugin
+ + MPLUGIN-432: Improve site build
+ + MPLUGIN-434: Improve dependency management
+ + MPLUGIN-437: Plugin generator generation fails when the parent
+ class comes from a different project
+ * Dependency upgrade
+ + MPLUGIN-395: Upgrade Maven Reporting API/Impl to 3.1.0
+ + MPLUGIN-397: Upgrade Parent to 36
+ + MPLUGIN-399: Upgrade project dependencies after JDK 1.8
+ + MPLUGIN-413: Bump maven-parent from 36 to 37
+ + MPLUGIN-415: Upgrade Maven Reporting API to 3.1.1/Maven
+ Reporting Impl to 3.2.0
+ + MPLUGIN-422: Upgrade plexus-utils to 3.5.0
+- Changes of version 3.6.4
+ * What's Changed
+ + MPLUGIN-384: restore compatibility with Maven 3 ecosystem
+ + MPLUGIN-387: Upgrade dependencies
+- Changes of version 3.6.3
+ * What's Changed
+ + MPLUGIN-383: add prerequisites to plugin pom
+ + MPLUGIN-382: exclude dependency in provided scope from plugin
+ descriptor
+ + Get rid of String.format use
+ + Fix this logging as well
+ + (doc) Simplify documentation
+ + MPLUGIN-386: Exclude maven-archiver and maven-jxr from warning
+- Changes of version 3.6.2
+ * What's Changed
+ + MPLUGIN-374: deprecate unused requiresReports flag
+ + MPLUGIN-370: Check that Maven dependencies are provided scope
+ + Update ITs
+ + use shared gh action
+ + MPLUGIN-375: deprecate unsupported Mojo descriptor items
+ + Weed out ITs
+ + MPLUGIN-377: Upgrade to maven 3.x and avoid using deprecated
+ API
+ + MPLUGIN-376: Drop legacy dependencies
+ + use shared gh action - v1
+ + fix wording in javadoc
+- Changes of version 3.6.1
+ * What's Changed
+ + Add missing @OverRide and make methods static
+ + MPLUGIN-355: Upgrade to JUnit 4.12
+ + upgrade parent POM and other dependencies
+ + deps: update plugins
+ + MPLUGIN-359: upgrade Doxia Sitetools to 1.9.2 to remove
+ dependency on Struts
+ + MNGSITE-393: remove Maven 2 info
+ + remove unneeded dependency
+ + tighten the dependency tree
+ + ignore .checkstyle
+ + strict dependencies for maven-plugin-tools-annotations
+ + (doc) added "help" goal; goal number corrected
+ + MPLUGIN-368: Improve @execute(goal...) docs
+ + MPLUGIN-367: Improve @execute(lifecycle...) docs
+- Modified patches:
+ * maven-plugin-plugin-bootstrap-resouces.patch
+ * regenerate in cycle
+ * 0004-Remove-dependency-on-jtidy.patch
+ -> 0002-Remove-dependency-on-jtidy.patch
+ * regenerate to changed context
+- Removed patches:
+ * 0001-Avoid-duplicate-MOJO-parameters.patch
+ * 0002-Deal-with-nulls-from-getComment.patch
+ * 0003-Port-to-plexus-utils-3.0.24.patch
+ + not needed with this version
+
+-------------------------------------------------------------------
maven-plugin-plugin.changes: same change
maven-plugin-tools.changes: same change
Old:
----
0001-Avoid-duplicate-MOJO-parameters.patch
0002-Deal-with-nulls-from-getComment.patch
0003-Port-to-plexus-utils-3.0.24.patch
0004-Remove-dependency-on-jtidy.patch
maven-plugin-tools-3.6.0-source-release.zip
New:
----
0002-Remove-dependency-on-jtidy.patch
maven-plugin-tools-3.9.0-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-plugin-plugin-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.oOmDmT/_old 2023-09-25 20:03:10.066083876 +0200
+++ /var/tmp/diff_new_pack.oOmDmT/_new 2023-09-25 20:03:10.066083876 +0200
@@ -19,7 +19,7 @@
%global base_name maven-plugin-tools
%global artifactId maven-plugin-plugin
Name: %{artifactId}-bootstrap
-Version: 3.6.0
+Version: 3.9.0
Release: 0
Summary: Maven Plugin Plugin
License: Apache-2.0
@@ -27,32 +27,24 @@
URL: https://maven.apache.org/plugin-tools/
Source0:
https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
Source1: %{base_name}-build.tar.xz
-Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
-Patch1: 0002-Deal-with-nulls-from-getComment.patch
-Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
-Patch3: 0004-Remove-dependency-on-jtidy.patch
+Patch0: 0002-Remove-dependency-on-jtidy.patch
# The maven-plugin-plugin is used to generate those descriptors, which
# creates a circular dependency of maven-plugin-plugin on itself.
# We generated those ones outside the rpm build for a bootstrap package.
Patch20: maven-plugin-plugin-bootstrap-resouces.patch
BuildRequires: ant
BuildRequires: javapackages-local
-BuildRequires: maven-doxia-logging-api
-BuildRequires: maven-doxia-sink-api
-BuildRequires: maven-doxia-sitetools
BuildRequires: maven-lib
BuildRequires: maven-plugin-annotations
-BuildRequires: maven-plugin-registry
BuildRequires: maven-plugin-tools-api
BuildRequires: maven-plugin-tools-generators
-BuildRequires: maven-reporting-api
-BuildRequires: maven-reporting-impl
-BuildRequires: modello >= 2.0.0
-BuildRequires: plexus-containers-container-default
+BuildRequires: maven-resolver-api
+BuildRequires: plexus-build-api
BuildRequires: plexus-utils
BuildRequires: plexus-velocity
+BuildRequires: sisu-inject
+BuildRequires: sisu-plexus
BuildRequires: unzip
-BuildRequires: velocity
BuildRequires: xmvn-install
BuildRequires: xmvn-resolve
BuildRequires:
mvn(org.apache.maven.plugin-tools:maven-plugin-tools-annotations)
@@ -69,10 +61,7 @@
%prep
%setup -q -n %{base_name}-%{version} -a1
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch20 -p1
+%patch20
%pom_remove_plugin -r :maven-enforcer-plugin
@@ -80,43 +69,33 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
-# Why on the earth is this dependency there ???
-%pom_remove_dep :maven-surefire-common maven-plugin-plugin
-
# Remove test dependencies because tests are skipped anyways.
%pom_xpath_remove "pom:dependency[pom:scope='test']"
-%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations
-
-# For some reason, this dependency is not generated by javapackages-local
-# and for some reasons if we give it a scope 'runtime' it works
-%pom_remove_dep :maven-plugin-annotations maven-plugin-plugin
-%pom_add_dep
org.apache.maven.plugin-tools:maven-plugin-annotations:%{version}:runtime
maven-plugin-plugin
+%pom_remove_dep org.junit:junit-bom
+%pom_remove_dep :maven-plugin-tools-ant maven-plugin-plugin
+%pom_remove_dep :maven-plugin-tools-beanshell maven-plugin-plugin
%{mvn_package} :maven-plugin-tools __noinstall
%build
mkdir -p lib
build-jar-repository -s lib \
- maven-doxia/doxia-logging-api \
- maven-doxia/doxia-sink-api \
- maven-doxia-sitetools/doxia-site-renderer \
maven/maven-artifact \
- maven/maven-compat \
maven/maven-core \
maven/maven-model \
maven/maven-plugin-api \
- maven/maven-plugin-registry \
maven/maven-repository-metadata \
+ maven/maven-settings \
maven-plugin-tools/maven-plugin-annotations \
maven-plugin-tools/maven-plugin-tools-api \
maven-plugin-tools/maven-plugin-tools-generators \
- maven-reporting-api/maven-reporting-api \
- maven-reporting-impl/maven-reporting-impl \
- plexus-containers/plexus-container-default \
+ maven-resolver/maven-resolver-api \
+ org.eclipse.sisu.inject \
+ org.eclipse.sisu.plexus \
+ plexus/plexus-build-api \
plexus/utils \
- plexus-velocity/plexus-velocity \
- velocity
+ plexus-velocity/plexus-velocity
%{mvn_file} :%{artifactId} %{base_name}/%{artifactId}
pushd %{artifactId}
++++++ maven-plugin-plugin.spec ++++++
--- /var/tmp/diff_new_pack.oOmDmT/_old 2023-09-25 20:03:10.090084741 +0200
+++ /var/tmp/diff_new_pack.oOmDmT/_new 2023-09-25 20:03:10.094084885 +0200
@@ -18,44 +18,38 @@
%global base_name maven-plugin-tools
Name: maven-plugin-plugin
-Version: 3.6.0
+Version: 3.9.0
Release: 0
Summary: Maven Plugin Plugin
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://maven.apache.org/plugin-tools/
Source0:
https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
-Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
-Patch1: 0002-Deal-with-nulls-from-getComment.patch
-Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
-Patch3: 0004-Remove-dependency-on-jtidy.patch
+Patch0: 0002-Remove-dependency-on-jtidy.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: unzip
-BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
-BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires:
mvn(org.apache.maven.plugin-tools:maven-plugin-tools-annotations)
+BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-ant)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-api)
+BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-beanshell)
BuildRequires:
mvn(org.apache.maven.plugin-tools:maven-plugin-tools-generators)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
-BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
-BuildRequires: mvn(org.apache.maven.surefire:maven-surefire-common)
-BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1)
-BuildRequires: mvn(org.apache.maven:maven-model:2.2.1)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-repository-metadata)
-BuildRequires: mvn(org.apache.velocity:velocity)
-BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus-velocity)
+BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
+BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
Obsoletes: %{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
@@ -77,9 +71,6 @@
%prep
%setup -q -n %{base_name}-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%pom_remove_plugin -r :maven-enforcer-plugin
@@ -90,18 +81,18 @@
# Remove test dependencies because tests are skipped anyways.
%pom_xpath_remove "pom:dependency[pom:scope='test']"
-# Why on the earth is this dependency there ???
-%pom_remove_dep :maven-surefire-common maven-plugin-plugin
-
-%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations
+%pom_remove_dep org.junit:junit-bom
+%pom_remove_dep :maven-plugin-tools-ant maven-plugin-plugin
+%pom_remove_dep :maven-plugin-tools-beanshell maven-plugin-plugin
%build
pushd %{name}
%{mvn_file} :%{name} %{base_name}/%{name}
-%{mvn_build} -f \
+%{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
- -- -Dmaven.compiler.release=7
+ -Dmaven.compiler.release=8 \
%endif
+ -Dsource=8
popd
++++++ maven-plugin-tools.spec ++++++
--- /var/tmp/diff_new_pack.oOmDmT/_old 2023-09-25 20:03:10.122085894 +0200
+++ /var/tmp/diff_new_pack.oOmDmT/_new 2023-09-25 20:03:10.122085894 +0200
@@ -17,7 +17,7 @@
Name: maven-plugin-tools
-Version: 3.6.0
+Version: 3.9.0
Release: 0
Summary: Maven Plugin Tools
License: Apache-2.0
@@ -25,40 +25,36 @@
URL: https://maven.apache.org/plugin-tools/
Source0:
https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.tar.xz
-Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
-Patch1: 0002-Deal-with-nulls-from-getComment.patch
-Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
-Patch3: 0004-Remove-dependency-on-jtidy.patch
+Patch0: 0002-Remove-dependency-on-jtidy.patch
BuildRequires: ant
-BuildRequires: apache-commons-cli
BuildRequires: atinject
BuildRequires: bsh2
BuildRequires: fdupes
-BuildRequires: google-guice
-BuildRequires: guava
+BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-core
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
-BuildRequires: jdom2
-BuildRequires: junit
+BuildRequires: jsoup
BuildRequires: maven-lib
BuildRequires: maven-reporting-api
+BuildRequires: maven-resolver-api
+BuildRequires: maven-wagon-provider-api
BuildRequires: modello >= 2.0.0
BuildRequires: objectweb-asm
BuildRequires: plexus-ant-factory
BuildRequires: plexus-archiver
BuildRequires: plexus-bsh-factory
BuildRequires: plexus-classworlds
-BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations
-BuildRequires: plexus-metadata-generator
+BuildRequires: plexus-languages
BuildRequires: plexus-utils
BuildRequires: plexus-velocity
BuildRequires: qdox
BuildRequires: sisu-inject
BuildRequires: sisu-plexus
+BuildRequires: slf4j
BuildRequires: unzip
BuildRequires: velocity
-BuildRequires: xbean
BuildArch: noarch
%description
@@ -152,9 +148,6 @@
%prep
%setup -q -a1
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%pom_remove_plugin -r :maven-enforcer-plugin
@@ -165,44 +158,41 @@
# Remove test dependencies because tests are skipped anyways.
%pom_xpath_remove "pom:dependency[pom:scope='test']"
-%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations
-
%pom_remove_dep net.sf.jtidy:jtidy maven-plugin-tools-generators
%build
mkdir -p lib
build-jar-repository -s lib \
ant \
- ant-launcher \
atinject \
bsh2/bsh \
- commons-cli \
- guava/guava \
- guice/google-guice-no_aop \
- jdom2/jdom2 \
- junit \
+ httpcomponents/httpclient \
+ httpcomponents/httpcore \
+ jsoup/jsoup \
maven/maven-artifact \
- maven/maven-compat \
maven/maven-core \
maven/maven-model \
maven/maven-plugin-api \
+ maven/maven-settings \
maven-reporting-api/maven-reporting-api \
+ maven-resolver/maven-resolver-api \
+ maven-wagon/provider-api \
objectweb-asm/asm \
objectweb-asm/asm-commons \
+ objectweb-asm/asm-util \
org.eclipse.sisu.inject \
org.eclipse.sisu.plexus \
plexus/ant-factory \
plexus/archiver \
plexus/bsh-factory \
plexus-classworlds \
- plexus/cli \
plexus-containers/plexus-component-annotations \
- plexus-metadata-generator \
+ plexus-languages/plexus-java \
plexus/utils \
plexus-velocity/plexus-velocity \
qdox \
- velocity \
- xbean/xbean-reflect
+ slf4j/api \
+ velocity
%{ant} \
-Dtest.skip=true \
++++++ 0004-Remove-dependency-on-jtidy.patch ->
0002-Remove-dependency-on-jtidy.patch ++++++
---
/work/SRC/openSUSE:Factory/maven-plugin-tools/0004-Remove-dependency-on-jtidy.patch
2023-07-25 11:53:35.362325875 +0200
+++
/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1770/0002-Remove-dependency-on-jtidy.patch
2023-09-25 20:03:08.270019122 +0200
@@ -1,145 +1,106 @@
----
maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
2018-10-29 10:41:50.000000000 +0100
-+++
maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
2023-07-24 23:08:19.511756145 +0200
-@@ -544,11 +544,11 @@
- {
- description =
- "<strong>" + getBundle( locale ).getString(
"report.plugin.goal.deprecated" ) + "</strong> "
-- + GeneratorUtils.makeHtmlValid(
mojo.getDeprecated() );
-+ + mojo.getDeprecated();
- }
- else if ( StringUtils.isNotEmpty( mojo.getDescription() ) )
- {
-- description = GeneratorUtils.makeHtmlValid(
mojo.getDescription() );
-+ description = mojo.getDescription();
- }
- else
- {
----
maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
2018-10-29 10:41:50.000000000 +0100
-+++
maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
2023-07-24 22:39:51.914568518 +0200
-@@ -51,7 +51,6 @@
- import org.codehaus.plexus.component.repository.ComponentDependency;
- import org.codehaus.plexus.util.StringUtils;
- import org.codehaus.plexus.util.xml.XMLWriter;
--import org.w3c.tidy.Tidy;
-
- /**
- * Convenience methods to play with Maven plugins.
-@@ -255,58 +254,6 @@
- }
-
- /**
-- * Fixes some javadoc comment to become a valid XHTML snippet.
-- *
-- * @param description Javadoc description with HTML tags, may be
<code>null</code>.
-- * @return The description with valid XHTML tags, never <code>null</code>.
-- */
-- public static String makeHtmlValid( String description )
-- {
-- if ( StringUtils.isEmpty( description ) )
-- {
-- return "";
-- }
--
-- String commentCleaned = decodeJavadocTags( description );
--
-- // Using jTidy to clean comment
-- Tidy tidy = new Tidy();
-- tidy.setDocType( "loose" );
-- tidy.setXHTML( true );
-- tidy.setXmlOut( true );
-- tidy.setInputEncoding( "UTF-8" );
-- tidy.setOutputEncoding( "UTF-8" );
-- tidy.setMakeClean( true );
-- tidy.setNumEntities( true );
-- tidy.setQuoteNbsp( false );
-- tidy.setQuiet( true );
-- tidy.setShowWarnings( false );
-- try
-- {
-- ByteArrayOutputStream out = new ByteArrayOutputStream(
commentCleaned.length() + 256 );
-- tidy.parse( new ByteArrayInputStream( commentCleaned.getBytes(
"UTF-8" ) ), out );
-- commentCleaned = out.toString( "UTF-8" );
-- }
-- catch ( UnsupportedEncodingException e )
-- {
-- // cannot happen as every JVM must support UTF-8, see also class
javadoc for java.nio.charset.Charset
-- }
--
-- if ( StringUtils.isEmpty( commentCleaned ) )
-- {
-- return "";
-- }
--
-- // strip the header/body stuff
-- String ls = System.getProperty( "line.separator" );
-- int startPos = commentCleaned.indexOf( "<body>" + ls ) + 6 +
ls.length();
-- int endPos = commentCleaned.indexOf( ls + "</body>" );
-- commentCleaned = commentCleaned.substring( startPos, endPos );
--
-- return commentCleaned;
-- }
--
-- /**
- * Converts a HTML fragment as extracted from a javadoc comment to a
plain text string. This method tries to retain
- * as much of the text formatting as possible by means of the following
transformations:
- * <ul>
-@@ -337,7 +284,7 @@
-
- try
- {
-- parser.parse( new StringReader( makeHtmlValid( html ) ),
htmlCallback, true );
-+ parser.parse( new StringReader( html ), htmlCallback, true );
- }
- catch ( IOException e )
- {
----
maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
2018-10-29 10:41:50.000000000 +0100
-+++
maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
2023-07-24 22:49:33.765883927 +0200
-@@ -202,7 +202,7 @@
- w.writeMarkup( getString( "pluginxdoc.mojodescriptor.deprecated"
) );
- w.endElement(); // p
- w.startElement( "div" );
-- w.writeMarkup( GeneratorUtils.makeHtmlValid(
mojoDescriptor.getDeprecated() ) );
-+ w.writeMarkup( mojoDescriptor.getDeprecated() );
- w.endElement(); // div
- }
-
-@@ -212,7 +212,7 @@
- w.startElement( "div" );
- if ( StringUtils.isNotEmpty( mojoDescriptor.getDescription() ) )
- {
-- w.writeMarkup( GeneratorUtils.makeHtmlValid(
mojoDescriptor.getDescription() ) );
-+ w.writeMarkup( mojoDescriptor.getDescription() );
- }
- else
- {
-@@ -470,14 +470,14 @@
- {
- w.startElement( "div" );
- w.writeMarkup( format(
"pluginxdoc.mojodescriptor.parameter.deprecated",
-- GeneratorUtils.makeHtmlValid(
parameter.getDeprecated() ) ) );
-+ parameter.getDeprecated() ) );
- w.endElement(); // div
- }
-
- w.startElement( "div" );
- if ( StringUtils.isNotEmpty( parameter.getDescription() ) )
- {
-- w.writeMarkup( GeneratorUtils.makeHtmlValid(
parameter.getDescription() ) );
-+ w.writeMarkup( parameter.getDescription() );
- }
- else
- {
-@@ -689,11 +689,11 @@
- if ( StringUtils.isNotEmpty( parameter.getDeprecated() ) )
- {
- description = format(
"pluginxdoc.mojodescriptor.parameter.deprecated",
-- GeneratorUtils.makeHtmlValid(
parameter.getDeprecated() ) );
-+ parameter.getDeprecated() );
- }
- else if ( StringUtils.isNotEmpty( parameter.getDescription() ) )
- {
-- description = GeneratorUtils.makeHtmlValid(
parameter.getDescription() );
-+ description = parameter.getDescription();
- }
- else
- {
+From 6953b37ee5a7c0566d2e11e7141768f8a4c03fa2 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizde...@redhat.com>
+Date: Mon, 27 Apr 2020 12:56:04 +0200
+Subject: [PATCH 2/3] Remove dependency on jtidy
+
+Forwarded: not-needed
+
+---
+ .../plugin/generator/GeneratorUtils.java | 49 +------------------
+ .../PluginDescriptorFilesGenerator.java | 7 +--
+ 2 files changed, 2 insertions(+), 54 deletions(-)
+
+diff --git
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
+index 99aa7965..f05fb876 100644
+---
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
++++
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
+@@ -51,7 +51,6 @@ import org.apache.maven.reporting.MavenReport;
+ import org.codehaus.plexus.component.repository.ComponentDependency;
+ import org.codehaus.plexus.util.StringUtils;
+ import org.codehaus.plexus.util.xml.XMLWriter;
+-import org.w3c.tidy.Tidy;
+
+ /**
+ * Convenience methods to play with Maven plugins.
+@@ -225,52 +224,6 @@ public final class GeneratorUtils {
+ }
+
+ /**
+- * Fixes some javadoc comment to become a valid XHTML snippet.
+- *
+- * @param description Javadoc description with HTML tags, may be
<code>null</code>.
+- * @return The description with valid XHTML tags, never <code>null</code>.
+- * @deprecated Redundant for java extractor
+- */
+- @Deprecated
+- public static String makeHtmlValid(String description) {
+-
+- if (description == null || description.isEmpty()) {
+- return "";
+- }
+-
+- String commentCleaned = decodeJavadocTags(description);
+-
+- // Using jTidy to clean comment
+- Tidy tidy = new Tidy();
+- tidy.setDocType("loose");
+- tidy.setXHTML(true);
+- tidy.setXmlOut(true);
+- tidy.setInputEncoding("UTF-8");
+- tidy.setOutputEncoding("UTF-8");
+- tidy.setMakeClean(true);
+- tidy.setNumEntities(true);
+- tidy.setQuoteNbsp(false);
+- tidy.setQuiet(true);
+- tidy.setShowWarnings(true);
+-
+- ByteArrayOutputStream out = new
ByteArrayOutputStream(commentCleaned.length() + 256);
+- tidy.parse(new
ByteArrayInputStream(commentCleaned.getBytes(StandardCharsets.UTF_8)), out);
+- commentCleaned = new String(out.toByteArray(),
StandardCharsets.UTF_8);
+-
+- if (commentCleaned == null || commentCleaned.isEmpty()) {
+- return "";
+- }
+-
+- // strip the header/body stuff
+- String ls = System.getProperty("line.separator");
+- int startPos = commentCleaned.indexOf("<body>" + ls) + 6 +
ls.length();
+- int endPos = commentCleaned.indexOf(ls + "</body>");
+- commentCleaned = commentCleaned.substring(startPos, endPos);
+-
+- return commentCleaned;
+- }
+-
+- /**
+ * Converts a HTML fragment as extracted from a javadoc comment to a
plain text string. This method tries to retain
+ * as much of the text formatting as possible by means of the following
transformations:
+ * <ul>
+@@ -301,7 +254,7 @@ public final class GeneratorUtils {
+ HTMLEditorKit.ParserCallback htmlCallback = new
MojoParserCallback(sb);
+
+ try {
+- parser.parse(new StringReader(makeHtmlValid(html)), htmlCallback,
true);
++ parser.parse(new StringReader(html), htmlCallback, true);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+diff --git
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
+index cf5c5c48..9f435f0e 100644
+---
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
++++
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
+@@ -201,12 +201,7 @@ public class PluginDescriptorFilesGenerator implements
Generator {
+ */
+ private static String getTextValue(DescriptorType type, boolean
containsXhtmlValue, String text) {
+ final String xhtmlText;
+- if (!containsXhtmlValue) // text comes from legacy extractor
+- {
+- xhtmlText = GeneratorUtils.makeHtmlValid(text);
+- } else {
+ xhtmlText = text;
+- }
+ if (type != DescriptorType.XHTML) {
+ return new HtmlToPlainTextConverter().convert(text);
+ } else {
+--
+2.41.0
+
++++++ maven-plugin-plugin-bootstrap-resouces.patch ++++++
++++ 1818 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-plugin-bootstrap-resouces.patch
++++ and
/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1770/maven-plugin-plugin-bootstrap-resouces.patch
++++++ maven-plugin-tools-3.6.0-source-release.zip ->
maven-plugin-tools-3.9.0-source-release.zip ++++++
++++ 162509 lines of diff (skipped)
++++++ maven-plugin-tools-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2022-05-10 10:53:17.333113779 +0200
+++ new/common.xml 2023-09-22 10:19:12.791977497 +0200
@@ -3,12 +3,12 @@
<project name="common" basedir=".">
<property file="build.properties"/>
- <property name="project.version" value="3.6.0"/>
+ <property name="project.version" value="3.9.0"/>
<property name="project.groupId" value="org.apache.maven.plugin-tools"/>
<property name="project.organization.name" value="The Apache Software
Foundation"/>
- <property name="spec.version" value="3.6"/>
+ <property name="spec.version" value="3.9"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-plugin-plugin/build.xml
new/maven-plugin-plugin/build.xml
--- old/maven-plugin-plugin/build.xml 2022-05-10 10:52:57.604991416 +0200
+++ new/maven-plugin-plugin/build.xml 2023-09-22 13:08:46.090225642 +0200
@@ -29,9 +29,6 @@
<property name="test.reports" value="${build.dir}/test-reports"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
- <property name="build.mdoDir" value="src/main/mdo"/>
- <property name="build.mdoOutputDir"
value="${build.dir}/generated-sources/modello"/>
-
<!-- ======================================================================
-->
<!-- Defining classpaths
-->
<!-- ======================================================================
-->
@@ -65,42 +62,10 @@
</target>
<!-- ======================================================================
-->
- <!-- Code generation target
-->
- <!-- ======================================================================
-->
-
- <target name="mdo" description="Generate sources from mdo files">
- <mkdir dir="${build.mdoOutputDir}"/>
- <macrodef name="modello-single-mode">
- <attribute name="file"/>
- <attribute name="mode"/>
- <attribute name="version"/>
- <sequential>
- <exec executable="modello" failonerror="true">
- <arg file="@{file}"/> <!-- model file -->
- <arg value="@{mode}"/> <!-- output type -->
- <arg file="${build.mdoOutputDir}"/> <!-- output directory -->
- <arg value="@{version}"/> <!-- model version -->
- <arg value="false"/> <!-- package with version -->
- <arg value="8"/> <!-- javaSource -->
- </exec>
- </sequential>
- </macrodef>
- <macrodef name="modello">
- <attribute name="file"/>
- <attribute name="version" default="1.0.0"/>
- <sequential>
- <echo taskname="modello" message="Generating sources for @{file}"/>
- <modello-single-mode file="@{file}" version="@{version}" mode="java"/>
- </sequential>
- </macrodef>
- <modello file="${build.mdoDir}/pluginRequirements.mdo"/>
- </target>
-
- <!-- ======================================================================
-->
<!-- Compilation target
-->
<!-- ======================================================================
-->
- <target name="compile" depends="mdo" description="Compile the code">
+ <target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
nowarn="false"
@@ -114,7 +79,6 @@
source="${compiler.source}">
<src>
<pathelement location="${build.srcDir}"/>
- <pathelement location="${build.mdoOutputDir}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
@@ -188,10 +152,9 @@
<!-- Javadoc target
-->
<!-- ======================================================================
-->
- <target name="javadoc" depends="mdo" description="Generates the Javadoc of
the application">
+ <target name="javadoc" description="Generates the Javadoc of the
application">
<path id="src.path">
<pathelement location="${build.srcDir}"/>
- <pathelement location="${build.mdoOutputDir}"/>
</path>
<javadoc sourcepathref="src.path"
packagenames="*"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-plugin-tools-annotations/build.xml
new/maven-plugin-tools-annotations/build.xml
--- old/maven-plugin-tools-annotations/build.xml 2019-03-31
19:59:08.411461142 +0200
+++ new/maven-plugin-tools-annotations/build.xml 2023-09-22
14:26:56.408219555 +0200
@@ -74,30 +74,25 @@
</target>
<!-- ======================================================================
-->
- <!-- Target to generate Plexus component.xml
-->
+ <!-- Sisu javax.inject.Named generation target
-->
<!-- ======================================================================
-->
- <target name="plexus"
+ <target name="sisu"
depends="compile"
- description="Generate Plexus component.xml">
- <mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- <arg value="-X"/>
- <arg value="-s"/>
- <arg value="${build.srcDir}"/>
- <arg value="-c"/>
- <arg value="${build.outputDir}"/>
- <arg value="-m"/>
- <arg value="${build.outputDir}/META-INF/plexus"/>
- <arg value="-o"/>
- <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
+ 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>
<!-- ======================================================================
-->
@@ -105,7 +100,7 @@
<!-- ======================================================================
-->
<target name="compile-tests"
- depends="plexus"
+ depends="sisu"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
@@ -228,7 +223,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="plexus,test" description="Package the
application">
+ <target name="package" depends="sisu,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-plugin-tools-api/build.xml
new/maven-plugin-tools-api/build.xml
--- old/maven-plugin-tools-api/build.xml 2019-03-31 19:59:08.027460048
+0200
+++ new/maven-plugin-tools-api/build.xml 2023-09-22 10:42:55.371624492
+0200
@@ -67,9 +67,28 @@
</src>
<classpath refid="build.classpath"/>
</javac>
- <copy todir="${build.outputDir}">
- <fileset dir="${build.resourceDir}"/>
- </copy>
+ </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>
<!-- ======================================================================
-->
@@ -77,7 +96,7 @@
<!-- ======================================================================
-->
<target name="compile-tests"
- depends="compile"
+ depends="sisu"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
@@ -200,7 +219,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="compile,test" description="Package the
application">
+ <target name="package" depends="sisu,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-plugin-tools-java/build.xml
new/maven-plugin-tools-java/build.xml
--- old/maven-plugin-tools-java/build.xml 2019-03-31 19:59:08.031460060
+0200
+++ new/maven-plugin-tools-java/build.xml 2023-09-22 10:51:30.641812568
+0200
@@ -73,30 +73,25 @@
</target>
<!-- ======================================================================
-->
- <!-- Target to generate Plexus component.xml
-->
+ <!-- Sisu javax.inject.Named generation target
-->
<!-- ======================================================================
-->
- <target name="plexus"
+ <target name="sisu"
depends="compile"
- description="Generate Plexus component.xml">
- <mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- <arg value="-X"/>
- <arg value="-s"/>
- <arg value="${build.srcDir}"/>
- <arg value="-c"/>
- <arg value="${build.outputDir}"/>
- <arg value="-m"/>
- <arg value="${build.outputDir}/META-INF/plexus"/>
- <arg value="-o"/>
- <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
+ 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>
<!-- ======================================================================
-->
@@ -104,7 +99,7 @@
<!-- ======================================================================
-->
<target name="compile-tests"
- depends="plexus"
+ depends="sisu"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
@@ -227,7 +222,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="plexus,test" description="Package the
application">
+ <target name="package" depends="sisu,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-script/maven-plugin-tools-ant/build.xml
new/maven-script/maven-plugin-tools-ant/build.xml
--- old/maven-script/maven-plugin-tools-ant/build.xml 2019-03-31
19:59:08.019460025 +0200
+++ new/maven-script/maven-plugin-tools-ant/build.xml 2023-09-22
10:50:18.944655915 +0200
@@ -74,30 +74,25 @@
</target>
<!-- ======================================================================
-->
- <!-- Target to generate Plexus component.xml
-->
+ <!-- Sisu javax.inject.Named generation target
-->
<!-- ======================================================================
-->
- <target name="plexus"
+ <target name="sisu"
depends="compile"
- description="Generate Plexus component.xml">
- <mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- <arg value="-X"/>
- <arg value="-s"/>
- <arg value="${build.srcDir}"/>
- <arg value="-c"/>
- <arg value="${build.outputDir}"/>
- <arg value="-m"/>
- <arg value="${build.outputDir}/META-INF/plexus"/>
- <arg value="-o"/>
- <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
+ 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>
<!-- ======================================================================
-->
@@ -105,7 +100,7 @@
<!-- ======================================================================
-->
<target name="compile-tests"
- depends="plexus"
+ depends="sisu"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
@@ -228,7 +223,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="plexus,test" description="Package the
application">
+ <target name="package" depends="sisu,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-script/maven-plugin-tools-beanshell/build.xml
new/maven-script/maven-plugin-tools-beanshell/build.xml
--- old/maven-script/maven-plugin-tools-beanshell/build.xml 2019-03-31
19:59:08.023460037 +0200
+++ new/maven-script/maven-plugin-tools-beanshell/build.xml 2023-09-22
10:50:49.454864427 +0200
@@ -77,30 +77,25 @@
</target>
<!-- ======================================================================
-->
- <!-- Target to generate Plexus component.xml
-->
+ <!-- Sisu javax.inject.Named generation target
-->
<!-- ======================================================================
-->
- <target name="plexus"
+ <target name="sisu"
depends="compile"
- description="Generate Plexus component.xml">
- <mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- <arg value="-X"/>
- <arg value="-s"/>
- <arg value="${build.srcDir}"/>
- <arg value="-c"/>
- <arg value="${build.outputDir}"/>
- <arg value="-m"/>
- <arg value="${build.outputDir}/META-INF/plexus"/>
- <arg value="-o"/>
- <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
+ 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>
<!-- ======================================================================
-->
@@ -108,7 +103,7 @@
<!-- ======================================================================
-->
<target name="compile-tests"
- depends="plexus"
+ depends="sisu"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
@@ -184,7 +179,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="plexus,test" description="Package the
application">
+ <target name="package" depends="sisu,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
