From ce77460aa3e2e5bf012e0be9ab90bf2edb229c96973d4b4fe4bd501f392017fa Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 28 Jul 2023 05:34:53 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=78 --- UUID.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/UUID.patch b/UUID.patch index badafca..996d016 100644 --- a/UUID.patch +++ b/UUID.patch @@ -10,7 +10,7 @@ // 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 11:56:47.481600604 +0200 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-28 07:33:41.305575464 +0200 @@ -58,7 +58,7 @@ super( id ); this.basePackageName = basePackageName; @@ -20,12 +20,16 @@ } /** -@@ -71,7 +71,7 @@ +@@ -71,11 +71,11 @@ private PackageMetadata getSplitMetadata( String namespace ) { PackageMetadata splitMetadata = new PackageMetadata(); - splitMetadata.setUuid( UUID.randomUUID().toString() ); -+ splitMetadata.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+namespace).getBytes()).toString() ); splitMetadata.setProperties( metadata.getProperties() ); List allArtifacts = metadata.getArtifacts(); List splitArtifacts = + allArtifacts.stream().filter( a -> namespace.equals( a.getNamespace() ) ).collect( Collectors.toList() ); ++ splitMetadata.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+splitArtifacts.toString()).getBytes()).toString() ); + splitMetadata.setArtifacts( splitArtifacts ); + splitMetadata.setSkippedArtifacts( metadata.getSkippedArtifacts() ); + return splitMetadata; From 13b752b8508a61c8c1ff006d0acd642c72ccc7668e186ddcb7523265a3c0ad6a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 2 Aug 2023 09:48:19 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=79 --- xmvn-connector.changes | 7 +++++++ xmvn-mojo.changes | 7 +++++++ xmvn-parent.changes | 7 +++++++ xmvn-tools.changes | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/xmvn-connector.changes b/xmvn-connector.changes index 76528a2..9d1bc4e 100644 --- a/xmvn-connector.changes +++ b/xmvn-connector.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 2 09:46:49 UTC 2023 - Fridrich Strba + +- Modified patch: + * UUID.patch + + try to assure unique UUID for each of the split packages. + ------------------------------------------------------------------- Mon Jul 24 19:21:09 UTC 2023 - Fridrich Strba diff --git a/xmvn-mojo.changes b/xmvn-mojo.changes index 9b4e76e..3c0a5e1 100644 --- a/xmvn-mojo.changes +++ b/xmvn-mojo.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 2 09:46:49 UTC 2023 - Fridrich Strba + +- Modified patch: + * UUID.patch + + try to assure unique UUID for each of the split packages. + ------------------------------------------------------------------- Mon Jul 24 19:21:09 UTC 2023 - Fridrich Strba diff --git a/xmvn-parent.changes b/xmvn-parent.changes index 5d759f7..16b63fc 100644 --- a/xmvn-parent.changes +++ b/xmvn-parent.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 2 09:46:49 UTC 2023 - Fridrich Strba + +- Modified patch: + * UUID.patch + + try to assure unique UUID for each of the split packages. + ------------------------------------------------------------------- Mon Jul 24 19:21:09 UTC 2023 - Fridrich Strba diff --git a/xmvn-tools.changes b/xmvn-tools.changes index e7188bb..e7f8403 100644 --- a/xmvn-tools.changes +++ b/xmvn-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 2 09:46:49 UTC 2023 - Fridrich Strba + +- Modified patch: + * UUID.patch + + try to assure unique UUID for each of the split packages. + ------------------------------------------------------------------- Mon Jul 24 19:21:09 UTC 2023 - Fridrich Strba