Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package munge-maven-plugin for openSUSE:Factory checked in at 2025-03-27 22:33:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/munge-maven-plugin (Old) and /work/SRC/openSUSE:Factory/.munge-maven-plugin.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "munge-maven-plugin" Thu Mar 27 22:33:59 2025 rev:3 rq:1258644 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/munge-maven-plugin/munge-maven-plugin.changes 2022-03-21 20:13:42.076539679 +0100 +++ /work/SRC/openSUSE:Factory/.munge-maven-plugin.new.2696/munge-maven-plugin.changes 2025-03-27 22:34:36.274326562 +0100 @@ -1,0 +2,8 @@ +Thu Mar 27 14:04:41 UTC 2025 - Fridrich Strba <fst...@suse.com> + +- Added patch: + * munge-maven-plugin-mpt4.patch + + port the plugin to java-annotations extractor instead of the + deprecated java-javadoc one + +------------------------------------------------------------------- New: ---- munge-maven-plugin-mpt4.patch BETA DEBUG BEGIN: New:- Added patch: * munge-maven-plugin-mpt4.patch + port the plugin to java-annotations extractor instead of the BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ munge-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.yF9RTJ/_old 2025-03-27 22:34:38.458416968 +0100 +++ /var/tmp/diff_new_pack.yF9RTJ/_new 2025-03-27 22:34:38.482417962 +0100 @@ -1,7 +1,7 @@ # # spec file for package munge-maven-plugin # -# Copyright (c) 2022 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 @@ -24,6 +24,7 @@ Group: Development/Libraries/Java URL: https://github.com/sonatype/munge-maven-plugin Source0: https://github.com/sonatype/munge-maven-plugin/archive/munge-maven-plugin-1.0.tar.gz +Patch0: munge-maven-plugin-mpt4.patch BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: maven-local @@ -63,6 +64,9 @@ %prep %setup -q -n %{name}-%{name}-%{version} +%patch -P 0 -p1 + +%pom_add_dep org.apache.maven.plugin-tools:maven-plugin-annotations:3.15.1:provided %build %{mvn_build} -f -- \ ++++++ munge-maven-plugin-mpt4.patch ++++++ --- munge-maven-plugin-munge-maven-plugin-1.0/src/main/java/org/sonatype/plugins/munge/MungeForkMojo.java 2025-03-27 08:17:52.000723698 +0100 +++ munge-maven-plugin-munge-maven-plugin-1.0/src/main/java/org/sonatype/plugins/munge/MungeForkMojo.java 2025-03-27 08:23:28.173882586 +0100 @@ -3,12 +3,17 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; + /** * Forks a new build that compiles and runs tests using the munged source in place of the original. * - * @goal munge-fork - * @execute lifecycle=munge phase=prepare-package */ +@Mojo( name = "munge-fork" ) +@Execute ( phase = LifecyclePhase.PREPARE_PACKAGE, + lifecycle = "munge" ) public class MungeForkMojo extends AbstractMojo { --- munge-maven-plugin-munge-maven-plugin-1.0/src/main/java/org/sonatype/plugins/munge/MungeMojo.java 2025-03-27 08:17:52.000759442 +0100 +++ munge-maven-plugin-munge-maven-plugin-1.0/src/main/java/org/sonatype/plugins/munge/MungeMojo.java 2025-03-27 08:39:18.397497457 +0100 @@ -5,6 +5,9 @@ import java.util.List; import org.apache.maven.model.Build; +import org.apache.maven.plugins.annotations.LifecyclePhase; +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.MojoExecutionException; import org.apache.maven.project.MavenProject; @@ -18,48 +21,46 @@ * @goal munge * @phase generate-sources */ +@Mojo( name = "munge", + defaultPhase = LifecyclePhase.GENERATE_SOURCES ) public class MungeMojo extends AbstractMojo { /** * Where to put the munged source files. * - * @parameter default-value="${project.build.directory}/munged" */ + @Parameter( defaultValue = "${project.build.directory}/munged" ) private String mungedDirectory; /** * List of symbols (separated by commas) identifying which sections of munged code to keep. * - * @parameter default-value="${symbols}" - * @required */ + @Parameter( defaultValue = "${symbols}", + required = true ) private String symbols; /** * List of patterns (separated by commas) specifying files that should be munged; by default munge everything. * - * @parameter default-value="${includes}" */ + @Parameter( defaultValue = "${includes}" ) private String includes; /** * List of patterns (separated by commas) specifying files that should not be copied; by default exclude nothing. * - * @parameter default-value="${excludes}" */ + @Parameter( defaultValue = "${excludes}" ) private String excludes; - /** - * @parameter expression="${project.build}" - * @readonly - */ + @Parameter( property = "project.build", + readonly = true ) private Build build; - /** - * @parameter expression="${executedProject}" - * @readonly - */ + @Parameter(property = "executedProject", + readonly = true ) private MavenProject executedProject; @SuppressWarnings( "unchecked" )