This commit is contained in:
parent
3bc1a7c2b5
commit
20f579c5e6
31
UUID.patch
Normal file
31
UUID.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
--- 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
|
||||||
|
+++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java 2023-07-24 10:40:07.518257625 +0200
|
||||||
|
@@ -185,7 +185,7 @@
|
||||||
|
am.setNamespace( repo.getNamespace() );
|
||||||
|
|
||||||
|
// UUID
|
||||||
|
- am.setUuid( UUID.randomUUID().toString() );
|
||||||
|
+ am.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).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-24 10:40:32.748290757 +0200
|
||||||
|
@@ -58,7 +58,7 @@
|
||||||
|
super( id );
|
||||||
|
this.basePackageName = basePackageName;
|
||||||
|
this.metadataDir = metadataDir;
|
||||||
|
- metadata.setUuid( UUID.randomUUID().toString() );
|
||||||
|
+ metadata.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
@@ -71,7 +71,7 @@
|
||||||
|
private PackageMetadata getSplitMetadata( String namespace )
|
||||||
|
{
|
||||||
|
PackageMetadata splitMetadata = new PackageMetadata();
|
||||||
|
- splitMetadata.setUuid( UUID.randomUUID().toString() );
|
||||||
|
+ splitMetadata.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() );
|
||||||
|
splitMetadata.setProperties( metadata.getProperties() );
|
||||||
|
List<ArtifactMetadata> allArtifacts = metadata.getArtifacts();
|
||||||
|
List<ArtifactMetadata> splitArtifacts =
|
@ -28,6 +28,7 @@ Group: Development/Tools/Building
|
|||||||
URL: https://fedora-java.github.io/xmvn/
|
URL: https://fedora-java.github.io/xmvn/
|
||||||
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
|
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
|
||||||
Source1: %{parent}-build.tar.xz
|
Source1: %{parent}-build.tar.xz
|
||||||
|
Patch0: UUID.patch
|
||||||
BuildRequires: %{parent}-api = %{version}
|
BuildRequires: %{parent}-api = %{version}
|
||||||
BuildRequires: %{parent}-core = %{version}
|
BuildRequires: %{parent}-core = %{version}
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
|
@ -26,6 +26,7 @@ License: Apache-2.0
|
|||||||
Group: Development/Tools/Building
|
Group: Development/Tools/Building
|
||||||
URL: https://fedora-java.github.io/xmvn/
|
URL: https://fedora-java.github.io/xmvn/
|
||||||
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
|
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
|
||||||
|
Patch0: UUID.patch
|
||||||
BuildRequires: %{parent}-api = %{version}
|
BuildRequires: %{parent}-api = %{version}
|
||||||
BuildRequires: %{parent}-core = %{version}
|
BuildRequires: %{parent}-core = %{version}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
@ -26,6 +26,7 @@ License: Apache-2.0
|
|||||||
Group: Development/Tools/Building
|
Group: Development/Tools/Building
|
||||||
URL: https://fedora-java.github.io/xmvn/
|
URL: https://fedora-java.github.io/xmvn/
|
||||||
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
|
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
|
||||||
|
Patch0: UUID.patch
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: xmvn-resolve
|
BuildRequires: xmvn-resolve
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
|
||||||
|
@ -27,6 +27,7 @@ Group: Development/Tools/Building
|
|||||||
URL: https://fedora-java.github.io/xmvn/
|
URL: https://fedora-java.github.io/xmvn/
|
||||||
Source0: https://github.com/fedora-java/xmvn/releases/download/%{version}/%{parent}-%{version}.tar.xz
|
Source0: https://github.com/fedora-java/xmvn/releases/download/%{version}/%{parent}-%{version}.tar.xz
|
||||||
Source1: %{parent}-build.tar.xz
|
Source1: %{parent}-build.tar.xz
|
||||||
|
Patch0: UUID.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: apache-commons-compress
|
BuildRequires: apache-commons-compress
|
||||||
BuildRequires: atinject
|
BuildRequires: atinject
|
||||||
|
Loading…
Reference in New Issue
Block a user