Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-archiver for openSUSE:Factory
checked in at 2025-06-10 09:03:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-archiver (Old)
and /work/SRC/openSUSE:Factory/.maven-archiver.new.19631 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-archiver"
Tue Jun 10 09:03:21 2025 rev:6 rq:1283730 version:3.6.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-archiver/maven-archiver.changes
2024-10-30 17:35:49.791759571 +0100
+++ /work/SRC/openSUSE:Factory/.maven-archiver.new.19631/maven-archiver.changes
2025-06-10 09:06:44.815060701 +0200
@@ -1,0 +2,8 @@
+Fri Jun 6 14:33:31 UTC 2025 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * automatic-module-name.patch
+ + Do not throw exception on empty Automatic-Module-Name. Just
+ ignore it.
+
+-------------------------------------------------------------------
New:
----
automatic-module-name.patch
BETA DEBUG BEGIN:
New:- Added patch:
* automatic-module-name.patch
+ Do not throw exception on empty Automatic-Module-Name. Just
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-archiver.spec ++++++
--- /var/tmp/diff_new_pack.kB4IA0/_old 2025-06-10 09:06:45.559091449 +0200
+++ /var/tmp/diff_new_pack.kB4IA0/_new 2025-06-10 09:06:45.559091449 +0200
@@ -1,7 +1,7 @@
#
# spec file for package maven-archiver
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@
URL: https://maven.apache.org/shared/maven-archiver/
Source0:
https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.xml
+Patch0: automatic-module-name.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
@@ -52,6 +53,7 @@
%prep
%setup -q
cp %{SOURCE1} build.xml
+%patch -P 0 -p1
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
++++++ automatic-module-name.patch ++++++
---
maven-archiver-3.6.3/src/main/java/org/apache/maven/archiver/MavenArchiver.java
2025-06-06 16:23:04.815330137 +0200
+++
maven-archiver-3.6.3/src/main/java/org/apache/maven/archiver/MavenArchiver.java
2025-06-06 16:23:13.234776465 +0200
@@ -597,7 +597,10 @@
String automaticModuleName =
manifest.getMainSection().getAttributeValue("Automatic-Module-Name");
if (automaticModuleName != null) {
- if (!isValidModuleName(automaticModuleName)) {
+ if (automaticModuleName.isEmpty()) {
+
manifest.getMainSection().removeAttribute("Automatic-Module-Name");
+ }
+ else if (!isValidModuleName(automaticModuleName)) {
throw new ManifestException("Invalid automatic module name: '"
+ automaticModuleName + "'");
}
}
