Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xmvn for openSUSE:Factory checked in
at 2024-09-19 21:17:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmvn (Old)
and /work/SRC/openSUSE:Factory/.xmvn.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmvn"
Thu Sep 19 21:17:41 2024 rev:22 rq:1201943 version:4.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmvn/xmvn-connector.changes 2024-07-19
15:27:57.152656243 +0200
+++ /work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-connector.changes
2024-09-19 21:18:14.312699125 +0200
@@ -1,0 +2,8 @@
+Wed Sep 18 16:33:37 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * 0004-Reproducible-manifest-modification-time.patch
+ + preserve manifest modification time when injecting additional
+ attributes
+
+-------------------------------------------------------------------
xmvn-mojo.changes: same change
xmvn-parent.changes: same change
xmvn-tools.changes: same change
New:
----
0004-Reproducible-manifest-modification-time.patch
BETA DEBUG BEGIN:
New:/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-connector.changes-- Added
patch:
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-connector.changes: *
0004-Reproducible-manifest-modification-time.patch
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-connector.changes- +
preserve manifest modification time when injecting additional
--
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-mojo.changes-- Added patch:
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-mojo.changes: *
0004-Reproducible-manifest-modification-time.patch
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-mojo.changes- + preserve
manifest modification time when injecting additional
--
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-parent.changes-- Added patch:
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-parent.changes: *
0004-Reproducible-manifest-modification-time.patch
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-parent.changes- + preserve
manifest modification time when injecting additional
--
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-tools.changes-- Added patch:
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-tools.changes: *
0004-Reproducible-manifest-modification-time.patch
/work/SRC/openSUSE:Factory/.xmvn.new.29891/xmvn-tools.changes- + preserve
manifest modification time when injecting additional
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmvn-connector.spec ++++++
--- /var/tmp/diff_new_pack.kxCYnj/_old 2024-09-19 21:18:17.184818182 +0200
+++ /var/tmp/diff_new_pack.kxCYnj/_new 2024-09-19 21:18:17.192818513 +0200
@@ -31,6 +31,7 @@
Patch0: 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
Patch1: 0002-Make-metadata-UUIDs-reproducible-if-SOURCE_DATE_EPOC.patch
Patch2: 0003-Reproducible-javadoc-notimestamp-option-and-some-aut.patch
+Patch3: 0004-Reproducible-manifest-modification-time.patch
BuildRequires: %{parent}-api = %{version}
BuildRequires: %{parent}-core = %{version}
BuildRequires: ant
++++++ xmvn-mojo.spec ++++++
--- /var/tmp/diff_new_pack.kxCYnj/_old 2024-09-19 21:18:17.564833934 +0200
+++ /var/tmp/diff_new_pack.kxCYnj/_new 2024-09-19 21:18:17.576834432 +0200
@@ -29,6 +29,7 @@
Patch0: 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
Patch1: 0002-Make-metadata-UUIDs-reproducible-if-SOURCE_DATE_EPOC.patch
Patch2: 0003-Reproducible-javadoc-notimestamp-option-and-some-aut.patch
+Patch3: 0004-Reproducible-manifest-modification-time.patch
BuildRequires: %{parent}-api = %{version}
BuildRequires: %{parent}-core = %{version}
BuildRequires: fdupes
@@ -101,7 +102,7 @@
%pom_remove_dep -r :::test:
%pom_xpath_inject
"pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-plugin-plugin']/pom:configuration"
'
- <goalPrefix>xmvn-mojo</goalPrefix>' xmvn-mojo
+ <goalPrefix>${project.artifactId}</goalPrefix>' xmvn-mojo
pushd %{name}
%{mvn_file} :{*} %{parent}/@1
++++++ xmvn-parent.spec ++++++
--- /var/tmp/diff_new_pack.kxCYnj/_old 2024-09-19 21:18:17.848845708 +0200
+++ /var/tmp/diff_new_pack.kxCYnj/_new 2024-09-19 21:18:17.860846205 +0200
@@ -29,6 +29,7 @@
Patch0: 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
Patch1: 0002-Make-metadata-UUIDs-reproducible-if-SOURCE_DATE_EPOC.patch
Patch2: 0003-Reproducible-javadoc-notimestamp-option-and-some-aut.patch
+Patch3: 0004-Reproducible-manifest-modification-time.patch
BuildRequires: javapackages-local
BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
++++++ xmvn-tools.spec ++++++
--- /var/tmp/diff_new_pack.kxCYnj/_old 2024-09-19 21:18:18.140857812 +0200
+++ /var/tmp/diff_new_pack.kxCYnj/_new 2024-09-19 21:18:18.148858143 +0200
@@ -30,6 +30,7 @@
Patch0: 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch
Patch1: 0002-Make-metadata-UUIDs-reproducible-if-SOURCE_DATE_EPOC.patch
Patch2: 0003-Reproducible-javadoc-notimestamp-option-and-some-aut.patch
+Patch3: 0004-Reproducible-manifest-modification-time.patch
BuildRequires: ant
BuildRequires: apache-commons-compress
BuildRequires: apache-commons-io
@@ -37,7 +38,7 @@
BuildRequires: beust-jcommander >= 1.82
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-local
+BuildRequires: javapackages-local >= 6
BuildRequires: modello >= 2.0.0
BuildRequires: objectweb-asm
BuildRequires: sisu-inject
@@ -157,19 +158,6 @@
rm -f
xmvn-core/src/test/java/org/fedoraproject/xmvn/resolver/JavaHomeResolverTest.java
%endif
-for i in api core; do
- %pom_xpath_inject "pom:project" "
- <groupId>org.fedoraproject.xmvn</groupId>
- <version>%{version}</version>" %{parent}-${i}
- %pom_remove_parent %{parent}-${i}
-done
-for i in install resolve subst; do
- %pom_xpath_inject "pom:project" "
- <groupId>org.fedoraproject.xmvn</groupId>
- <version>%{version}</version>" %{parent}-tools/%{parent}-${i}
- %pom_remove_parent %{parent}-tools/%{parent}-${i}
-done
-
%build
mkdir -p lib
build-jar-repository -s lib \
@@ -196,11 +184,11 @@
# poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{parent}
for i in api core; do
- install -pm 0644 %{parent}-${i}/pom.xml
%{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom
+ %{mvn_install_pom} %{parent}-${i}/pom.xml
%{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom
%add_maven_depmap %{parent}/%{parent}-${i}.pom %{parent}/%{parent}-${i}.jar
-f ${i}
done
for i in install resolve subst; do
- install -pm 0644 %{parent}-tools/%{parent}-${i}/pom.xml
%{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom
+ %{mvn_install_pom} %{parent}-tools/%{parent}-${i}/pom.xml
%{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom
%add_maven_depmap %{parent}/%{parent}-${i}.pom %{parent}/%{parent}-${i}.jar
-f ${i}
done
++++++ 0004-Reproducible-manifest-modification-time.patch ++++++
>From 3c2036e15f127c4ab90eb2312af27e13711d5a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Wed, 18 Sep 2024 18:31:24 +0200
Subject: [PATCH 4/4] Reproducible manifest modification time
---
.../org/fedoraproject/xmvn/tools/install/JarUtils.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JarUtils.java
b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JarUtils.java
index 815d19a6..844510b6 100644
---
a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JarUtils.java
+++
b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JarUtils.java
@@ -249,12 +249,17 @@ public final class JarUtils
try ( ZipFile jar = new ZipFile( backupPath.toFile() );
ZipArchiveOutputStream os = new
ZipArchiveOutputStream( targetJar.toFile() ) )
{
- try ( InputStream mfIs = jar.getInputStream( jar.getEntry(
MANIFEST_PATH ) ) )
+ ZipArchiveEntry jarEntry = jar.getEntry( MANIFEST_PATH );
+ try ( InputStream mfIs = jar.getInputStream( jarEntry ) )
{
Manifest mf = new Manifest( mfIs );
updateManifest( artifact, mf );
// write manifest
ZipArchiveEntry newManifestEntry = new ZipArchiveEntry(
MANIFEST_PATH );
+ if ( jarEntry != null )
+ {
+ newManifestEntry.setTime( jarEntry.getTime() );
+ }
os.putArchiveEntry( newManifestEntry );
mf.write( os );
os.closeArchiveEntry();
--
2.46.0
