From 20f579c5e6f09850818dbf6cee62551724d6f4bb35e45b5e7e28ba7e149b0491 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 08:43:30 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=72 --- UUID.patch | 31 +++++++++++++++++++++++++++++++ xmvn-connector.spec | 1 + xmvn-mojo.spec | 1 + xmvn-parent.spec | 1 + xmvn-tools.spec | 1 + 5 files changed, 35 insertions(+) create mode 100644 UUID.patch diff --git a/UUID.patch b/UUID.patch new file mode 100644 index 0000000..77897aa --- /dev/null +++ b/UUID.patch @@ -0,0 +1,31 @@ +--- xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java 2023-07-24 10:18:52.523347251 +0200 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java 2023-07-24 10:40:07.518257625 +0200 +@@ -185,7 +185,7 @@ + am.setNamespace( repo.getNamespace() ); + + // UUID +- am.setUuid( UUID.randomUUID().toString() ); ++ am.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() ); + + // Compat version + for ( String version : rule.getVersions() ) +--- xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 10:18:52.523347251 +0200 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 10:40:32.748290757 +0200 +@@ -58,7 +58,7 @@ + super( id ); + this.basePackageName = basePackageName; + this.metadataDir = metadataDir; +- metadata.setUuid( UUID.randomUUID().toString() ); ++ metadata.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() ); + } + + /** +@@ -71,7 +71,7 @@ + private PackageMetadata getSplitMetadata( String namespace ) + { + PackageMetadata splitMetadata = new PackageMetadata(); +- splitMetadata.setUuid( UUID.randomUUID().toString() ); ++ splitMetadata.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() ); + splitMetadata.setProperties( metadata.getProperties() ); + List allArtifacts = metadata.getArtifacts(); + List splitArtifacts = diff --git a/xmvn-connector.spec b/xmvn-connector.spec index e574e41..f2d977a 100644 --- a/xmvn-connector.spec +++ b/xmvn-connector.spec @@ -28,6 +28,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 Source1: %{parent}-build.tar.xz +Patch0: UUID.patch BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: ant diff --git a/xmvn-mojo.spec b/xmvn-mojo.spec index 1e29a62..b61ff2d 100644 --- a/xmvn-mojo.spec +++ b/xmvn-mojo.spec @@ -26,6 +26,7 @@ License: Apache-2.0 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 BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: fdupes diff --git a/xmvn-parent.spec b/xmvn-parent.spec index 1699351..1f5eb56 100644 --- a/xmvn-parent.spec +++ b/xmvn-parent.spec @@ -26,6 +26,7 @@ License: Apache-2.0 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 BuildRequires: javapackages-local BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) diff --git a/xmvn-tools.spec b/xmvn-tools.spec index fc0fddd..c1858e2 100644 --- a/xmvn-tools.spec +++ b/xmvn-tools.spec @@ -27,6 +27,7 @@ Group: Development/Tools/Building 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 BuildRequires: ant BuildRequires: apache-commons-compress BuildRequires: atinject