This commit is contained in:
parent
903caf24bc
commit
4c76b1d502
42
UUID.patch
42
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<ArtifactMetadata> 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() )
|
||||
|
Loading…
Reference in New Issue
Block a user