pool/xmvn
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1101926 from Java:packages

Browse Source 
Try to make the split packages UUIDs unique

OBS-URL: https://build.opensuse.org/request/show/1101926
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmvn?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2023-08-02 14:50:50 +00:00 committed by Git OBS Bridge
commit b565040097
5 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UUID.patch
View File

@ -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<ArtifactMetadata> allArtifacts = metadata.getArtifacts();
List<ArtifactMetadata> 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;

7
xmvn-connector.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 2 09:46:49 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>

7
xmvn-mojo.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 2 09:46:49 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>

7
xmvn-parent.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 2 09:46:49 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>

7
xmvn-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 2 09:46:49 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>