Accepting request 1287977 from Java:packages

Fix build with up-coming maven 4

OBS-URL: https://build.opensuse.org/request/show/1287977
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/string-template-maven-plugin?expand=0&rev=5

string-template-maven-plugin-mpt4.patch

@@ -0,0 +1,71 @@
+--- string-template-maven-plugin-string-template-maven-plugin-1.1/src/main/java/com/webguys/maven/plugin/st/StringTemplateMojo.java	2025-03-27 07:49:33.275833066 +0100
++++ string-template-maven-plugin-string-template-maven-plugin-1.1/src/main/java/com/webguys/maven/plugin/st/StringTemplateMojo.java	2025-03-27 08:02:43.532207750 +0100
+@@ -28,6 +28,11 @@
+ 
+ import org.apache.maven.ProjectDependenciesResolver;
+ import org.apache.maven.execution.MavenSession;
++
++import org.apache.maven.plugins.annotations.Component;
++import org.apache.maven.plugins.annotations.Mojo;
++import org.apache.maven.plugins.annotations.Parameter;
++
+ import org.apache.maven.plugin.AbstractMojo;
+ import org.apache.maven.plugin.BuildPluginManager;
+ import org.apache.maven.plugin.MojoExecutionException;
+@@ -47,49 +52,43 @@
+ /**
+  * Executes string template using a given controller.
+  *
+- * @goal render
+  */
++@Mojo( name = "render" ) 
+ public class StringTemplateMojo extends AbstractMojo
+ {
+     /**
+      * The Maven Project Object
+      *
+-     * @parameter property="project"
+-     * @required
+-     * @readonly
+      */
++    @Component 
+     private MavenProject project;
+ 
+     /**
+      * The Maven Session Object
+      *
+-     * @parameter property="session"
+-     * @required
+-     * @readonly
+      */
++    @Component
+     private MavenSession session;
+ 
+     /**
+      * The Maven PluginManager Object
+      *
+-     * @component
+-     * @required
+      */
++    @Component
+     private BuildPluginManager pluginManager;
+ 
+     /**
+      * The Maven ProjectDependenciesResolver Object
+      *
+-     * @component
+-     * @required
+      */
++    @Component
+     private ProjectDependenciesResolver dependenciesResolver;
+ 
+     /**
+      * The collection of templates to render.
+-     * @parameter
+-     * @required
++     *
+      */
++    @Parameter( required = true )
+     private List<Template> templates;
+ 
+     @Override

string-template-maven-plugin.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun 23 14:47:55 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build with maven 4
+
+-------------------------------------------------------------------
+Thu Mar 27 14:02:18 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * string-template-maven-plugin-mpt4.patch
+    + port the plugin to java-annotations extractor instead of the
+      deprecated java-javadoc one
+
 -------------------------------------------------------------------
 Tue Sep 19 11:13:02 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

string-template-maven-plugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package string-template-maven-plugin
 #
-# Copyright (c) 2023 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
@@ -25,12 +25,15 @@ Group:          Development/Libraries/Java
 URL:            https://github.com/kevinbirch/%{name}
 Source0:        https://github.com/kevinbirch/%{name}/archive/%{name}-%{version}.tar.gz
 Source1:        https://raw.githubusercontent.com/kevinbirch/%{name}/master/LICENSE
+Patch0:         string-template-maven-plugin-mpt4.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.antlr:ST4)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
@@ -54,6 +57,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
+%patch -P 0 -p1
 cp %{SOURCE1} .
 %pom_change_dep :stringtemplate :ST4
 %pom_change_dep org.sonatype.aether: org.eclipse.aether:
@@ -64,6 +68,10 @@ perl -pi -e 's#org\.sonatype\.aether#org.eclipse.aether#g' \
 %pom_remove_plugin :maven-javadoc-plugin
 %pom_remove_plugin :maven-source-plugin
 
+%pom_add_dep org.apache.maven.plugin-tools:maven-plugin-annotations:3.15.1:provided
+
+%pom_add_dep org.apache.maven:maven-compat:3.0.8
+
 %build
 %{mvn_build} -f -- \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}