From 53524f50a1e9ddd3c16ee6683555683ca70f5212 Mon Sep 17 00:00:00 2001 From: fstrba <> Date: Thu, 14 Sep 2023 14:25:37 +0000 Subject: [PATCH] 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 --- packages/x/xmvn/.files | Bin 759 -> 860 bytes packages/x/xmvn/.rev | 8 ++++++ ...tray-options-file-in-the-generated-j.patch | 26 ++++++++++++++++++ packages/x/xmvn/xmvn-connector.changes | 8 ++++++ packages/x/xmvn/xmvn-connector.spec | 1 + packages/x/xmvn/xmvn-mojo.changes | 8 ++++++ packages/x/xmvn/xmvn-mojo.spec | 1 + packages/x/xmvn/xmvn-parent.changes | 8 ++++++ packages/x/xmvn/xmvn-parent.spec | 1 + packages/x/xmvn/xmvn-tools.changes | 8 ++++++ packages/x/xmvn/xmvn-tools.spec | 1 + 11 files changed, 70 insertions(+) create mode 100644 packages/x/xmvn/0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch diff --git a/packages/x/xmvn/.files b/packages/x/xmvn/.files index 8185210e95752425f408738ebf25f9430078a2f5..f2868086e842815d503c0d22af33a61b3f7d1438 100644 GIT binary patch delta 502 zcmYMxJ&uzx5P;!i(Nd&XB#?H6D98mIjsM3L4TqpYvd7~jtHl14&sw133?YZ$C|rVq zThLVg-!J#m+~IchVzF4fTCJ_s8c=a5Y%*$c(iIhh)=tV&d>&KxUyn~! zP^*=xx6_7pv2J-@ttI3blrpa5$dRN92{0wL2DD>_%b(@_g>JUzJNZ5ibq_QTFc+EcR9O9g8hjKE=*iJZ`4g zX?OW`1LvRN{6&4DfJ%XJo>P%Yqoi@yd5wm&Rx%Ce>#MW3c9@@;TnrdV(#DXD%97E@ zM4G|L5Q2pB=eKL;QZS?XNUA}y;t>QHefPW0vQ4!8x&y3C0E(a+v>HQbJw=Q zeYaU`*TRQ~5gu+wZYLI$ErMtS$w-QX=-3e@t2_Z#{^G>$SS)jf5KUkfM%wohxL^=QAFM7uW~cM9{`4=<@p8?Kh%g3M*P&KqIFR@_srOIy6)b@c&%@jOZh80| G&c6XIa(kly diff --git a/packages/x/xmvn/.rev b/packages/x/xmvn/.rev index fb59ef3ac63..5b4a86a8d50 100644 --- a/packages/x/xmvn/.rev +++ b/packages/x/xmvn/.rev @@ -127,4 +127,12 @@ Try to make the split packages UUIDs unique 1101926 + + b6703a7a481869033d53b2dd9ef7b83e + 4.2.0 + + anag+factory + Reproducible: temporary file in generated javadoc + 1110989 + 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 new file mode 100644 index 00000000000..e2b7e0af9b1 --- /dev/null +++ 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?= +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 index bf5795c1f52..13560a8bd5d 100644 --- 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 + +- 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 diff --git a/packages/x/xmvn/xmvn-connector.spec b/packages/x/xmvn/xmvn-connector.spec index 120fe05327d..b582f2f6710 100644 --- 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 index 45f7d1ff026..ae96781affc 100644 --- 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 + +- 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 diff --git a/packages/x/xmvn/xmvn-mojo.spec b/packages/x/xmvn/xmvn-mojo.spec index 3bc9bb4e1ad..9cab50f31dc 100644 --- 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 index 1f6bd805746..503aa6f5fe2 100644 --- 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 + +- 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 diff --git a/packages/x/xmvn/xmvn-parent.spec b/packages/x/xmvn/xmvn-parent.spec index 9723f6a77a2..7ecd3257a08 100644 --- 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 index 6b39a18190f..42d0f54038d 100644 --- 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 + +- 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 diff --git a/packages/x/xmvn/xmvn-tools.spec b/packages/x/xmvn/xmvn-tools.spec index 4c460f5d405..7b423da591c 100644 --- 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