Fridrich Strba 2023-09-13 17:00:16 +00:00 committed by Git OBS Bridge
parent 13b752b850
commit cafb45e1ba
9 changed files with 62 additions and 0 deletions

View File

@ -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

View File

@ -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>

View File

@ -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

View File

@ -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>

View File

@ -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

View File

@ -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>

View File

@ -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)

View File

@ -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>

View File

@ -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