From 00e331a7440cfd992cf6b98ca758e58f448db9a59e7eb23cec941b906085bb6f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 09:25:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=74 --- UUID.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UUID.patch b/UUID.patch index a957631..0090c2a 100644 --- a/UUID.patch +++ b/UUID.patch @@ -1,16 +1,16 @@ --- 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 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java 2023-07-24 11:24:03.362142115 +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() ); ++ am.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+repo.getNamespace()+artifact.toString()).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 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 11:24:48.612204693 +0200 @@ -58,7 +58,7 @@ super( id ); this.basePackageName = basePackageName; @@ -25,7 +25,7 @@ { PackageMetadata splitMetadata = new PackageMetadata(); - splitMetadata.setUuid( UUID.randomUUID().toString() ); -+ splitMetadata.setUuid( UUID.nameUUIDFromBytes(System.getenv("SOURCE_DATE_EPOCH").getBytes()).toString() ); ++ splitMetadata.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+namespace).getBytes()).toString() ); splitMetadata.setProperties( metadata.getProperties() ); List allArtifacts = metadata.getArtifacts(); List splitArtifacts =