Accepting request 1258733 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/1258733
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cal10n?expand=0&rev=15

cal10n-mpt4.patch

@@ -0,0 +1,71 @@
+--- cal10n-0.8.1.12/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java	2025-03-27 10:22:32.625904888 +0100
++++ cal10n-0.8.1.12/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java	2025-03-27 10:46:49.745357037 +0100
+@@ -37,6 +37,10 @@
+ import org.apache.maven.plugin.AbstractMojo;
+ import org.apache.maven.plugin.MojoExecutionException;
+ import org.apache.maven.plugin.MojoFailureException;
++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.plugins.annotations.ResolutionScope;
+ 
+ import ch.qos.cal10n.verifier.IMessageKeyVerifier;
+ 
+@@ -46,43 +50,40 @@
+ /**
+  * Verifies resources bundles in various locales against an enumType
+  *
+- * @goal verify
+- * @phase verify
+- * @requiresProject true
+- * @requiresDependencyResolution
+  */
++@Mojo( name = "verify",
++       defaultPhase = LifecyclePhase.VERIFY,
++       requiresProject = true,
++       requiresDependencyResolution = ResolutionScope.RUNTIME )
+ public class VerifyMojo extends AbstractMojo {
+ 
+-  /**
+-   * @parameter
+-   * @required
+-   */
++  @Parameter( required = true )
+   private String[] enumTypes;
+ 
+   /**
+    * The directory for compiled classes.
+    * 
+-   * @parameter expression="${project.build.outputDirectory}"
+-   * @required
+-   * @readonly
+    */
++  @Parameter( property = "project.build.outputDirectory",
++              required = true,
++              readonly = true )
+   private File outputDirectory;
+ 
+   // direct dependencies of this project
+   /**
+    * 
+-   * @parameter expression="${project.artifacts}"
+-   * @required
+-   * @readonly
+    */
++  @Parameter( property = "project.artifacts",
++              required = true,
++              readonly = true )
+   private Set<Artifact> projectArtifacts;
+ 
+   /**
+-   * @parameter expression="${localRepository}"
+-   * @required
+-   * @readonly 
+    * @since 1.0
+    */
++  @Parameter( property = "localRepository",
++              required = true,
++              readonly = true )
+   private ArtifactRepository localRepository;
+ 
+   public void execute() throws MojoExecutionException, MojoFailureException {

cal10n.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar 27 14:12:44 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * cal10n-mpt4.patch
+    + port the maven-plugin to java-annotations extractor instead
+      of the deprecated java-javadoc one
+
 -------------------------------------------------------------------
 Thu May  2 14:22:43 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

cal10n.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cal10n
 #
-# Copyright (c) 2024 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
@@ -32,6 +32,7 @@ Source0:        %{base_name}-%{version}.tar.xz
 Source1:        %{base_name}-build.tar.xz
 # https://github.com/qos-ch/cal10n/pull/10
 Patch0:         Fix-SupportedSourceVersion-warning.patch
+Patch1:         cal10n-mpt4.patch
 BuildRequires:  fdupes
 BuildRequires:  xz
 BuildArch:      noarch
@@ -40,6 +41,7 @@ Name:           %{base_name}-maven-plugins
 Summary:        Compiler assisted localization library (CAL10N) maven plugins
 BuildRequires:  maven-local
 BuildRequires:  mvn(ch.qos.cal10n:cal10n-api)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-ssh)
 BuildRequires:  mvn(org.apache.maven:maven-core)
@@ -80,6 +82,9 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{base_name}-%{version} -a1
 %patch -P 0 -p1
+%patch -P 1 -p1
+
+%pom_add_dep org.apache.maven.plugin-tools:maven-plugin-annotations:3.15.1:provided
 
 # We don't want to depend on ant, since it will be
 # present when we try to use the task