Merge commit '5af6d5b803d371ca3f9ae68b105b06f9aa68026fdbe5f11e70d201d5a2ddde9e' into fixes

Accepting request 1219150 from Java:packages
3.15.1 OBS-URL: https://build.opensuse.org/request/show/1219150 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-plugin-tools?expand=0&rev=16
2025-11-19 14:09:03 +01:00 · 2024-10-30 16:35:07 +00:00 · 2024-10-29 18:19:57 +00:00 · 2024-10-26 03:00:48 +00:00 · 2024-10-02 19:36:25 +00:00 · 2024-10-02 17:52:38 +00:00
12 changed files with 202 additions and 259 deletions
--- a/maven-plugin-plugin-bootstrap-resouces.patch
+++ b/maven-plugin-plugin-bootstrap-resouces.patch
@@ -1,5 +1,5 @@
--- a/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml	2025-10-24 16:22:25.795389541 +0200
+--- /dev/null
+++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml
@@ -0,0 +1,348 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +
@@ -231,7 +231,7 @@
 +    </mojo>
 +    <mojo>
 +      <goal>help</goal>
-+      <description>Display help information on maven-plugin-plugin. 
+      <description>Display help information on maven-plugin-plugin.
 +Call mvn plugin:help -Ddetail=true -Dgoal=&lt;goal-name&gt; to display parameter details.</description>
 +      <requiresDirectInvocation>false</requiresDirectInvocation>
 +      <requiresProject>false</requiresProject>
@@ -349,9 +349,9 @@
 +    </mojo>
 +  </mojos>
 +</plugin>
--- a/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml	2025-10-24 16:42:25.659862263 +0200
-@@ -0,0 +1,568 @@
+--- /dev/null
+++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml
+@@ -0,0 +1,578 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +
 +<!-- Generated by maven-plugin-tools 3.15-->
@@ -439,13 +439,6 @@
 +          <description>Flag controlling is &quot;expected dependencies in provided scope&quot; check to be performed or not. Default value: true.</description>
 +        </parameter>
 +        <parameter>
-+          <name>classesOutputDirectory</name>
-+          <type>java.io.File</type>
-+          <required>false</required>
-+          <editable>false</editable>
-+          <description>The directory where the generated class files will be put.</description>
-+        </parameter>
-+        <parameter>
 +          <name>encoding</name>
 +          <type>java.lang.String</type>
 +          <since>2.5</since>
@@ -587,7 +580,6 @@
 +      </parameters>
 +      <configuration>
 +        <checkExpectedProvidedScope implementation="boolean" default-value="true">${maven.plugin.checkExpectedProvidedScope}</checkExpectedProvidedScope>
-+        <classesOutputDirectory implementation="java.io.File" default-value="${project.build.outputDirectory}"/>
 +        <encoding implementation="java.lang.String" default-value="${project.build.sourceEncoding}">${encoding}</encoding>
 +        <externalJavadocBaseUrls implementation="java.util.List">${externalJavadocBaseUrls}</externalJavadocBaseUrls>
 +        <internalJavadocBaseUrl implementation="java.net.URI">${internalJavadocBaseUrl}</internalJavadocBaseUrl>
@@ -602,7 +594,7 @@
 +    </mojo>
 +    <mojo>
 +      <goal>help</goal>
-+      <description>Display help information on maven-plugin-plugin. 
+      <description>Display help information on maven-plugin-plugin.
 +Call mvn plugin:help -Ddetail=true -Dgoal=&lt;goal-name&gt; to display parameter details.</description>
 +      <requiresDirectInvocation>false</requiresDirectInvocation>
 +      <requiresProject>false</requiresProject>
@@ -721,10 +713,22 @@
 +  </mojos>
 +  <dependencies>
 +    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <type>jar</type>
+      <version>9.9</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+      <type>jar</type>
+      <version>3.0.2</version>
+    </dependency>
+    <dependency>
 +      <groupId>org.apache.maven.plugin-tools</groupId>
 +      <artifactId>maven-plugin-tools-api</artifactId>
 +      <type>jar</type>
-+      <version>${project.version}</version>
+      <version>3.15.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.reporting</groupId>
@@ -778,13 +782,7 @@
 +      <groupId>org.apache.maven.plugin-tools</groupId>
 +      <artifactId>maven-plugin-tools-generators</artifactId>
 +      <type>jar</type>
-+      <version>${project.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-xml</artifactId>
-+      <type>jar</type>
-+      <version>3.0.1</version>
+      <version>3.15.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.velocity</groupId>
@@ -793,6 +791,12 @@
 +      <version>2.4.1</version>
 +    </dependency>
 +    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <type>jar</type>
+      <version>3.17.0</version>
+    </dependency>
+    <dependency>
 +      <groupId>org.jsoup</groupId>
 +      <artifactId>jsoup</artifactId>
 +      <type>jar</type>
@@ -805,16 +809,22 @@
 +      <version>r938</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.ow2.asm</groupId>
-+      <artifactId>asm</artifactId>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-java</artifactId>
 +      <type>jar</type>
-+      <version>9.9</version>
+      <version>3.15.2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.qdox</groupId>
+      <artifactId>qdox</artifactId>
+      <type>jar</type>
+      <version>2.2.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.plugin-tools</groupId>
 +      <artifactId>maven-plugin-tools-annotations</artifactId>
 +      <type>jar</type>
-+      <version>${project.version}</version>
+      <version>3.15.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
@@ -826,7 +836,7 @@
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-io</artifactId>
 +      <type>jar</type>
-+      <version>3.5.2</version>
+      <version>3.5.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-io</groupId>
@@ -835,28 +845,16 @@
 +      <version>2.20.0</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.apache.commons</groupId>
-+      <artifactId>commons-compress</artifactId>
-+      <type>jar</type>
-+      <version>1.28.0</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>io.airlift</groupId>
-+      <artifactId>aircompressor</artifactId>
-+      <type>jar</type>
-+      <version>0.27</version>
-+    </dependency>
-+    <dependency>
 +      <groupId>org.tukaani</groupId>
 +      <artifactId>xz</artifactId>
 +      <type>jar</type>
 +      <version>1.10</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>com.github.luben</groupId>
-+      <artifactId>zstd-jni</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
 +      <type>jar</type>
-+      <version>1.5.7-5</version>
+      <version>1.28.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.ow2.asm</groupId>
@@ -866,27 +864,45 @@
 +    </dependency>
 +    <dependency>
 +      <groupId>org.ow2.asm</groupId>
-+      <artifactId>asm-tree</artifactId>
-+      <type>jar</type>
-+      <version>9.9</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.ow2.asm</groupId>
 +      <artifactId>asm-analysis</artifactId>
 +      <type>jar</type>
 +      <version>9.9</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>com.thoughtworks.qdox</groupId>
-+      <artifactId>qdox</artifactId>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-tree</artifactId>
 +      <type>jar</type>
-+      <version>2.2.0</version>
+      <version>9.9</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.plugin-tools</groupId>
 +      <artifactId>maven-plugin-annotations</artifactId>
 +      <type>jar</type>
-+      <version>${project.version}</version>
+      <version>3.15.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-ant</artifactId>
+      <type>jar</type>
+      <version>3.15.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-model</artifactId>
+      <type>jar</type>
+      <version>3.15.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-beanshell</artifactId>
+      <type>jar</type>
+      <version>3.15.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache-extras.beanshell</groupId>
+      <artifactId>bsh</artifactId>
+      <type>jar</type>
+      <version>2.0b6</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.resolver</groupId>
@@ -907,12 +923,6 @@
 +      <version>2.3.0</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.apache.commons</groupId>
-+      <artifactId>commons-lang3</artifactId>
-+      <type>jar</type>
-+      <version>3.19.0</version>
-+    </dependency>
-+    <dependency>
 +      <groupId>org.sonatype.plexus</groupId>
 +      <artifactId>plexus-build-api</artifactId>
 +      <type>jar</type>
@@ -920,8 +930,8 @@
 +    </dependency>
 +  </dependencies>
 +</plugin>
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/maven_plugin_plugin/HelpMojo.java	1970-01-01 01:00:00.000000000 +0100
-+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/maven_plugin_plugin/HelpMojo.java	2025-10-24 16:19:07.270918515 +0200
+--- /dev/null
+++ maven-plugin-plugin/src/main/java/org/apache/maven/plugins/maven_plugin_plugin/HelpMojo.java
@@ -0,0 +1,448 @@
 +package org.apache.maven.plugins.maven_plugin_plugin;
 +
--- a/maven-plugin-plugin-bootstrap.changes
+++ b/maven-plugin-plugin-bootstrap.changes
@@ -1,36 +1,3 @@
-------------------------------------------------------------------
-Sat Nov  8 18:45:34 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
- Upgrade to upstream version 4.0.0-beta-2
- Supports generating metadata for plugins using Maven 3 API as well
-  as those using Maven 4 API
- Principal changes
-  * Removals
-    + MPLUGIN-525: Remove ant and beanshell support
-    + MPLUGIN-527: Remove javadoc annotation support
-  * Deprecated
-    + MPLUGIN-530: Deprecate o.a.m.plugins.annotations.Component
-  * Documentation updates
-    + MNGSITE-529: Rename "Goals" to "Plugin Documentation"
-    + Update document to use Guice constructor injection
-  * Maintenance
-    + Run the v4 mojo
-    + Update site descriptors to 2.0
-    + Cleanup dependencies
-    + Use injection instead of Component annotation
-    + Use properties for versions in components.xml
-    + Bump parent, asm - JDK 25 build
-    + feat: enable prevent branch protection rules
-    + Add support for Maven 4
-      PluginDescriptor.getRequiredJavaVersion() method
-    + MPLUGIN-542: Update QDox to 2.2.0
-    + MPLUGIN-541: Rename report from "Plugin Documentation" to "Plugin
-    + Begin converting this plugin to Guice constructor injection
-    + refactor: Replace Plexus AbstractLogEnabled with SLF4J
- Modified patch:
-  * maven-plugin-plugin-bootstrap-resouces.patch
-    + rediff from the non-bootstrap build in cycle
-
 -------------------------------------------------------------------
 Sat Oct 25 05:45:05 UTC 2025 - Fridrich Strba <fstrba@suse.com>

--- a/maven-plugin-plugin-bootstrap.spec
+++ b/maven-plugin-plugin-bootstrap.spec
@@ -16,19 +16,16 @@
 #


-%global base_ver 4.0.0
-%global beta_ver 2
-%global file_ver %{base_ver}-beta-%{beta_ver}
 %global base_name maven-plugin-tools
 %global artifactId maven-plugin-plugin
 Name:           %{artifactId}-bootstrap
-Version:        %{base_ver}~beta%{beta_ver}
+Version:        3.15.2
 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}/%{file_ver}/%{base_name}-%{file_ver}-source-release.zip
+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:         0002-Remove-dependency-on-jtidy.patch
 # The maven-plugin-plugin is used to generate those descriptors, which
@@ -40,15 +37,14 @@ BuildRequires:  atinject
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
+BuildRequires:  maven-plugin-tools-annotations
 BuildRequires:  maven-plugin-tools-api
 BuildRequires:  maven-plugin-tools-generators
 BuildRequires:  maven-resolver-api
 BuildRequires:  maven-resolver-util
-BuildRequires:  objectweb-asm >= 9.9
 BuildRequires:  plexus-build-api0
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
-BuildRequires:  sisu-inject
 BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildArch:      noarch
@@ -60,9 +56,9 @@ Xdoc files for the Mojos as well as for updating the plugin registry, the
 artifact metadata and a generic help goal.

 %prep
-%setup -q -n %{base_name}-%{file_ver} -a1
+%setup -q -n %{base_name}-%{version} -a1
 %patch -P 0 -p1
-%patch -P 20 -p1
+%patch -P 20

 %pom_remove_plugin -r :maven-enforcer-plugin

@@ -70,6 +66,10 @@ artifact metadata and a generic help goal.
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"

+%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
 mkdir -p lib
 build-jar-repository -s lib \
@@ -85,8 +85,6 @@ build-jar-repository -s lib \
    maven-plugin-tools/maven-plugin-tools-generators \
    maven-resolver/maven-resolver-api \
    maven-resolver/maven-resolver-util \
-    objectweb-asm/asm \
-    org.eclipse.sisu.inject \
    org.eclipse.sisu.plexus \
    plexus/plexus-build-api0 \
    plexus/utils \
@@ -102,7 +100,7 @@ popd
 %install
 # jar
 install -dm 0755 %{buildroot}%{_javadir}/%{base_name}
-install -pm 0644 %{artifactId}/target/%{artifactId}-%{file_ver}.jar %{buildroot}%{_javadir}/%{base_name}/%{artifactId}.jar
+install -pm 0644 %{artifactId}/target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/%{artifactId}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{base_name}
 %{mvn_install_pom} %{artifactId}/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}/%{artifactId}.pom
--- a/maven-plugin-plugin.changes
+++ b/maven-plugin-plugin.changes
@@ -1,36 +1,3 @@
-------------------------------------------------------------------
-Sat Nov  8 18:45:34 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
- Upgrade to upstream version 4.0.0-beta-2
- Supports generating metadata for plugins using Maven 3 API as well
-  as those using Maven 4 API
- Principal changes
-  * Removals
-    + MPLUGIN-525: Remove ant and beanshell support
-    + MPLUGIN-527: Remove javadoc annotation support
-  * Deprecated
-    + MPLUGIN-530: Deprecate o.a.m.plugins.annotations.Component
-  * Documentation updates
-    + MNGSITE-529: Rename "Goals" to "Plugin Documentation"
-    + Update document to use Guice constructor injection
-  * Maintenance
-    + Run the v4 mojo
-    + Update site descriptors to 2.0
-    + Cleanup dependencies
-    + Use injection instead of Component annotation
-    + Use properties for versions in components.xml
-    + Bump parent, asm - JDK 25 build
-    + feat: enable prevent branch protection rules
-    + Add support for Maven 4
-      PluginDescriptor.getRequiredJavaVersion() method
-    + MPLUGIN-542: Update QDox to 2.2.0
-    + MPLUGIN-541: Rename report from "Plugin Documentation" to "Plugin
-    + Begin converting this plugin to Guice constructor injection
-    + refactor: Replace Plexus AbstractLogEnabled with SLF4J
- Modified patch:
-  * maven-plugin-plugin-bootstrap-resouces.patch
-    + rediff from the non-bootstrap build in cycle
-
 -------------------------------------------------------------------
 Sat Oct 25 05:45:05 UTC 2025 - Fridrich Strba <fstrba@suse.com>

--- a/maven-plugin-plugin.spec
+++ b/maven-plugin-plugin.spec
@@ -16,18 +16,15 @@
 #


-%global base_ver 4.0.0
-%global beta_ver 2
-%global file_ver %{base_ver}-beta-%{beta_ver}
 %global base_name maven-plugin-tools
 Name:           maven-plugin-plugin
-Version:        %{base_ver}~beta%{beta_ver}
+Version:        3.15.2
 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}/%{file_ver}/%{base_name}-%{file_ver}-source-release.zip
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
 Patch0:         0002-Remove-dependency-on-jtidy.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
@@ -37,6 +34,7 @@ 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-api)
 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.resolver:maven-resolver-api)
 BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-util)
@@ -50,7 +48,6 @@ BuildRequires:  mvn(org.apache.maven:maven-settings)
 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.ow2.asm:asm) >= 9.9
 BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
 Obsoletes:      %{name}-bootstrap
 #!BuildRequires: maven-compiler-plugin-bootstrap
@@ -74,7 +71,7 @@ Group:          Development/Libraries/Java
 API documentation for %{name}.

 %prep
-%setup -q -n %{base_name}-%{file_ver}
+%setup -q -n %{base_name}-%{version}
 %patch -P 0 -p1

 %pom_remove_plugin -r :maven-enforcer-plugin
@@ -84,6 +81,10 @@ API documentation for %{name}.
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"

+%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}
--- a/maven-plugin-report-plugin.changes
+++ b/maven-plugin-report-plugin.changes
@@ -1,36 +1,3 @@
-------------------------------------------------------------------
-Sat Nov  8 18:45:34 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
- Upgrade to upstream version 4.0.0-beta-2
- Supports generating metadata for plugins using Maven 3 API as well
-  as those using Maven 4 API
- Principal changes
-  * Removals
-    + MPLUGIN-525: Remove ant and beanshell support
-    + MPLUGIN-527: Remove javadoc annotation support
-  * Deprecated
-    + MPLUGIN-530: Deprecate o.a.m.plugins.annotations.Component
-  * Documentation updates
-    + MNGSITE-529: Rename "Goals" to "Plugin Documentation"
-    + Update document to use Guice constructor injection
-  * Maintenance
-    + Run the v4 mojo
-    + Update site descriptors to 2.0
-    + Cleanup dependencies
-    + Use injection instead of Component annotation
-    + Use properties for versions in components.xml
-    + Bump parent, asm - JDK 25 build
-    + feat: enable prevent branch protection rules
-    + Add support for Maven 4
-      PluginDescriptor.getRequiredJavaVersion() method
-    + MPLUGIN-542: Update QDox to 2.2.0
-    + MPLUGIN-541: Rename report from "Plugin Documentation" to "Plugin
-    + Begin converting this plugin to Guice constructor injection
-    + refactor: Replace Plexus AbstractLogEnabled with SLF4J
- Modified patch:
-  * maven-plugin-plugin-bootstrap-resouces.patch
-    + rediff from the non-bootstrap build in cycle
-
 -------------------------------------------------------------------
 Thu Nov  6 20:51:03 UTC 2025 - Fridrich Strba <fstrba@suse.com>

--- a/maven-plugin-report-plugin.spec
+++ b/maven-plugin-report-plugin.spec
@@ -16,18 +16,15 @@
 #


-%global base_ver 4.0.0
-%global beta_ver 2
-%global file_ver %{base_ver}-beta-%{beta_ver}
 %global base_name maven-plugin-tools
 Name:           maven-plugin-report-plugin
-Version:        %{base_ver}~beta%{beta_ver}
+Version:        3.15.2
 Release:        0
-Summary:        Maven Plugin Plugin
+Summary:        Maven Plugin Report 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}/%{file_ver}/%{base_name}-%{file_ver}-source-release.zip
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
 Patch0:         0002-Remove-dependency-on-jtidy.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
@@ -53,10 +50,8 @@ BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildArch:      noarch

 %description
-The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's
-found in the source tree, to include in the JAR. It is also used to generate
-Xdoc files for the Mojos as well as for updating the plugin registry, the
-artifact metadata and a generic help goal.
+The Plugin Report Plugin is used to create reports about the plugin being
+built.

 %package javadoc
 Summary:        Javadoc for %{name}
@@ -66,7 +61,7 @@ Group:          Development/Libraries/Java
 API documentation for %{name}.

 %prep
-%setup -q -n %{base_name}-%{file_ver}
+%setup -q -n %{base_name}-%{version}
 %patch -P 0 -p1

 %pom_remove_plugin -r :maven-enforcer-plugin
@@ -76,6 +71,10 @@ API documentation for %{name}.
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"

+%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}
--- a/maven-plugin-tools-3.15.2-source-release.zip
+++ b/maven-plugin-tools-3.15.2-source-release.zip
--- a/maven-plugin-tools-4.0.0-beta-2-source-release.zip
+++ b/maven-plugin-tools-4.0.0-beta-2-source-release.zip
--- a/maven-plugin-tools-build.tar.xz
+++ b/maven-plugin-tools-build.tar.xz
--- a/maven-plugin-tools.changes
+++ b/maven-plugin-tools.changes
@@ -1,36 +1,3 @@
-------------------------------------------------------------------
-Sat Nov  8 18:45:34 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
- Upgrade to upstream version 4.0.0-beta-2
- Supports generating metadata for plugins using Maven 3 API as well
-  as those using Maven 4 API
- Principal changes
-  * Removals
-    + MPLUGIN-525: Remove ant and beanshell support
-    + MPLUGIN-527: Remove javadoc annotation support
-  * Deprecated
-    + MPLUGIN-530: Deprecate o.a.m.plugins.annotations.Component
-  * Documentation updates
-    + MNGSITE-529: Rename "Goals" to "Plugin Documentation"
-    + Update document to use Guice constructor injection
-  * Maintenance
-    + Run the v4 mojo
-    + Update site descriptors to 2.0
-    + Cleanup dependencies
-    + Use injection instead of Component annotation
-    + Use properties for versions in components.xml
-    + Bump parent, asm - JDK 25 build
-    + feat: enable prevent branch protection rules
-    + Add support for Maven 4
-      PluginDescriptor.getRequiredJavaVersion() method
-    + MPLUGIN-542: Update QDox to 2.2.0
-    + MPLUGIN-541: Rename report from "Plugin Documentation" to "Plugin
-    + Begin converting this plugin to Guice constructor injection
-    + refactor: Replace Plexus AbstractLogEnabled with SLF4J
- Modified patch:
-  * maven-plugin-plugin-bootstrap-resouces.patch
-    + rediff from the non-bootstrap build in cycle
-
 -------------------------------------------------------------------
 Sat Oct 25 05:45:05 UTC 2025 - Fridrich Strba <fstrba@suse.com>

--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -16,21 +16,19 @@
 #


-%global base_ver 4.0.0
-%global beta_ver 2
-%global file_ver %{base_ver}-beta-%{beta_ver}
 Name:           maven-plugin-tools
-Version:        %{base_ver}~beta%{beta_ver}
+Version:        3.15.2
 Release:        0
 Summary:        Maven Plugin Tools
 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/%{name}/%{file_ver}/%{name}-%{file_ver}-source-release.zip
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.tar.xz
 Patch0:         0002-Remove-dependency-on-jtidy.patch
 BuildRequires:  ant
 BuildRequires:  atinject
+BuildRequires:  bsh2
 BuildRequires:  fdupes
 BuildRequires:  httpcomponents-client
 BuildRequires:  httpcomponents-core
@@ -41,8 +39,11 @@ BuildRequires:  maven-lib
 BuildRequires:  maven-reporting-api
 BuildRequires:  maven-resolver-api
 BuildRequires:  maven-wagon-provider-api
+BuildRequires:  modello >= 2.0.0
 BuildRequires:  objectweb-asm >= 9.9
+BuildRequires:  plexus-ant-factory
 BuildRequires:  plexus-archiver
+BuildRequires:  plexus-bsh-factory
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-languages
 BuildRequires:  plexus-utils
@@ -54,9 +55,6 @@ BuildRequires:  sisu-plexus
 BuildRequires:  slf4j
 BuildRequires:  unzip
 BuildRequires:  velocity
-BuildRequires:  xmvn-install
-BuildRequires:  xmvn-resolve
-BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildArch:      noarch

 %description
@@ -77,21 +75,28 @@ Group:          Development/Libraries/Java
 %description annotations
 This package provides Java 5 annotation tools for use with Apache Maven.

+%package ant
+Summary:        Maven Plugin Tool for Ant
+Group:          Development/Libraries/Java
+
+%description ant
+Descriptor extractor for plugins written in Ant.
+
 %package api
 Summary:        Maven Plugin Tools APIs
 Group:          Development/Libraries/Java
-# Packages removed between 3.x and 4.x
-Obsoletes:      %{name}-ant
-Obsoletes:      %{name}-beanshell
-Obsoletes:      %{name}-java
-Obsoletes:      %{name}-model
-Obsoletes:      maven-script-ant
-Obsoletes:      maven-script-beanshell

 %description api
 The Maven Plugin Tools API provides an API to extract information from
 and generate documentation for Maven Plugins.

+%package beanshell
+Summary:        Maven Plugin Tool for Beanshell
+Group:          Development/Libraries/Java
+
+%description beanshell
+Descriptor extractor for plugins written in Beanshell.
+
 %package generators
 Summary:        Maven Plugin Tools Generators
 Group:          Development/Libraries/Java
@@ -100,15 +105,48 @@ Group:          Development/Libraries/Java
 The Maven Plugin Tools Generators provides content generation
 (documentation, help) from plugin descriptor.

+%package java
+Summary:        Maven Plugin Tool for Java
+Group:          Development/Libraries/Java
+
+%description java
+Descriptor extractor for plugins written in Java.
+
+%package model
+Summary:        Maven Plugin Metadata Model
+Group:          Development/Libraries/Java
+
+%description model
+The Maven Plugin Metadata Model provides an API to play with the Metadata
+model.
+
+%package -n maven-script-ant
+Summary:        Maven Ant Mojo Support
+Group:          Development/Libraries/Java
+
+%description -n maven-script-ant
+This package provides %{summary}, which write Maven plugins with
+Ant scripts.
+
+%package -n maven-script-beanshell
+Summary:        Maven Beanshell Mojo Support
+Group:          Development/Libraries/Java
+
+%description -n maven-script-beanshell
+This package provides %{summary}, which write Maven plugins with
+Beanshell scripts.
+
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
+Provides:       %{name}-javadocs = %{version}-%{release}
+Obsoletes:      %{name}-javadocs < %{version}-%{release}

 %description javadoc
 API documentation for %{name}.

 %prep
-%setup -q -a1 -n %{name}-%{file_ver}
+%setup -q -a1
 %patch -P 0 -p1

 %pom_remove_plugin -r :maven-enforcer-plugin
@@ -119,20 +157,16 @@ API documentation for %{name}.

 %pom_remove_dep net.sf.jtidy:jtidy maven-plugin-tools-generators

-%{mvn_package} :maven-plugin-tools __noinstall
-%{mvn_package} :maven-script __noinstall
-%{mvn_package} :{*} @1
-
 %build
 mkdir -p lib
 build-jar-repository -s lib \
+    ant \
    atinject \
+    bsh2/bsh \
    httpcomponents/httpclient \
    httpcomponents/httpcore \
    jsoup/jsoup \
-    maven/maven-api-plugin \
    maven/maven-artifact \
-    maven/maven-compat \
    maven/maven-core \
    maven/maven-model \
    maven/maven-plugin-api \
@@ -145,7 +179,9 @@ build-jar-repository -s lib \
    objectweb-asm/asm-util \
    org.eclipse.sisu.inject \
    org.eclipse.sisu.plexus \
+    plexus/ant-factory \
    plexus/archiver \
+    plexus/bsh-factory \
    plexus-classworlds \
    plexus-languages/plexus-java \
    plexus/utils \
@@ -159,21 +195,36 @@ build-jar-repository -s lib \
    -Dtest.skip=true \
    package javadoc

-%{mvn_artifact} pom.xml
-mkdir -p target/site/apidocs
+%install
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 for i in \
    maven-plugin-annotations \
    maven-plugin-tools-annotations \
    maven-plugin-tools-api \
-    maven-plugin-tools-generators; do
-  %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{file_ver}.jar
+    maven-plugin-tools-generators \
+    maven-plugin-tools-java; do
+  install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
+  %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
  if [ -d ${i}/target/site/apidocs ]; then
-    cp -r ${i}/target/site/apidocs target/site/apidocs/${i}
+    cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
+  fi
+done
+for i in \
+    maven-plugin-tools-ant \
+    maven-plugin-tools-beanshell \
+    maven-plugin-tools-model \
+    maven-script-ant \
+    maven-script-beanshell; do
+  install -pm 0644 maven-script/${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
+  %{mvn_install_pom} maven-script/${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
+  if [ -d maven-script/${i}/target/site/apidocs ]; then
+    cp -r maven-script/${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
  fi
 done
-
-%install
-%mvn_install
 %fdupes -s %{buildroot}%{_javadocdir}

 %files -n maven-plugin-annotations -f .mfiles-maven-plugin-annotations
@@ -181,12 +232,28 @@ done
 %files annotations -f .mfiles-maven-plugin-tools-annotations
 %license LICENSE NOTICE

+%files ant -f .mfiles-maven-plugin-tools-ant
+
 %files api -f .mfiles-maven-plugin-tools-api
 %license LICENSE NOTICE

+%files beanshell -f .mfiles-maven-plugin-tools-beanshell
+
 %files generators -f .mfiles-maven-plugin-tools-generators

-%files javadoc -f .mfiles-javadoc
+%files java -f .mfiles-maven-plugin-tools-java
+
+%files model -f .mfiles-maven-plugin-tools-model
+%license LICENSE NOTICE
+
+%files -n maven-script-ant -f .mfiles-maven-script-ant
+%license LICENSE NOTICE
+
+%files -n maven-script-beanshell -f .mfiles-maven-script-beanshell
+%license LICENSE NOTICE
+
+%files javadoc
+%{_javadocdir}/%{name}
 %license LICENSE NOTICE

 %changelog
Author	SHA256	Message	Date
Fridrich Štrba	3b6a5ab7a9	Merge commit '5af6d5b803d371ca3f9ae68b105b06f9aa68026fdbe5f11e70d201d5a2ddde9e' into fixes	2025-11-19 14:09:03 +01:00
Dominique Leuenberger	8d42c2e2ce	Accepting request 1219150 from Java:packages 3.15.1 OBS-URL: https://build.opensuse.org/request/show/1219150 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-plugin-tools?expand=0&rev=16	2024-10-30 16:35:07 +00:00
Fridrich Strba	b8ad179398	OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=63	2024-10-29 18:19:57 +00:00
Fridrich Strba	3973a61d85	OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=62	2024-10-26 03:00:48 +00:00
Ana Guerrero	fadd99f960	Accepting request 1205306 from Java:packages 3.15.0 OBS-URL: https://build.opensuse.org/request/show/1205306 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-plugin-tools?expand=0&rev=15	2024-10-02 19:36:25 +00:00
Fridrich Strba	e8bf0e0aff	OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=60	2024-10-02 17:52:38 +00:00
Fridrich Strba	5c3ca6ee45	OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=59	2024-09-29 18:09:11 +00:00