From cafb45e1ba072aa8851bff39bf2b6b4ca38c1ccbee3859028f3d40950dc72012 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 13 Sep 2023 17:00:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=81 --- ...tray-options-file-in-the-generated-j.patch | 26 +++++++++++++++++++ xmvn-connector.changes | 8 ++++++ xmvn-connector.spec | 1 + xmvn-mojo.changes | 8 ++++++ xmvn-mojo.spec | 1 + xmvn-parent.changes | 8 ++++++ xmvn-parent.spec | 1 + xmvn-tools.changes | 8 ++++++ xmvn-tools.spec | 1 + 9 files changed, 62 insertions(+) create mode 100644 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch diff --git a/0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch b/0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch new file mode 100644 index 0000000..15cfee6 --- /dev/null +++ b/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/xmvn-connector.changes b/xmvn-connector.changes index 9d1bc4e..19e8d89 100644 --- a/xmvn-connector.changes +++ b/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/xmvn-connector.spec b/xmvn-connector.spec index f2d977a..ff59380 100644 --- a/xmvn-connector.spec +++ b/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/xmvn-mojo.changes b/xmvn-mojo.changes index 3c0a5e1..179da86 100644 --- a/xmvn-mojo.changes +++ b/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/xmvn-mojo.spec b/xmvn-mojo.spec index b61ff2d..c997693 100644 --- a/xmvn-mojo.spec +++ b/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/xmvn-parent.changes b/xmvn-parent.changes index 16b63fc..bc7aa66 100644 --- a/xmvn-parent.changes +++ b/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/xmvn-parent.spec b/xmvn-parent.spec index 1f5eb56..ffeda89 100644 --- a/xmvn-parent.spec +++ b/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/xmvn-tools.changes b/xmvn-tools.changes index e7f8403..5698f0b 100644 --- a/xmvn-tools.changes +++ b/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/xmvn-tools.spec b/xmvn-tools.spec index c1858e2..33a2520 100644 --- a/xmvn-tools.spec +++ b/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