Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven4 for openSUSE:Factory checked in at 2026-07-24 22:06:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven4 (Old) and /work/SRC/openSUSE:Factory/.maven4.new.2004 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven4" Fri Jul 24 22:06:51 2026 rev:13 rq:1367653 version:4.0.0~20260724.2b1209f9a3 Changes: -------- --- /work/SRC/openSUSE:Factory/maven4/maven4-bootstrap.changes 2026-05-16 19:26:29.134856025 +0200 +++ /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes 2026-07-24 22:07:26.582109838 +0200 @@ -1,0 +2,40 @@ +Fri Jul 24 10:07:35 UTC 2026 - Fridrich Strba <[email protected]> + +- Update to git revision 2b1209f9a38fb3e0f069efa39fd372871cc830f9 + from 24th of July 2026 + * Allow building against maven-resolver-2.0.21 + * General improvements on the way to 4.0.0 release +- Modified patches: + * 0001-Adapt-mvn-script.patch + * 0002-Invoke-logback-via-reflection.patch + + rebase +- Added patch: + * jline-3.30.x.patch + + allow building with jline3 < 4.1 on systems that + have jline3 3.30.x +- Removed patches: + * 0001-Fix-a-ConcurrentModificationException-11429.patch + * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch + * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch + * maven4-resolver2017.patch + * jline-4.1.x.patch + + not needed with this version + +------------------------------------------------------------------- +Mon Jul 13 12:39:40 UTC 2026 - Fridrich Strba <[email protected]> + +- Do not use the slf4j2 compatibility package, as the base slf4j + package is now on version 2.0.18 +- Do not use the maven-resolver2 compatibility package, as the base + maven-resolver package is now on version 2.0.20 + +------------------------------------------------------------------- +Wed Jul 1 05:03:25 UTC 2026 - Fridrich Strba <[email protected]> + +- Added patch: + * jline-4.1.x.patch + + implements a new interface funcion added in jline3 4.1.0 + + applied if the jline3 version is >= 4.1 + + allows upgrading to jline3 versions >= 4.1 if needed + +------------------------------------------------------------------- @@ -4,2 +44,2 @@ -- Generate the build.propertis file containing properties needed for - resources filtering dynamically during the build +- Generate the build.properties file containing properties needed + for resources filtering dynamically during the build --- /work/SRC/openSUSE:Factory/maven4/maven4-testing.changes 2026-07-15 16:53:38.834969010 +0200 +++ /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes 2026-07-24 22:07:26.634111653 +0200 @@ -1,0 +2,23 @@ +Fri Jul 24 10:07:35 UTC 2026 - Fridrich Strba <[email protected]> + +- Update to git revision 2b1209f9a38fb3e0f069efa39fd372871cc830f9 + from 24th of July 2026 + * Allow building against maven-resolver-2.0.21 + * General improvements on the way to 4.0.0 release +- Modified patches: + * 0001-Adapt-mvn-script.patch + * 0002-Invoke-logback-via-reflection.patch + + rebase +- Added patch: + * jline-3.30.x.patch + + allow building with jline3 < 4.1 on systems that + have jline3 3.30.x +- Removed patches: + * 0001-Fix-a-ConcurrentModificationException-11429.patch + * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch + * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch + * maven4-resolver2017.patch + * jline-4.1.x.patch + + not needed with this version + +------------------------------------------------------------------- @@ -7,0 +31,9 @@ + +------------------------------------------------------------------- +Wed Jul 1 05:03:25 UTC 2026 - Fridrich Strba <[email protected]> + +- Added patch: + * jline-4.1.x.patch + + implements a new interface funcion added in jline3 4.1.0 + + applied if the jline3 version is >= 4.1 + + allows upgrading to jline3 versions >= 4.1 if needed --- /work/SRC/openSUSE:Factory/maven4/maven4.changes 2026-07-15 16:53:40.227015178 +0200 +++ /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes 2026-07-24 22:07:26.682113329 +0200 @@ -1,0 +2,23 @@ +Fri Jul 24 10:07:35 UTC 2026 - Fridrich Strba <[email protected]> + +- Update to git revision 2b1209f9a38fb3e0f069efa39fd372871cc830f9 + from 24th of July 2026 + * Allow building against maven-resolver-2.0.21 + * General improvements on the way to 4.0.0 release +- Modified patches: + * 0001-Adapt-mvn-script.patch + * 0002-Invoke-logback-via-reflection.patch + + rebase +- Added patch: + * jline-3.30.x.patch + + allow building with jline3 < 4.1 on systems that + have jline3 3.30.x +- Removed patches: + * 0001-Fix-a-ConcurrentModificationException-11429.patch + * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch + * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch + * maven4-resolver2017.patch + * jline-4.1.x.patch + + not needed with this version + +------------------------------------------------------------------- Old: ---- 0001-Fix-a-ConcurrentModificationException-11429.patch 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch apache-maven-4.0.0-rc-5-src.tar.gz apache-maven-build.tar.xz jline-4.1.x.patch maven4-resolver2017.patch New: ---- _service jline-3.30.x.patch maven-4.0.0~20260724.2b1209f9a3.tar.xz maven-build.tar.xz ----------(Old B)---------- Old:/work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes-- Removed patches: /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes: * 0001-Fix-a-ConcurrentModificationException-11429.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes-- Removed patches: /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes: * 0001-Fix-a-ConcurrentModificationException-11429.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes-- Removed patches: /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes: * 0001-Fix-a-ConcurrentModificationException-11429.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch Old:/work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- * 0001-Fix-a-ConcurrentModificationException-11429.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes: * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- * 0001-Fix-a-ConcurrentModificationException-11429.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes: * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- * 0001-Fix-a-ConcurrentModificationException-11429.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes: * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch Old:/work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes: * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- * maven4-resolver2017.patch -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes: * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- * maven4-resolver2017.patch -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- * 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes: * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- * maven4-resolver2017.patch Old:/work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- * maven4-resolver2017.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes: * jline-4.1.x.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- + not needed with this version -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- * maven4-resolver2017.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes: * jline-4.1.x.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- + not needed with this version -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- * maven4-resolver2017.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes: * jline-4.1.x.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- + not needed with this version Old:/work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes: * maven4-resolver2017.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- * jline-4.1.x.patch -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes: * maven4-resolver2017.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- * jline-4.1.x.patch -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- * 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes: * maven4-resolver2017.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- * jline-4.1.x.patch ----------(Old E)---------- ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes: * jline-3.30.x.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-bootstrap.changes- + allow building with jline3 < 4.1 on systems that -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes: * jline-3.30.x.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4-testing.changes- + allow building with jline3 < 4.1 on systems that -- /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes: * jline-3.30.x.patch /work/SRC/openSUSE:Factory/.maven4.new.2004/maven4.changes- + allow building with jline3 < 4.1 on systems that ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven4-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.NEIdPj/_old 2026-07-24 22:07:28.270168774 +0200 +++ /var/tmp/diff_new_pack.NEIdPj/_new 2026-07-24 22:07:28.278169054 +0200 @@ -18,9 +18,9 @@ %global maven_version_suffix 4 %global base_name maven -%global file_version 4.0.0-rc-5 +%global file_version 4.0.0-SNAPSHOT Name: %{base_name}%{?maven_version_suffix}-bootstrap -Version: 4.0.0~rc5 +Version: 4.0.0~20260724.2b1209f9a3 Release: 0 Summary: Maven Plugin Testing Mechanism # maven itself is ASL 2.0 @@ -28,17 +28,12 @@ License: Apache-2.0 AND MIT Group: Development/Tools/Building URL: https://maven.apache.org/ -Source0: https://archive.apache.org/dist/%{base_name}/%{base_name}-4/%{file_version}/source/apache-%{base_name}-%{file_version}-src.tar.gz +Source0: %{base_name}-%{version}.tar.xz Source1: maven-bash-completion Source2: mvn.1 -Source10: apache-%{base_name}-build.tar.xz +Source10: %{base_name}-build.tar.xz Patch1: 0001-Adapt-mvn-script.patch -# Downstream-specific, avoids dependency on logback Patch2: 0002-Invoke-logback-via-reflection.patch -Patch3: 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch -Patch4: 0001-Fix-a-ConcurrentModificationException-11429.patch -Patch5: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch -Patch6: maven4-resolver2017.patch BuildRequires: ant BuildRequires: java-devel >= 17 BuildRequires: javapackages-local @@ -56,14 +51,10 @@ reporting and documentation from a central piece of information. %prep -%setup -q -n apache-%{base_name}-%{file_version} -a10 +%setup -q -n %{base_name}-%{version} -a10 %patch -P 1 -p1 %patch -P 2 -p1 -%patch -P 3 -p1 -%patch -P 4 -p1 -%patch -P 5 -p1 -%patch -P 6 -p1 %pom_remove_dep -r :junit-bom %pom_remove_dep -r :mockito-bom @@ -74,8 +65,6 @@ %pom_remove_dep :jline-terminal-ffm apache-maven %pom_remove_dep -r :logback-classic -%pom_disable_module maven-executor impl - find -name '*.java' -exec sed -i 's/\r//' {} + find -name 'pom.xml' -exec sed -i 's/\r//' {} + ++++++ maven4-testing.spec ++++++ --- /var/tmp/diff_new_pack.NEIdPj/_old 2026-07-24 22:07:28.334171009 +0200 +++ /var/tmp/diff_new_pack.NEIdPj/_new 2026-07-24 22:07:28.342171288 +0200 @@ -18,9 +18,9 @@ %global maven_version_suffix 4 %global base_name maven -%global file_version 4.0.0-rc-5 +%global file_version 4.0.0-SNAPSHOT Name: %{base_name}%{?maven_version_suffix}-testing -Version: 4.0.0~rc5 +Version: 4.0.0~20260724.2b1209f9a3 Release: 0 Summary: Maven Plugin Testing Mechanism # maven itself is ASL 2.0 @@ -28,17 +28,12 @@ License: Apache-2.0 AND MIT Group: Development/Tools/Building URL: https://maven.apache.org/ -Source0: https://archive.apache.org/dist/%{base_name}/%{base_name}-4/%{file_version}/source/apache-%{base_name}-%{file_version}-src.tar.gz +Source0: %{base_name}-%{version}.tar.xz Source1: maven-bash-completion Source2: mvn.1 -Source10: apache-%{base_name}-build.tar.xz +Source10: %{base_name}-build.tar.xz Patch1: 0001-Adapt-mvn-script.patch -# Downstream-specific, avoids dependency on logback Patch2: 0002-Invoke-logback-via-reflection.patch -Patch3: 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch -Patch4: 0001-Fix-a-ConcurrentModificationException-11429.patch -Patch5: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch -Patch6: maven4-resolver2017.patch BuildRequires: ant BuildRequires: apiguardian BuildRequires: fdupes @@ -76,14 +71,10 @@ %{summary}. %prep -%setup -q -n apache-%{base_name}-%{file_version} -a10 +%setup -q -n %{base_name}-%{version} -a10 %patch -P 1 -p1 %patch -P 2 -p1 -%patch -P 3 -p1 -%patch -P 4 -p1 -%patch -P 5 -p1 -%patch -P 6 -p1 %pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4 @@ -96,8 +87,6 @@ %pom_remove_dep :jline-terminal-ffm apache-maven %pom_remove_dep -r :logback-classic -%pom_disable_module maven-executor impl - find -name '*.java' -exec sed -i 's/\r//' {} + find -name 'pom.xml' -exec sed -i 's/\r//' {} + ++++++ maven4.spec ++++++ --- /var/tmp/diff_new_pack.NEIdPj/_old 2026-07-24 22:07:28.438174640 +0200 +++ /var/tmp/diff_new_pack.NEIdPj/_new 2026-07-24 22:07:28.438174640 +0200 @@ -18,11 +18,11 @@ %global maven_version_suffix 4 %global base_name maven -%global file_version 4.0.0-rc-5 +%global file_version 4.0.0-SNAPSHOT %global homedir %{_datadir}/%{base_name}%{?maven_version_suffix} %global confdir %{_sysconfdir}/%{base_name}%{?maven_version_suffix} Name: %{base_name}%{?maven_version_suffix} -Version: 4.0.0~rc5 +Version: 4.0.0~20260724.2b1209f9a3 Release: 0 Summary: Java project management and project comprehension tool # maven itself is ASL 2.0 @@ -30,19 +30,14 @@ License: Apache-2.0 AND MIT Group: Development/Tools/Building URL: https://maven.apache.org/ -Source0: https://archive.apache.org/dist/%{base_name}/%{base_name}-4/%{file_version}/source/apache-%{base_name}-%{file_version}-src.tar.gz +Source0: %{base_name}-%{version}.tar.xz Source1: maven-bash-completion Source2: mvn.1 -Source10: apache-%{base_name}-build.tar.xz +Source10: %{base_name}-build.tar.xz Source100: pom_properties.py Patch1: 0001-Adapt-mvn-script.patch -# Downstream-specific, avoids dependency on logback Patch2: 0002-Invoke-logback-via-reflection.patch -Patch3: 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch -Patch4: 0001-Fix-a-ConcurrentModificationException-11429.patch -Patch5: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch -Patch6: maven4-resolver2017.patch -Patch7: jline-4.1.x.patch +Patch3: jline-3.30.x.patch BuildRequires: ant BuildRequires: aopalliance BuildRequires: apache-commons-cli @@ -50,6 +45,7 @@ BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-logging BuildRequires: atinject +BuildRequires: domtrip >= 1.6.0 BuildRequires: fdupes BuildRequires: glassfish-annotation-api BuildRequires: google-gson @@ -61,7 +57,6 @@ BuildRequires: java-devel >= 17 BuildRequires: javapackages-local BuildRequires: jcl-over-slf4j -BuildRequires: jdom2 BuildRequires: jline3 BuildRequires: jline3-builtins BuildRequires: jline3-console @@ -72,6 +67,7 @@ BuildRequires: jline3-style BuildRequires: jline3-terminal BuildRequires: jline3-terminal-jni +BuildRequires: jul-to-slf4j BuildRequires: maven-resolver-api >= 2.0.14 BuildRequires: maven-resolver-connector-basic BuildRequires: maven-resolver-impl >= 2.0.14 @@ -128,6 +124,7 @@ Requires: apache-commons-lang3 Requires: apache-commons-logging Requires: atinject +Requires: domtrip Requires: glassfish-annotation-api Requires: google-gson Requires: google-guice @@ -145,6 +142,8 @@ Requires: jline3-style Requires: jline3-terminal Requires: jline3-terminal-jni +Requires: jspecify +Requires: jul-to-slf4j Requires: maven-resolver-api Requires: maven-resolver-connector-basic Requires: maven-resolver-impl @@ -188,16 +187,12 @@ %{summary}. %prep -%setup -q -n apache-%{base_name}-%{file_version} -a10 +%setup -q -n %{base_name}-%{version} -a10 %patch -P 1 -p1 %patch -P 2 -p1 +%if %{?pkg_vcmp:%pkg_vcmp jline3-terminal < 4.1}%{!?pkg_vcmp:0} %patch -P 3 -p1 -%patch -P 4 -p1 -%patch -P 5 -p1 -%patch -P 6 -p1 -%if %{?pkg_vcmp:%pkg_vcmp jline3-terminal >= 4.1}%{!?pkg_vcmp:0} -%patch -P 7 -p1 %endif %pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4 @@ -211,8 +206,6 @@ %pom_remove_dep :jline-terminal-ffm apache-maven %pom_remove_dep -r :logback-classic -%pom_disable_module maven-executor impl - find -name '*.java' -exec sed -i 's/\r//' {} + find -name 'pom.xml' -exec sed -i 's/\r//' {} + @@ -264,9 +257,10 @@ apache-commons-lang3 \ atinject \ commons-cli \ + domtrip/core \ + domtrip/maven \ guice/google-guice \ jakarta-inject \ - jdom2/jdom2 \ jline3/jansi-core \ jline3/jline-builtins \ jline3/jline-console \ @@ -296,6 +290,7 @@ plexus/utils \ plexus/xml-4 \ slf4j/api \ + slf4j/jul-to-slf4j \ stax2-api \ woodstox-core @@ -337,7 +332,6 @@ impl/maven-cli \ impl/maven-core \ impl/maven-di \ - impl/maven-executor \ impl/maven-impl \ impl/maven-jline \ impl/maven-logging \ @@ -369,6 +363,8 @@ atinject \ commons-cli \ commons-codec \ + domtrip/core \ + domtrip/maven \ glassfish-annotation-api \ google-gson/gson \ guava/guava \ @@ -376,7 +372,6 @@ httpcomponents/httpclient \ httpcomponents/httpcore \ jakarta-inject \ - jdom2/jdom2 \ jline3/jansi-core \ jline3/jline-builtins \ jline3/jline-console \ @@ -386,6 +381,7 @@ jline3/jline-style \ jline3/jline-terminal \ jline3/jline-terminal-jni \ + jspecify \ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-connector-basic \ maven-resolver/maven-resolver-impl \ @@ -412,6 +408,7 @@ plexus/xml-4 \ slf4j/api \ slf4j/jcl-over-slf4j \ + slf4j/jul-to-slf4j \ stax2-api \ woodstox-core ++++++ 0001-Adapt-mvn-script.patch ++++++ --- /var/tmp/diff_new_pack.NEIdPj/_old 2026-07-24 22:07:28.490176456 +0200 +++ /var/tmp/diff_new_pack.NEIdPj/_new 2026-07-24 22:07:28.494176595 +0200 @@ -1,4 +1,4 @@ -From 44801a454d940a22b80442386a08dd38ee5b21b9 Mon Sep 17 00:00:00 2001 +From b8fdd46aef22b8ade4a76298e33432dc472c7131 Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Wed, 1 Feb 2017 14:54:26 +0100 Subject: [PATCH 1/2] Adapt mvn script @@ -8,7 +8,7 @@ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/apache-maven/src/assembly/maven/bin/mvn b/apache-maven/src/assembly/maven/bin/mvn -index 6fd203348f..c67528c9c9 100755 +index ea5cd1111a..383a635a87 100755 --- a/apache-maven/src/assembly/maven/bin/mvn +++ b/apache-maven/src/assembly/maven/bin/mvn @@ -32,20 +32,22 @@ @@ -48,16 +48,16 @@ # make it fully qualified MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` -@@ -174,7 +177,7 @@ concat_lines() { - - MAVEN_PROJECTBASEDIR="`find_maven_basedir "$@"`" - MAVEN_OPTS="$MAVEN_OPTS `concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"`" +@@ -226,7 +229,7 @@ fi + if [ -n "$MAVEN_DEBUG_SCRIPT" ]; then + echo "[DEBUG] Final MAVEN_OPTS: $MAVEN_OPTS" >&2 + fi -LAUNCHER_JAR=`echo "$MAVEN_HOME"/boot/plexus-classworlds-*.jar` +LAUNCHER_JAR=`build-classpath plexus-classworlds` LAUNCHER_CLASS=org.codehaus.plexus.classworlds.launcher.Launcher # For Cygwin and MinGW, switch paths to Windows format before running java(1) command -- -2.48.1 +2.55.0 ++++++ 0002-Invoke-logback-via-reflection.patch ++++++ --- /var/tmp/diff_new_pack.NEIdPj/_old 2026-07-24 22:07:28.530177852 +0200 +++ /var/tmp/diff_new_pack.NEIdPj/_new 2026-07-24 22:07:28.534177991 +0200 @@ -1,4 +1,4 @@ -From 60bdc354c16edbb16a09b8e39bb417199df1fdd7 Mon Sep 17 00:00:00 2001 +From 763ff49ac6f1545d527974baae808c8383872270 Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Tue, 6 Jun 2017 13:47:43 +0200 Subject: [PATCH 2/2] Invoke logback via reflection @@ -39,6 +39,6 @@ @Override -- -2.48.1 +2.55.0 ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.NEIdPj/_old 2026-07-24 22:07:28.618180924 +0200 +++ /var/tmp/diff_new_pack.NEIdPj/_new 2026-07-24 22:07:28.622181064 +0200 @@ -1,6 +1,6 @@ -mtime: 1783946527 -commit: 99be08a97ee095f6da5687717d934329bbcf350110f1241f43ba2e16167f867f +mtime: 1784888324 +commit: 094beb1f2477a27fa4668d63a91f50bdeeb389dce14c6af2dfb5f1cbf428cc51 url: https://src.opensuse.org/java-packages/maven4 -revision: 99be08a97ee095f6da5687717d934329bbcf350110f1241f43ba2e16167f867f +revision: 094beb1f2477a27fa4668d63a91f50bdeeb389dce14c6af2dfb5f1cbf428cc51 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/apache/maven.git</param> <param name="revision">maven-4.0.x</param> <param name="versionformat">4.0.0~%cd.%h</param> <param name="exclude">.git*</param> <param name="exclude">**/.git*</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-07-24 12:18:44.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ jline-4.1.x.patch -> jline-3.30.x.patch ++++++ --- /work/SRC/openSUSE:Factory/maven4/jline-4.1.x.patch 2026-07-01 16:39:40.087389151 +0200 +++ /work/SRC/openSUSE:Factory/.maven4.new.2004/jline-3.30.x.patch 2026-07-24 22:07:26.418104112 +0200 @@ -1,21 +1,50 @@ +From caa6ee4f707d4f0b664257e4c7cbcbe17aee95fa Mon Sep 17 00:00:00 2001 +From: Fridrich Strba <[email protected]> +Date: Tue, 21 Jul 2026 08:40:10 +0200 +Subject: [PATCH] Build with jline < 4.1 + +--- + .../src/main/java/org/apache/maven/jline/FastTerminal.java | 6 ------ + pom.xml | 2 +- + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/impl/maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java b/impl/maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java +index 996a7d71eb..0506278684 100644 --- a/impl/maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java +++ b/impl/maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java -@@ -34,6 +34,7 @@ +@@ -34,7 +34,6 @@ import org.jline.terminal.Cursor; import org.jline.terminal.MouseEvent; import org.jline.terminal.Size; -+import org.jline.terminal.Sized; +-import org.jline.terminal.Sized; import org.jline.terminal.Terminal; import org.jline.terminal.spi.SystemStream; import org.jline.terminal.spi.TerminalExt; -@@ -170,6 +171,10 @@ public void setSize(Size size) { +@@ -171,11 +170,6 @@ public void setSize(Size size) { getTerminal().setSize(size); } -+ public void setSize(Sized sized) { -+ getTerminal().setSize(sized); -+ } -+ +- @Override +- public void setSize(Sized sized) { +- getTerminal().setSize(sized); +- } +- @Override public int getWidth() { return getTerminal().getWidth(); +diff --git a/pom.xml b/pom.xml +index 6ec6c9c1b3..15e1ad4e47 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -154,7 +154,7 @@ under the License. + <hamcrestVersion>3.0</hamcrestVersion> + <jakartaInjectApiVersion>2.0.1</jakartaInjectApiVersion> + <javaxAnnotationApiVersion>1.3.2</javaxAnnotationApiVersion> +- <jlineVersion>4.3.1</jlineVersion> ++ <jlineVersion>3.30.16</jlineVersion> + <jmhVersion>1.37</jmhVersion> + <junitVersion>5.13.4</junitVersion> + <jxpathVersion>1.4.0</jxpathVersion> +-- +2.55.0 +
