Update xmvn to version 4.2.0 / rev 17 via SR 1110989

https://build.opensuse.org/request/show/1110989 by user fstrba + anag+factory Reproducible: temporary file in generated javadoc
bmwiedemann · Sep 14, 2023 · 53524f5 · 53524f5
1 parent 8bce1bd
commit 53524f5
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 0 deletions.
diff --git a/packages/x/xmvn/.files b/packages/x/xmvn/.files
diff --git a/packages/x/xmvn/.rev b/packages/x/xmvn/.rev
@@ -127,4 +127,12 @@
     <comment>Try to make the split packages UUIDs unique</comment>
     <requestid>1101926</requestid>
   </revision>
+  <revision rev="17" vrev="5">
+    <srcmd5>b6703a7a481869033d53b2dd9ef7b83e</srcmd5>
+    <version>4.2.0</version>
+    <time>1694701537</time>
+    <user>anag+factory</user>
+    <comment>Reproducible: temporary file in generated javadoc</comment>
+    <requestid>1110989</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/x/xmvn/0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch b/packages/x/xmvn/0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
@@ -0,0 +1,26 @@
+From f75806e845cc26725a0aaf8de0ad6808a98c0f60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Wed, 13 Sep 2023 18:30:26 +0200
+Subject: [PATCH] Do not leave a stray options file in the generated javadoc
+ tree
+
+---
+ .../src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java  | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java
+index f90b6b99..644c3930 100644
+--- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java
++++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java
+@@ -435,6 +435,8 @@ public class JavadocMojo
+                          StandardOpenOption.TRUNCATE_EXISTING );
+
+             invokeJavadoc( outputDir );
++
++            Files.deleteIfExists( outputDir.resolve( "args" ) );
+         }
+         catch ( IOException | InterruptedException e )
+         {
+-- 
+2.42.0
+
diff --git a/packages/x/xmvn/xmvn-connector.changes b/packages/x/xmvn/xmvn-connector.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
+    + Remove generated temporary file from the tree after use, make
+      thus the generated javadoc more reproducible
+
 -------------------------------------------------------------------
 Wed Aug  2 09:46:49 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

diff --git a/packages/x/xmvn/xmvn-connector.spec b/packages/x/xmvn/xmvn-connector.spec
@@ -29,6 +29,7 @@ URL:            https://fedora-java.github.io/xmvn/
 Source0:        https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
 Source1:        %{parent}-build.tar.xz
 Patch0:         UUID.patch
+Patch1:         0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
 BuildRequires:  %{parent}-api = %{version}
 BuildRequires:  %{parent}-core = %{version}
 BuildRequires:  ant

diff --git a/packages/x/xmvn/xmvn-mojo.changes b/packages/x/xmvn/xmvn-mojo.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
+    + Remove generated temporary file from the tree after use, make
+      thus the generated javadoc more reproducible
+
 -------------------------------------------------------------------
 Wed Aug  2 09:46:49 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

diff --git a/packages/x/xmvn/xmvn-mojo.spec b/packages/x/xmvn/xmvn-mojo.spec
@@ -27,6 +27,7 @@ Group:          Development/Tools/Building
 URL:            https://fedora-java.github.io/xmvn/
 Source0:        https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
 Patch0:         UUID.patch
+Patch1:         0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
 BuildRequires:  %{parent}-api = %{version}
 BuildRequires:  %{parent}-core = %{version}
 BuildRequires:  fdupes

diff --git a/packages/x/xmvn/xmvn-parent.changes b/packages/x/xmvn/xmvn-parent.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
+    + Remove generated temporary file from the tree after use, make
+      thus the generated javadoc more reproducible
+
 -------------------------------------------------------------------
 Wed Aug  2 09:46:49 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

diff --git a/packages/x/xmvn/xmvn-parent.spec b/packages/x/xmvn/xmvn-parent.spec
@@ -27,6 +27,7 @@ Group:          Development/Tools/Building
 URL:            https://fedora-java.github.io/xmvn/
 Source0:        https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
 Patch0:         UUID.patch
+Patch1:         0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
 BuildRequires:  javapackages-local
 BuildRequires:  xmvn-resolve
 BuildRequires:  mvn(org.apache.maven.plugins:maven-compiler-plugin)

diff --git a/packages/x/xmvn/xmvn-tools.changes b/packages/x/xmvn/xmvn-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
+    + Remove generated temporary file from the tree after use, make
+      thus the generated javadoc more reproducible
+
 -------------------------------------------------------------------
 Wed Aug  2 09:46:49 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

diff --git a/packages/x/xmvn/xmvn-tools.spec b/packages/x/xmvn/xmvn-tools.spec
@@ -28,6 +28,7 @@ URL:            https://fedora-java.github.io/xmvn/
 Source0:        https://github.com/fedora-java/xmvn/releases/download/%{version}/%{parent}-%{version}.tar.xz
 Source1:        %{parent}-build.tar.xz
 Patch0:         UUID.patch
+Patch1:         0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-compress
 BuildRequires:  atinject