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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=83

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-20 16:51:13 +00:00 committed by Git OBS Bridge
parent cafb45e1ba
commit 903caf24bc
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
UUID.patch
View File

@ -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 --- a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java
+++ 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 +++ b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java
@@ -185,7 +185,7 @@ @@ -185,7 +185,12 @@ class DefaultArtifactInstaller
am.setNamespace( repo.getNamespace() ); am.setNamespace( repo.getNamespace() );
// UUID // UUID
- am.setUuid( UUID.randomUUID().toString() ); - 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 // 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-28 07:33:41.305575464 +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 ); super( id );
this.basePackageName = basePackageName; this.basePackageName = basePackageName;
this.metadataDir = metadataDir; this.metadataDir = metadataDir;
- metadata.setUuid( UUID.randomUUID().toString() ); - 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 ) private PackageMetadata getSplitMetadata( String namespace )
{ {
PackageMetadata splitMetadata = new PackageMetadata(); PackageMetadata splitMetadata = new PackageMetadata();
@ -29,7 +41,12 @@
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() ); 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.setArtifacts( splitArtifacts );
splitMetadata.setSkippedArtifacts( metadata.getSkippedArtifacts() ); splitMetadata.setSkippedArtifacts( metadata.getSkippedArtifacts() );
return splitMetadata; return splitMetadata;