From b6b104bd0dc23e6fb658b3bf75e05af802bcec9852455ab947dbd3cd5ca2c698 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 20 Sep 2023 19:44:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=86 --- UUID.patch | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/UUID.patch b/UUID.patch index 2e8008f..f51fd3d 100644 --- a/UUID.patch +++ b/UUID.patch @@ -1,3 +1,19 @@ +--- a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java ++++ b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java +@@ -185,7 +185,12 @@ class DefaultArtifactInstaller + am.setNamespace( repo.getNamespace() ); + + // UUID +- am.setUuid( UUID.randomUUID().toString() ); ++ UUID guid = UUID.randomUUID(); ++ if ( System.getenv( "SOURCE_DATE_EPOCH" ) != null ) ++ { ++ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) + repo.getNamespace() + artifact.toString() ).getBytes() ); ++ } ++ am.setUuid( guid.toString() ); + + // Compat version + for ( String version : rule.getVersions() ) --- a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java +++ b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java @@ -58,7 +58,12 @@ public class JavaPackage @@ -32,19 +48,3 @@ splitMetadata.setArtifacts( splitArtifacts ); splitMetadata.setSkippedArtifacts( metadata.getSkippedArtifacts() ); return splitMetadata; ---- a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java -+++ b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java -@@ -185,7 +185,12 @@ class DefaultArtifactInstaller - am.setNamespace( repo.getNamespace() ); - - // UUID -- am.setUuid( UUID.randomUUID().toString() ); -+ UUID guid = UUID.randomUUID(); -+ if ( System.getenv( "SOURCE_DATE_EPOCH" ) != null ) -+ { -+ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) + repo.getNamespace() + artifact.toString() ).getBytes() ); -+ } -+ am.setUuid( guid.toString() ); - - // Compat version - for ( String version : rule.getVersions() )