Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package string-template-maven-plugin for
openSUSE:Factory checked in at 2025-03-27 22:34:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/string-template-maven-plugin (Old)
and /work/SRC/openSUSE:Factory/.string-template-maven-plugin.new.2696
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "string-template-maven-plugin"
Thu Mar 27 22:34:00 2025 rev:4 rq:1263973 version:1.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/string-template-maven-plugin/string-template-maven-plugin.changes
2023-09-20 13:32:38.506065955 +0200
+++
/work/SRC/openSUSE:Factory/.string-template-maven-plugin.new.2696/string-template-maven-plugin.changes
2025-03-27 22:34:39.550462171 +0100
@@ -1,0 +2,8 @@
+Thu Mar 27 14:02:18 UTC 2025 - Fridrich Strba <[email protected]>
+
+- Added patch:
+ * string-template-maven-plugin-mpt4.patch
+ + port the plugin to java-annotations extractor instead of the
+ deprecated java-javadoc one
+
+-------------------------------------------------------------------
New:
----
string-template-maven-plugin-mpt4.patch
BETA DEBUG BEGIN:
New:- Added patch:
* string-template-maven-plugin-mpt4.patch
+ port the plugin to java-annotations extractor instead of the
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ string-template-maven-plugin.spec ++++++
--- /var/tmp/diff_new_pack.tbmNr8/_old 2025-03-27 22:34:40.650507705 +0100
+++ /var/tmp/diff_new_pack.tbmNr8/_new 2025-03-27 22:34:40.658508037 +0100
@@ -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,10 +25,12 @@
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-core)
@@ -54,6 +56,7 @@
%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 +67,8 @@
%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
+
%build
%{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
++++++ string-template-maven-plugin-mpt4.patch ++++++
---
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
