Fridrich Strba 2023-07-28 05:34:53 +00:00 committed by Git OBS Bridge
parent 0c4b8f58af
commit ce77460aa3

View File

@ -10,7 +10,7 @@
// Compat version // Compat version
for ( String version : rule.getVersions() ) 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: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 @@ @@ -58,7 +58,7 @@
super( id ); super( id );
this.basePackageName = basePackageName; this.basePackageName = basePackageName;
@ -20,12 +20,16 @@
} }
/** /**
@@ -71,7 +71,7 @@ @@ -71,11 +71,11 @@
private PackageMetadata getSplitMetadata( String namespace ) private PackageMetadata getSplitMetadata( String namespace )
{ {
PackageMetadata splitMetadata = new PackageMetadata(); PackageMetadata splitMetadata = new PackageMetadata();
- splitMetadata.setUuid( UUID.randomUUID().toString() ); - splitMetadata.setUuid( UUID.randomUUID().toString() );
+ splitMetadata.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+namespace).getBytes()).toString() );
splitMetadata.setProperties( metadata.getProperties() ); splitMetadata.setProperties( metadata.getProperties() );
List<ArtifactMetadata> allArtifacts = metadata.getArtifacts(); List<ArtifactMetadata> allArtifacts = metadata.getArtifacts();
List<ArtifactMetadata> splitArtifacts = 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;