Accepting request 1142740 from Java:packages
Official PR patch OBS-URL: https://build.opensuse.org/request/show/1142740 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmvn?expand=0&rev=18
This commit is contained in:
commit
48b8b88750
35
UUID.patch
35
UUID.patch
@ -1,26 +1,36 @@
|
|||||||
--- 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
|
--- a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java
|
||||||
+++ 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
|
+++ b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java
|
||||||
@@ -58,7 +58,7 @@
|
@@ -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 +39,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;
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 30 09:25:00 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Modified patch:
|
||||||
|
* UUID.patch
|
||||||
|
+ sync with the version in our official upstream pull request
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 30 09:25:00 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Modified patch:
|
||||||
|
* UUID.patch
|
||||||
|
+ sync with the version in our official upstream pull request
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 30 09:25:00 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Modified patch:
|
||||||
|
* UUID.patch
|
||||||
|
+ sync with the version in our official upstream pull request
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 30 09:25:00 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Modified patch:
|
||||||
|
* UUID.patch
|
||||||
|
+ sync with the version in our official upstream pull request
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
Wed Sep 13 16:55:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package xmvn
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
Loading…
Reference in New Issue
Block a user