From 903caf24bcf3061531dde9f509fe1056b9fa40344e96dd5ac4d37ccd2965c88b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 20 Sep 2023 16:51:13 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=83 --- UUID.patch | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/UUID.patch b/UUID.patch index 996d016..ddb924a 100644 --- a/UUID.patch +++ b/UUID.patch @@ -1,26 +1,38 @@ ---- 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 11:24:03.362142115 +0200 -@@ -185,7 +185,7 @@ +--- 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() ); -+ am.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+repo.getNamespace()+artifact.toString()).getBytes()).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() ) --- 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-28 07:33:41.305575464 +0200 -@@ -58,7 +58,7 @@ +--- 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 super( id ); this.basePackageName = basePackageName; this.metadataDir = metadataDir; - metadata.setUuid( UUID.randomUUID().toString() ); -+ metadata.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+basePackageName).getBytes()).toString() ); ++ UUID guid = UUID.randomUUID(); ++ if (System.getenv("SOURCE_DATE_EPOCH") != null) ++ { ++ guid = UUID.nameUUIDFromBytes( (System.getenv("SOURCE_DATE_EPOCH")+id+basePackageName+metadataDir.toString()).getBytes() ); ++ } ++ metadata.setUuid( guid.toString() ); } /** -@@ -71,11 +71,11 @@ +@@ -71,11 +76,16 @@ public class JavaPackage private PackageMetadata getSplitMetadata( String namespace ) { PackageMetadata splitMetadata = new PackageMetadata(); @@ -29,7 +41,12 @@ 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() ); ++ UUID guid = UUID.randomUUID(); ++ if (System.getenv("SOURCE_DATE_EPOCH") != null) ++ { ++ guid = UUID.nameUUIDFromBytes( (System.getenv("SOURCE_DATE_EPOCH")+splitArtifacts.toString()).getBytes() ); ++ } ++ splitMetadata.setUuid( guid.toString() ); splitMetadata.setArtifacts( splitArtifacts ); splitMetadata.setSkippedArtifacts( metadata.getSkippedArtifacts() ); return splitMetadata; From 4c76b1d5026323975d362d18e2988eb8f2f0e9dcae1123ecd8bf4812405c4d88 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 20 Sep 2023 17:10:53 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=84 --- UUID.patch | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/UUID.patch b/UUID.patch index ddb924a..50f8b49 100644 --- a/UUID.patch +++ b/UUID.patch @@ -1,21 +1,3 @@ ---- 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() ) ---- 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-28 07:33:41.305575464 +0200 --- 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 @@ -24,9 +6,9 @@ this.metadataDir = metadataDir; - metadata.setUuid( UUID.randomUUID().toString() ); + UUID guid = UUID.randomUUID(); -+ if (System.getenv("SOURCE_DATE_EPOCH") != null) ++ if ( System.getenv( "SOURCE_DATE_EPOCH" ) != null ) + { -+ guid = UUID.nameUUIDFromBytes( (System.getenv("SOURCE_DATE_EPOCH")+id+basePackageName+metadataDir.toString()).getBytes() ); ++ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) + id + basePackageName + metadataDir.toString() ).getBytes() ); + } + metadata.setUuid( guid.toString() ); } @@ -42,11 +24,27 @@ List splitArtifacts = allArtifacts.stream().filter( a -> namespace.equals( a.getNamespace() ) ).collect( Collectors.toList() ); + UUID guid = UUID.randomUUID(); -+ if (System.getenv("SOURCE_DATE_EPOCH") != null) ++ if ( System.getenv( "SOURCE_DATE_EPOCH" ) != null ) + { -+ guid = UUID.nameUUIDFromBytes( (System.getenv("SOURCE_DATE_EPOCH")+splitArtifacts.toString()).getBytes() ); ++ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) + splitArtifacts.toString() ).getBytes() ); + } + splitMetadata.setUuid( guid.toString() ); 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() ) From 25f404f5082a0bb7531e425d528bbd5b722b0d6fa350a730920bb974bf9d5b28 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 20 Sep 2023 19:36:06 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=85 --- UUID.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UUID.patch b/UUID.patch index 50f8b49..2e8008f 100644 --- a/UUID.patch +++ b/UUID.patch @@ -8,7 +8,7 @@ + UUID guid = UUID.randomUUID(); + if ( System.getenv( "SOURCE_DATE_EPOCH" ) != null ) + { -+ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) + id + basePackageName + metadataDir.toString() ).getBytes() ); ++ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) + basePackageName ).getBytes() ); + } + metadata.setUuid( guid.toString() ); } From b6b104bd0dc23e6fb658b3bf75e05af802bcec9852455ab947dbd3cd5ca2c698 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 20 Sep 2023 19:44:32 +0000 Subject: [PATCH 4/7] 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() ) From b67ae83c923349e047ed62dd544e7273451ad7acdb6e479d3528f2172d85e38b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 20 Sep 2023 23:54:21 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=87 --- UUID.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UUID.patch b/UUID.patch index f51fd3d..4db4b29 100644 --- a/UUID.patch +++ b/UUID.patch @@ -24,7 +24,7 @@ + UUID guid = UUID.randomUUID(); + if ( System.getenv( "SOURCE_DATE_EPOCH" ) != null ) + { -+ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) + basePackageName ).getBytes() ); ++ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) id + basePackageName + metadataDir.toString() ).getBytes() ); + } + metadata.setUuid( guid.toString() ); } From 4bd799ed215b9e3a13daf094ea8024485cec290585d287a3e760b19f06ea1707 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 21 Sep 2023 00:02:18 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=88 --- UUID.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UUID.patch b/UUID.patch index 4db4b29..88f88a4 100644 --- a/UUID.patch +++ b/UUID.patch @@ -24,7 +24,7 @@ + UUID guid = UUID.randomUUID(); + if ( System.getenv( "SOURCE_DATE_EPOCH" ) != null ) + { -+ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) id + basePackageName + metadataDir.toString() ).getBytes() ); ++ guid = UUID.nameUUIDFromBytes( ( System.getenv( "SOURCE_DATE_EPOCH" ) + id + basePackageName + metadataDir.toString() ).getBytes() ); + } + metadata.setUuid( guid.toString() ); } From 18166c1555347257cd002cd21ccbbb2aff574930439d1601df3d0034dcff5931 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 30 Jan 2024 09:26:34 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=89 --- xmvn-connector.changes | 7 +++++++ xmvn-connector.spec | 4 ++-- xmvn-mojo.changes | 7 +++++++ xmvn-mojo.spec | 4 ++-- xmvn-parent.changes | 7 +++++++ xmvn-parent.spec | 4 ++-- xmvn-tools.changes | 7 +++++++ xmvn-tools.spec | 4 ++-- xmvn.spec | 2 +- 9 files changed, 37 insertions(+), 9 deletions(-) diff --git a/xmvn-connector.changes b/xmvn-connector.changes index 19e8d89..919c082 100644 --- a/xmvn-connector.changes +++ b/xmvn-connector.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 30 09:25:00 UTC 2024 - Fridrich Strba + +- Modified patch: + * UUID.patch + + sync with the version in our official upstream pull request + ------------------------------------------------------------------- Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba diff --git a/xmvn-connector.spec b/xmvn-connector.spec index ff59380..06b3c43 100644 --- a/xmvn-connector.spec +++ b/xmvn-connector.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package xmvn-connector # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/xmvn-mojo.changes b/xmvn-mojo.changes index 179da86..7c9aeb9 100644 --- a/xmvn-mojo.changes +++ b/xmvn-mojo.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 30 09:25:00 UTC 2024 - Fridrich Strba + +- Modified patch: + * UUID.patch + + sync with the version in our official upstream pull request + ------------------------------------------------------------------- Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba diff --git a/xmvn-mojo.spec b/xmvn-mojo.spec index c997693..c18b5ba 100644 --- a/xmvn-mojo.spec +++ b/xmvn-mojo.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package xmvn-mojo # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/xmvn-parent.changes b/xmvn-parent.changes index bc7aa66..269e6f0 100644 --- a/xmvn-parent.changes +++ b/xmvn-parent.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 30 09:25:00 UTC 2024 - Fridrich Strba + +- Modified patch: + * UUID.patch + + sync with the version in our official upstream pull request + ------------------------------------------------------------------- Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba diff --git a/xmvn-parent.spec b/xmvn-parent.spec index ffeda89..96025fb 100644 --- a/xmvn-parent.spec +++ b/xmvn-parent.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package xmvn-parent # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/xmvn-tools.changes b/xmvn-tools.changes index 5698f0b..e2691e7 100644 --- a/xmvn-tools.changes +++ b/xmvn-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 30 09:25:00 UTC 2024 - Fridrich Strba + +- Modified patch: + * UUID.patch + + sync with the version in our official upstream pull request + ------------------------------------------------------------------- Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba diff --git a/xmvn-tools.spec b/xmvn-tools.spec index 33a2520..5e7b703 100644 --- a/xmvn-tools.spec +++ b/xmvn-tools.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package xmvn-tools # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/xmvn.spec b/xmvn.spec index 3c4496d..26afac1 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,7 +1,7 @@ # # spec file for package xmvn # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed