[Git][java-team/gettext-maven-plugin][master] 3 commits: Fixed the compatibility with maven-reporting 4.0.0

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gettext-maven-plugin


Commits:
0a047eca by Emmanuel Bourg at 2024-10-24T14:06:39+02:00
Fixed the compatibility with maven-reporting 4.0.0

- - - - -
86980398 by Emmanuel Bourg at 2024-10-24T14:06:48+02:00
Standards-Version updated to 4.7.0

- - - - -
9db95fa4 by Emmanuel Bourg at 2024-10-24T14:07:01+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/maven.rules
- debian/patches/maven-reporting.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+gettext-maven-plugin (1.2.9-5) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the compatibility with maven-reporting 4.0.0
+  * Standards-Version updated to 4.7.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 24 Oct 2024 14:06:56 +0200
+
 gettext-maven-plugin (1.2.9-4) unstable; urgency=medium
 
   * Remove debian/watch because there will be no other releases.


=====================================
debian/control
=====================================
@@ -9,11 +9,11 @@ Build-Depends:
  default-jdk,
  maven-debian-helper (>= 2.1),
  libmaven-plugin-tools-java (>= 3.5),
- libmaven-reporting-api-java,
- libmaven-reporting-impl-java,
+ libmaven-reporting-api-java (>= 4.0.0),
+ libmaven-reporting-impl-java (>= 4.0.0),
  libmaven3-core-java (>= 2.0),
  libplexus-utils2-java
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Vcs-Git: https://salsa.debian.org/java-team/gettext-maven-plugin.git
 Vcs-Browser: https://salsa.debian.org/java-team/gettext-maven-plugin
 Homepage: https://github.com/rlf/maven-gettext-plugin


=====================================
debian/maven.rules
=====================================
@@ -1,4 +1,3 @@
 
 org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
 org.apache.maven maven-* * s/.*/3.x/ * *
-org.apache.maven.reporting maven-reporting-api * s/.*/3.x/ * *


=====================================
debian/patches/maven-reporting.patch
=====================================
@@ -9,17 +9,30 @@ Forwarded: no
  src/main/java/org/xnap/commons/maven/gettext/ReportMojo.java | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/src/main/java/org/xnap/commons/maven/gettext/ReportMojo.java b/src/main/java/org/xnap/commons/maven/gettext/ReportMojo.java
-index 10befd5..13abc15 100644
 --- a/src/main/java/org/xnap/commons/maven/gettext/ReportMojo.java
 +++ b/src/main/java/org/xnap/commons/maven/gettext/ReportMojo.java
-@@ -38,9 +38,7 @@ import org.apache.maven.plugin.MojoExecutionException;
+@@ -38,9 +38,7 @@
  import org.apache.maven.project.MavenProject;
  import org.apache.maven.reporting.AbstractMavenReport;
  import org.apache.maven.reporting.MavenReportException;
 -import org.codehaus.doxia.module.xhtml.XhtmlSink;
- import org.codehaus.doxia.sink.Sink;
+-import org.codehaus.doxia.sink.Sink;
 -import org.codehaus.doxia.site.renderer.SiteRenderer;
++import org.apache.maven.doxia.sink.Sink;
  import org.codehaus.plexus.util.DirectoryScanner;
  import org.codehaus.plexus.util.cli.CommandLineException;
  import org.codehaus.plexus.util.cli.CommandLineUtils;
+--- a/pom.xml
++++ b/pom.xml
+@@ -57,6 +57,11 @@
+       <version>2.0</version>
+     </dependency>
+     <dependency>
++      <groupId>org.apache.maven</groupId>
++      <artifactId>maven-core</artifactId>
++      <version>debian</version>
++    </dependency>
++    <dependency>
+       <groupId>junit</groupId>
+       <artifactId>junit</artifactId>
+       <version>3.8.1</version>



View it on GitLab: https://salsa.debian.org/java-team/gettext-maven-plugin/-/compare/af4fab42b234db0aef7a45d066e963c55d4bdb93...9db95fa4cea66e0049a701db7ce010b995e2c302

-- 
View it on GitLab: https://salsa.debian.org/java-team/gettext-maven-plugin/-/compare/af4fab42b234db0aef7a45d066e963c55d4bdb93...9db95fa4cea66e0049a701db7ce010b995e2c302
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20241024/5b92a986/attachment.htm>