Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven for openSUSE:Factory checked in at 2026-07-15 16:34:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven (Old) and /work/SRC/openSUSE:Factory/.maven.new.1991 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven" Wed Jul 15 16:34:28 2026 rev:39 rq:1365407 version:3.10.0~rc1 Changes: -------- --- /work/SRC/openSUSE:Factory/maven/maven.changes 2026-05-21 18:29:04.230828406 +0200 +++ /work/SRC/openSUSE:Factory/.maven.new.1991/maven.changes 2026-07-15 16:53:09.069981847 +0200 @@ -1,0 +2,62 @@ +Sun Jul 12 05:43:16 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to upstream preview version 3.10.0-rc-1 +- Notable Changes + * New Features and Improvements + + use Resolver 2.x + + allow defining user-wide and installation-wide Maven + extensions + + Reproducible Builds is active by default + + promote session.topDirectory, session.rootDirectory and + project.rootDirectory properties + + version range filtering + + allow defining user relocations + + allow using transitive dependency manager + + in a failed build limit reactor summary to only failed modules + + new CLI options for fine-grained update policy control: + -UA (force artifact updates only), + -UM (force metadata updates only), + --artifacts-update-policy=<policy>, + --metadata-update-policy=<policy> + * New API and Updates for Maven Plugins + + upgrade SLF4J to 2.x + + promote MessageBuilderFactory service for colored message + support + + promote java version in JavaToolchain +- Potentially Breaking Core Changes (if migrating from 3.9.x) + * Classpath ordering change + + Dependency classpath ordering changed from "pre-order" + (depth-first) to "level-order" (breadth-first), aligning with + Maven 4 behavior and Resolver 2.x defaults. + + To restore the previous behavior, add + -Daether.system.dependencyVisitor=preOrder to your Maven + invocation. + * Changes in the Super POM: + + removed deprecated release-profile; each project should have + its own release profile + + removed plugin management; each project should have its own + plugin management + + set default values for project.build.sourceEncoding and + project.reporting.outputEncoding to UTF-8 +- Modified patches: + * 0001-Adapt-mvn-script.patch + * 0002-Invoke-logback-via-reflection.patch + * 0003-Remove-dependency-on-powermock.patch + * 0004-Fix-build-with-qdox-2.0.1.patch + * 0005-Reproducible-maven.build.timestamp.patch + + rebase +- Added patches: + * 0006-Plexus-utils-4.x-Plexus-xml-3.x-and-javax.annotation.patch + + use plexus-utils 4.0.2 with plexus-xml 3.0.2 instead of + plexus-utils 3.6.1 + * 0007-Do-not-depend-on-maven-resolver-supplier-mvn3.patch + + apply when building the non-distributed maven-bootstrap + flavour + + avoid cycle between maven-resolver-supplier-mvn3 from + maven-resolver and maven-resolver-provider from this build + that are the dependencies of each other + * jline-4.1.x.patch + + apply when building against jline3 >= 4.1 + + implements a new interace function + +------------------------------------------------------------------- @@ -468,2 +530,2 @@ - + The Maven Resolver transport has changed from Wagon to “native - HTTP”, see Resolver Transport guide. + + The Maven Resolver transport has changed from Wagon to "native + HTTP", see Resolver Transport guide. Old: ---- apache-maven-3.9.16-src.tar.gz New: ---- 0006-Plexus-utils-4.x-Plexus-xml-3.x-and-javax.annotation.patch 0007-Do-not-depend-on-maven-resolver-supplier-mvn3.patch _multibuild apache-maven-3.10.0-rc-1-src.tar.gz jline-4.1.x.patch pom_properties.py ----------(New B)---------- New:- Added patches: * 0006-Plexus-utils-4.x-Plexus-xml-3.x-and-javax.annotation.patch + use plexus-utils 4.0.2 with plexus-xml 3.0.2 instead of New: plexus-utils 3.6.1 * 0007-Do-not-depend-on-maven-resolver-supplier-mvn3.patch + apply when building the non-distributed maven-bootstrap New: that are the dependencies of each other * jline-4.1.x.patch + apply when building against jline3 >= 4.1 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven.spec ++++++ --- /var/tmp/diff_new_pack.dcqZEF/_old 2026-07-15 16:53:11.230053485 +0200 +++ /var/tmp/diff_new_pack.dcqZEF/_new 2026-07-15 16:53:11.234053619 +0200 @@ -16,11 +16,17 @@ # -%global bundled_slf4j_version 1.7.25 -%global homedir %{_datadir}/%{name}%{?maven_version_suffix} -%global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix} -Name: maven -Version: 3.9.16 +%global base_name maven +%global homedir %{_datadir}/%{base_name}%{?maven_version_suffix} +%global confdir %{_sysconfdir}/%{base_name}%{?maven_version_suffix} +%global file_version 3.10.0-rc-1 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "bootstrap" +%bcond_without bootstrap +%else +%bcond_with bootstrap +%endif +Version: 3.10.0~rc1 Release: 0 Summary: Java project management and project comprehension tool # maven itself is ASL 2.0 @@ -28,81 +34,98 @@ License: Apache-2.0 AND MIT Group: Development/Tools/Building URL: https://maven.apache.org/ -Source0: http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz +Source0: https://archive.apache.org/dist/%{base_name}/%{base_name}-3/%{file_version}/source/apache-%{base_name}-%{file_version}-src.tar.gz Source1: maven-bash-completion Source2: mvn.1 -Source10: apache-%{name}-build.tar.xz +Source10: apache-%{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: 0003-Remove-dependency-on-powermock.patch Patch4: 0004-Fix-build-with-qdox-2.0.1.patch Patch5: 0005-Reproducible-maven.build.timestamp.patch +Patch6: 0006-Plexus-utils-4.x-Plexus-xml-3.x-and-javax.annotation.patch +Patch7: 0007-Do-not-depend-on-maven-resolver-supplier-mvn3.patch +Patch8: jline-4.1.x.patch BuildRequires: ant +BuildRequires: atinject +BuildRequires: javapackages-local +BuildRequires: maven-resolver-api +BuildRequires: maven-resolver-impl +BuildRequires: maven-resolver-named-locks +BuildRequires: maven-resolver-spi +BuildRequires: maven-resolver-util +BuildRequires: modello >= 2.0.0 +BuildRequires: objectweb-asm +BuildRequires: plexus-interpolation +BuildRequires: plexus-utils +BuildRequires: plexus-xml +BuildRequires: sisu-inject +BuildRequires: slf4j +%if %{with bootstrap} +Name: %{base_name}-bootstrap +BuildRequires: ant +BuildArch: noarch +%else +Name: %{base_name} BuildRequires: aopalliance BuildRequires: apache-commons-cli BuildRequires: apache-commons-codec BuildRequires: apache-commons-logging -BuildRequires: atinject BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: glassfish-annotation-api +BuildRequires: google-errorprone-annotations +BuildRequires: google-gson BuildRequires: google-guice BuildRequires: guava BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core +BuildRequires: j2objc-annotations BuildRequires: jakarta-inject BuildRequires: jansi -BuildRequires: javapackages-local BuildRequires: jcl-over-slf4j -BuildRequires: jdom2 -BuildRequires: maven-resolver-api >= 1.9.25 +BuildRequires: jline3-jansi-core +BuildRequires: jline3-native +BuildRequires: jline3-terminal +BuildRequires: jline3-terminal-jni +BuildRequires: jspecify BuildRequires: maven-resolver-connector-basic -BuildRequires: maven-resolver-impl -BuildRequires: maven-resolver-named-locks -BuildRequires: maven-resolver-spi +BuildRequires: maven-resolver-supplier-mvn3 +BuildRequires: maven-resolver-transport-apache BuildRequires: maven-resolver-transport-file -BuildRequires: maven-resolver-transport-http BuildRequires: maven-resolver-transport-wagon -BuildRequires: maven-resolver-util BuildRequires: maven-shared-utils BuildRequires: maven-wagon-file BuildRequires: maven-wagon-http BuildRequires: maven-wagon-http-shared BuildRequires: maven-wagon-provider-api -BuildRequires: modello >= 2.0.0 -BuildRequires: objectweb-asm BuildRequires: plexus-cipher >= 2.0 BuildRequires: plexus-classworlds -BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-interpolation BuildRequires: plexus-metadata-generator BuildRequires: plexus-sec-dispatcher >= 2.0 -BuildRequires: plexus-utils -BuildRequires: plexus-xml -BuildRequires: qdox -BuildRequires: sisu-inject BuildRequires: sisu-plexus -BuildRequires: slf4j BuildRequires: slf4j-sources BuildRequires: unix2dos -BuildRequires: xbean BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildRequires: xmvn-subst BuildRequires: mvn(org.apache.maven:maven-parent:pom:) +#!BuildIgnore: maven-lib Requires: %{name}-lib = %{version}-%{release} Requires(post): aaa_base Requires(postun): aaa_base # maven-lib cannot be noarch because of the position of jansi.jar #BuildArch: noarch +%endif %description Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information. +%if %{without bootstrap} %package lib Summary: Core part of Maven # Require full javapackages-tools since maven-script uses @@ -120,48 +143,46 @@ Requires: apache-commons-logging Requires: atinject Requires: glassfish-annotation-api +Requires: google-errorprone-annotations +Requires: google-gson Requires: google-guice Requires: guava Requires: httpcomponents-client Requires: httpcomponents-core +Requires: j2objc-annotations Requires: jakarta-inject -Requires: jansi -Requires: javapackages-tools Requires: jcl-over-slf4j -Requires: junit +Requires: jline3-jansi-core +Requires: jline3-native +Requires: jline3-terminal +Requires: jline3-terminal-jni +Requires: jspecify Requires: maven-resolver-api Requires: maven-resolver-connector-basic Requires: maven-resolver-impl Requires: maven-resolver-named-locks Requires: maven-resolver-spi +Requires: maven-resolver-supplier-mvn3 +Requires: maven-resolver-transport-apache Requires: maven-resolver-transport-file -Requires: maven-resolver-transport-http Requires: maven-resolver-transport-wagon Requires: maven-resolver-util -Requires: maven-shared-utils Requires: maven-wagon-file Requires: maven-wagon-http Requires: maven-wagon-http-shared Requires: maven-wagon-provider-api Requires: objectweb-asm Requires: plexus-cipher -Requires: plexus-classworlds Requires: plexus-containers-component-annotations Requires: plexus-interpolation Requires: plexus-sec-dispatcher Requires: plexus-utils Requires: plexus-xml +Requires: python3 Requires: sisu-inject Requires: sisu-plexus Requires: slf4j -# Maven upstream uses patched version of SLF4J. They unpack -# slf4j-simple-sources.jar, apply non-upstreamable, Maven-specific -# patch (using a script written in Groovy), compile and package as -# maven-slf4j-provider.jar, together with Maven-specific additions. -Provides: bundled(slf4j) = %{bundled_slf4j_version} -# This package might be installed on a system, since it used to be -# produced by the binary maven repackaging in some repositories. -# This Obsoletes will allow a clean upgrade. +Obsoletes: %{name}-bootstrap Obsoletes: %{name}-jansi # If XMvn is part of the same RPM transaction then it should be # installed first to avoid triggering rhbz#1014355. @@ -178,14 +199,24 @@ %description javadoc %{summary}. +%endif + %prep -%setup -q -n apache-%{name}-%{version} -a10 +%setup -q -n apache-maven-%{file_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 +%if %{with bootstrap} +%patch -P 7 -p1 +%else +%if %{?pkg_vcmp:%pkg_vcmp jline3-terminal >= 4.1}%{!?pkg_vcmp:0} +%patch -P 8 -p1 +%endif +%endif # not really used during build, but a precaution find -name '*.jar' -not -path '*/test/*' -delete @@ -207,55 +238,61 @@ /buildNumber=/ d /timestamp=/ d " `find -name build.properties` -sed -i "s/version=.*/version=%{version}/" `find -name build.properties` sed -i "s/distributionId=.*/distributionId=apache-maven/" `find -name build.properties` sed -i "s/distributionShortName=.*/distributionShortName=Maven/" `find -name build.properties` sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build.properties` %{mvn_package} :apache-maven __noinstall +%pom_remove_dep :jline-terminal-ffm maven-jline +%pom_remove_dep :jline-terminal-ffm apache-maven %pom_remove_dep -r :logback-classic %pom_xpath_remove pom:parent/pom:relativePath -for i in maven-compat maven-core maven-embedder maven-model maven-model-builder maven-plugin-api maven-resolver-provider maven-settings-builder -do - %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 $i -done - +%if %{without bootstrap} %{mvn_alias} :maven-resolver-provider :maven-aether-provider +%endif + +(cd maven-core && python3 %{SOURCE100} pom.xml >build.properties) %build mkdir -p lib build-jar-repository -s lib \ atinject \ - commons-cli \ - glassfish-annotation-api \ - guice/google-guice \ - jakarta-inject \ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-impl \ maven-resolver/maven-resolver-named-locks \ maven-resolver/maven-resolver-spi \ maven-resolver/maven-resolver-util \ - maven-shared-utils/maven-shared-utils \ - maven-wagon/provider-api \ objectweb-asm/asm-commons \ objectweb-asm/asm \ org.eclipse.sisu.inject \ + plexus/interpolation \ + plexus/utils \ + plexus/xml \ + slf4j/api + +%if %{without bootstrap} + +build-jar-repository -s lib \ + commons-cli \ + guice/google-guice \ + jakarta-inject \ + jline3/jansi-core \ + jline3/jline-terminal \ + maven-resolver/maven-resolver-supplier-mvn3 \ + maven-wagon/provider-api \ org.eclipse.sisu.plexus \ plexus-classworlds \ plexus-containers/plexus-component-annotations \ - plexus/interpolation \ plexus/plexus-cipher \ - plexus/plexus-sec-dispatcher \ - plexus/utils \ - plexus/xml \ - slf4j/api \ - slf4j/simple + plexus/plexus-sec-dispatcher ln -s $(build-classpath slf4j/slf4j-simple-sources) lib/ -%{ant} \ + +ant \ -Dtest.skip=true \ + -Dproject.version=%{file_version} \ package javadoc %{mvn_artifact} pom.xml @@ -271,20 +308,38 @@ repository-metadata \ resolver-provider \ core \ + jline \ slf4j-provider \ embedder \ compat; do - cp -r %{name}-${i}/target/site/apidocs target/site/apidocs/%{name}-${i} - %{mvn_artifact} %{name}-${i}/pom.xml %{name}-${i}/target/%{name}-${i}-%{version}.jar + cp -r %{base_name}-${i}/target/site/apidocs target/site/apidocs/%{base_name}-${i} + %{mvn_artifact} %{base_name}-${i}/pom.xml %{base_name}-${i}/target/%{base_name}-${i}-%{file_version}.jar done +%else + +ant -f bootstrap.xml -Dtest.skip=true -Dproject.version=%{file_version} + +%endif + %install +%if %{with bootstrap} + +install -dm 0755 %{buildroot}%{_javadir}/%{base_name} +for i in \ + model-builder \ + resolver-provider; do + install -pm 0644 %{base_name}-${i}/target/%{base_name}-${i}-%{file_version}.jar \ + %{buildroot}%{_javadir}/%{base_name}/%{base_name}-${i}.jar +done + +%else %mvn_install %fdupes %{buildroot}%{_javadocdir} -install -d -m 755 %{buildroot}%{homedir}/boot -install -d -m 755 %{buildroot}%{confdir} -install -d -m 755 %{buildroot}%{_datadir}/bash-completion/completions/ +install -dm 0755 %{buildroot}%{homedir}/boot +install -dm 0755 %{buildroot}%{confdir} +install -dm 0755 %{buildroot}%{_datadir}/bash-completion/completions/ cp -a apache-maven/src/{bin,conf,lib} %{buildroot}%{homedir}/ rm -rf %{buildroot}%{homedir}/lib/*-native/ @@ -298,32 +353,41 @@ atinject \ commons-cli \ commons-codec \ + commons-logging \ glassfish-annotation-api \ + google-errorprone/annotations \ + google-gson/gson \ guava/guava \ guice/google-guice \ httpcomponents/httpclient \ httpcomponents/httpcore \ + j2objc-annotations \ jakarta-inject \ - jansi/jansi \ + jline3/jansi-core \ + jline3/jline-native \ + jline3/jline-terminal \ + jline3/jline-terminal-jni \ + jspecify \ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-connector-basic \ maven-resolver/maven-resolver-impl \ maven-resolver/maven-resolver-named-locks \ maven-resolver/maven-resolver-spi \ + maven-resolver/maven-resolver-supplier-mvn3 \ + maven-resolver/maven-resolver-transport-apache \ maven-resolver/maven-resolver-transport-file \ - maven-resolver/maven-resolver-transport-http \ maven-resolver/maven-resolver-transport-wagon \ maven-resolver/maven-resolver-util \ - maven-shared-utils/maven-shared-utils \ + maven-wagon/provider-api \ maven-wagon/file \ maven-wagon/http \ maven-wagon/http-shared \ - maven-wagon/provider-api \ objectweb-asm/asm \ org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ - plexus/plexus-cipher \ + plexus-containers/plexus-component-annotations \ plexus/interpolation \ + plexus/plexus-cipher \ plexus/plexus-sec-dispatcher \ plexus/utils \ plexus/xml \ @@ -349,9 +413,20 @@ install -d -m 0755 %{buildroot}%{_bindir} ln -sf %{homedir}/bin/mvn %{buildroot}%{_bindir}/ ln -sf %{homedir}/bin/mvnDebug %{buildroot}%{_bindir}/ -install -d -m 755 %{buildroot}%{_mandir}/man1/ +install -dm 0755 %{buildroot}%{_mandir}/man1/ install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/ +%endif + +%files +%if %{with bootstrap} +%{_javadir}/%{base_name} +%else +%{_bindir}/mvn +%{_bindir}/mvnDebug +%{_datadir}/bash-completion +%{_mandir}/man1/mvn.1%{?ext_man} + %files lib -f .mfiles %doc README.md %license LICENSE NOTICE @@ -362,12 +437,8 @@ %config(noreplace) %{confdir}/settings.xml %config(noreplace) %{confdir}/logging/simplelogger.properties -%files -%{_bindir}/mvn -%{_bindir}/mvnDebug -%{_datadir}/bash-completion -%{_mandir}/man1/mvn.1%{?ext_man} - %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE +%endif + ++++++ 0001-Adapt-mvn-script.patch ++++++ --- /var/tmp/diff_new_pack.dcqZEF/_old 2026-07-15 16:53:11.258054415 +0200 +++ /var/tmp/diff_new_pack.dcqZEF/_new 2026-07-15 16:53:11.258054415 +0200 @@ -1,14 +1,14 @@ -From e9df9156e0953b04e00c191eb7faaa9333a8f71d Mon Sep 17 00:00:00 2001 +From c35261bf7c4041ccbf7a8999af54b1b28ec4ebc7 Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Wed, 1 Feb 2017 14:54:26 +0100 -Subject: [PATCH 1/5] Adapt mvn script +Subject: [PATCH 1/7] Adapt mvn script --- apache-maven/src/bin/mvn | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn -index 47dc7d7f4e..01632abd29 100755 +index 2b3dc375fc..5028c5128e 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -22,7 +22,7 @@ @@ -65,6 +65,6 @@ # For Cygwin, switch paths to Windows format before running java -- -2.53.0 +2.55.0 ++++++ 0002-Invoke-logback-via-reflection.patch ++++++ --- /var/tmp/diff_new_pack.dcqZEF/_old 2026-07-15 16:53:11.270054813 +0200 +++ /var/tmp/diff_new_pack.dcqZEF/_new 2026-07-15 16:53:11.274054945 +0200 @@ -1,7 +1,7 @@ -From 78eea6718316f99993d303d1d8cc878a81ee920a Mon Sep 17 00:00:00 2001 +From 401c5b782c3c986b814c973c44044a011800f07d Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Tue, 6 Jun 2017 13:47:43 +0200 -Subject: [PATCH 2/5] Invoke logback via reflection +Subject: [PATCH 2/7] Invoke logback via reflection --- .../cli/logging/impl/LogbackConfiguration.java | 18 +++++++++++++----- @@ -47,6 +47,6 @@ @Override -- -2.53.0 +2.55.0 ++++++ 0003-Remove-dependency-on-powermock.patch ++++++ --- /var/tmp/diff_new_pack.dcqZEF/_old 2026-07-15 16:53:11.286055344 +0200 +++ /var/tmp/diff_new_pack.dcqZEF/_new 2026-07-15 16:53:11.290055476 +0200 @@ -1,26 +1,27 @@ -From 8ea520fbd09c890a75e82b3d614e21c4fbbecbe6 Mon Sep 17 00:00:00 2001 +From 97b958109b3f619fc7cabfbc8928a8028eb0c6f2 Mon Sep 17 00:00:00 2001 From: Marian Koncek <[email protected]> Date: Thu, 5 Sep 2019 15:21:04 +0200 -Subject: [PATCH 3/5] Remove dependency on powermock +Subject: [PATCH 3/7] Remove dependency on powermock --- - .../StringSearchModelInterpolatorTest.java | 62 ------------------- - 1 file changed, 62 deletions(-) + .../StringSearchModelInterpolatorTest.java | 63 ------------------- + 1 file changed, 63 deletions(-) diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java -index 039c0ee2a9..f15cb2b537 100644 +index 039c0ee2a9..0b873c688f 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java -@@ -44,8 +44,6 @@ +@@ -43,9 +43,6 @@ + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; - import static org.junit.jupiter.api.Assertions.assertNotNull; +-import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.powermock.reflect.Whitebox.getField; -import static org.powermock.reflect.Whitebox.getInternalState; /** * @author jdcasey -@@ -364,66 +362,6 @@ public void testInterpolateObjectWithPomFile() throws Exception { +@@ -364,66 +361,6 @@ public void testInterpolateObjectWithPomFile() throws Exception { is(System.getProperty("user.dir") + File.separator + '.' + File.separator + "target")))); } @@ -88,6 +89,6 @@ final Model model = new Model(); -- -2.53.0 +2.55.0 ++++++ 0004-Fix-build-with-qdox-2.0.1.patch ++++++ --- /var/tmp/diff_new_pack.dcqZEF/_old 2026-07-15 16:53:11.302055873 +0200 +++ /var/tmp/diff_new_pack.dcqZEF/_new 2026-07-15 16:53:11.302055873 +0200 @@ -1,7 +1,7 @@ -From 60726a6deacf106ebce36de5a19ec19c68739501 Mon Sep 17 00:00:00 2001 +From 7b0d2360d2d3ef056d297359b6acb6d49499df79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> Date: Tue, 2 May 2023 18:12:26 +0200 -Subject: [PATCH 4/5] Fix build with qdox-2.0.1 +Subject: [PATCH 4/7] Fix build with qdox-2.0.1 --- .../org/apache/maven/plugin/DefaultExtensionRealmCache.java | 2 +- @@ -17,10 +17,10 @@ 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java -index e2b712305a..fbe386c1db 100644 +index 6d24b4e59b..f01dab19a7 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java -@@ -138,7 +138,7 @@ public void flush() { +@@ -141,7 +141,7 @@ public void flush() { cache.clear(); } @@ -30,10 +30,10 @@ } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java -index f2088b593a..55000de738 100644 +index c789913c08..3275763c54 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java -@@ -177,7 +177,7 @@ protected static boolean pluginEquals(Plugin a, Plugin b) { +@@ -180,7 +180,7 @@ protected static boolean pluginEquals(Plugin a, Plugin b) { return CacheUtils.pluginEquals(a, b); } @@ -43,10 +43,10 @@ } } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java -index 10321374ba..070d747d0c 100644 +index 9889b7646c..95c70f96f1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java -@@ -204,7 +204,7 @@ protected static boolean pluginEquals(Plugin a, Plugin b) { +@@ -207,7 +207,7 @@ protected static boolean pluginEquals(Plugin a, Plugin b) { return CacheUtils.pluginEquals(a, b); } @@ -98,10 +98,10 @@ + void register(MavenProject project, Key key, CacheRecord rcrd); } diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java -index 1a1f706380..c3ac589471 100644 +index d736cca013..f3a14b07af 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java -@@ -115,7 +115,7 @@ public void flush() { +@@ -118,7 +118,7 @@ public void flush() { cache.clear(); } @@ -125,10 +125,10 @@ + void register(MavenProject project, Key key, CacheRecord rcrd); } diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java -index 0e59582e81..c761ecb8a8 100644 +index d453a8aafd..523a3b95a7 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java -@@ -229,7 +229,7 @@ public void flush() { +@@ -232,7 +232,7 @@ public void flush() { } @Override @@ -152,6 +152,6 @@ + void register(MavenProject project, Key cacheKey, CacheRecord rcrd); } -- -2.53.0 +2.55.0 ++++++ 0005-Reproducible-maven.build.timestamp.patch ++++++ --- /var/tmp/diff_new_pack.dcqZEF/_old 2026-07-15 16:53:11.314056272 +0200 +++ /var/tmp/diff_new_pack.dcqZEF/_new 2026-07-15 16:53:11.318056404 +0200 @@ -1,7 +1,7 @@ -From 8ca6cbaaac390e033b9269ac081bc48ce23c99c0 Mon Sep 17 00:00:00 2001 +From afa628d996b7d503a83465ec3700b7cb121ae294 Mon Sep 17 00:00:00 2001 From: Emmanuel Bourg <[email protected]> Date: Mon, 4 Sep 2023 17:10:19 +0200 -Subject: [PATCH 5/5] Reproducible maven.build.timestamp +Subject: [PATCH 5/7] Reproducible maven.build.timestamp Set the maven.build.timestamp variable to the date defined by the SOURCE_DATE_EPOCH environment variable to make the Maven @@ -12,7 +12,7 @@ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java -index f2af8036ae..9e0db2cb08 100644 +index f2af8036ae..58e0a2fa6c 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java +++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java @@ -44,7 +44,15 @@ public BuildTimestampValueSource(Date startTime, String format) { @@ -20,20 +20,20 @@ if ("build.timestamp".equals(expression) || "maven.build.timestamp".equals(expression)) { if (formattedDate == null && startTime != null) { - formattedDate = new SimpleDateFormat(format).format(startTime); -+ if ( System.getenv( "SOURCE_DATE_EPOCH" ) == null ) { -+ formattedDate = new SimpleDateFormat( format ).format( startTime ); ++ if (System.getenv("SOURCE_DATE_EPOCH") == null) { ++ formattedDate = new SimpleDateFormat(format).format(startTime); + } else { + // Use the SOURCE_DATE_EPOCH timestamp and make the format locale insensitive -+ SimpleDateFormat fmt = new SimpleDateFormat( format, java.util.Locale.ENGLISH ); -+ fmt.setTimeZone( java.util.TimeZone.getTimeZone( "UTC" ) ); -+ Date date = new Date( 1000 * Long.parseLong( System.getenv( "SOURCE_DATE_EPOCH" ) ) ); -+ formattedDate = fmt.format( date ); ++ SimpleDateFormat fmt = new SimpleDateFormat(format, java.util.Locale.ENGLISH); ++ fmt.setTimeZone(java.util.TimeZone.getTimeZone("UTC")); ++ Date date = new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))); ++ formattedDate = fmt.format(date); + } } return formattedDate; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java -index e1721334f4..2ea2ce3815 100644 +index e1721334f4..a9c3c82756 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java @@ -21,6 +21,7 @@ @@ -51,16 +51,16 @@ - SimpleDateFormat dateFormat = new SimpleDateFormat(timestampFormat); + + Locale locale = Locale.getDefault(); -+ if ( System.getenv( "SOURCE_DATE_EPOCH" ) != null ) { -+ time = new Date( 1000 * Long.parseLong( System.getenv( "SOURCE_DATE_EPOCH" ) ) ); ++ if (System.getenv("SOURCE_DATE_EPOCH") != null) { ++ time = new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))); + locale = Locale.ENGLISH; + } + -+ SimpleDateFormat dateFormat = new SimpleDateFormat( timestampFormat, locale ); ++ SimpleDateFormat dateFormat = new SimpleDateFormat(timestampFormat, locale); dateFormat.setCalendar(new GregorianCalendar()); dateFormat.setTimeZone(DEFAULT_BUILD_TIME_ZONE); formattedTimestamp = dateFormat.format(time); -- -2.53.0 +2.55.0 ++++++ 0006-Plexus-utils-4.x-Plexus-xml-3.x-and-javax.annotation.patch ++++++ >From 1efd3c5f4ff91d127f416573685d0d00ad7ae3e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> Date: Sat, 8 Nov 2025 10:16:48 +0100 Subject: [PATCH 6/7] Plexus-utils 4.x, Plexus-xml 3.x and javax.annotations --- maven-core/pom.xml | 4 ++++ maven-model/pom.xml | 4 ++++ maven-repository-metadata/pom.xml | 4 ++++ maven-settings/pom.xml | 4 ++++ pom.xml | 8 +++++++- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 764050bde7..56630a5e1d 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -127,6 +127,10 @@ under the License. <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> <!-- Plexus --> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/maven-model/pom.xml b/maven-model/pom.xml index ca28f22440..6c0d40af7e 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -41,6 +41,10 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml index 8f5fcbd3f3..291022857e 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -40,6 +40,10 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> + </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-api</artifactId> diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index 6408b2e9ad..816e9949db 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -40,6 +40,10 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> + </dependency> </dependencies> <build> diff --git a/pom.xml b/pom.xml index 07fd63400b..4672e7161e 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,8 @@ under the License. <plexusVersion>2.2.0</plexusVersion> <plexusInterpolationVersion>1.29</plexusInterpolationVersion> <!-- Blocked by 3.4.0+ changes, see MNG-7710, downgrade from parent 4.0.1 --> - <version.plexus-utils>3.6.1</version.plexus-utils> + <version.plexus-utils>4.0.2</version.plexus-utils> + <version.plexus-xml>3.0.2</version.plexus-xml> <guiceVersion>5.1.0</guiceVersion> <guavaVersion>33.6.0-jre</guavaVersion> <guavafailureaccessVersion>1.0.3</guavafailureaccessVersion> @@ -248,6 +249,11 @@ under the License. <artifactId>plexus-utils</artifactId> <version>${version.plexus-utils}</version> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> + <version>${version.plexus-xml}</version> + </dependency> <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> -- 2.55.0 ++++++ 0007-Do-not-depend-on-maven-resolver-supplier-mvn3.patch ++++++ >From 1938da4203b29c000d254eabd145c4f794d23e79 Mon Sep 17 00:00:00 2001 From: Fridrich Strba <[email protected]> Date: Wed, 10 Jun 2026 13:33:14 +0200 Subject: [PATCH 7/7] Do not depend on maven-resolver-supplier-mvn3 --- maven-resolver-provider/pom.xml | 4 ---- .../DefaultArtifactDescriptorReader.java | 18 +----------------- .../internal/DefaultVersionRangeResolver.java | 11 +---------- .../internal/DefaultVersionResolver.java | 11 +---------- 4 files changed, 3 insertions(+), 41 deletions(-) diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml index f772ac4c6b..18325610cb 100644 --- a/maven-resolver-provider/pom.xml +++ b/maven-resolver-provider/pom.xml @@ -64,10 +64,6 @@ under the License. <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-impl</artifactId> </dependency> - <dependency> - <groupId>org.apache.maven.resolver</groupId> - <artifactId>maven-resolver-supplier-mvn3</artifactId> - </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java index 3a7f81de7b..4c4a1d7618 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java @@ -70,8 +70,6 @@ import org.eclipse.aether.resolution.VersionRequest; import org.eclipse.aether.resolution.VersionResolutionException; import org.eclipse.aether.resolution.VersionResult; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; import org.eclipse.aether.transfer.ArtifactNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,7 +79,7 @@ */ @Named @Singleton -public class DefaultArtifactDescriptorReader implements ArtifactDescriptorReader, Service { +public class DefaultArtifactDescriptorReader implements ArtifactDescriptorReader { private RemoteRepositoryManager remoteRepositoryManager; private VersionResolver versionResolver; @@ -188,20 +186,6 @@ public DefaultArtifactDescriptorReader( setArtifactDescriptorDecorators(artifactDescriptorDecorators); } - @Deprecated - public void initService(ServiceLocator locator) { - setRemoteRepositoryManager(locator.getService(RemoteRepositoryManager.class)); - setVersionResolver(locator.getService(VersionResolver.class)); - setVersionRangeResolver(locator.getService(VersionRangeResolver.class)); - setArtifactResolver(locator.getService(ArtifactResolver.class)); - modelBuilder = locator.getService(ModelBuilder.class); - if (modelBuilder == null) { - setModelBuilder(new DefaultModelBuilderFactory().newInstance()); - } - setRepositoryEventDispatcher(locator.getService(RepositoryEventDispatcher.class)); - setModelCacheFactory(locator.getService(ModelCacheFactory.class)); - } - public DefaultArtifactDescriptorReader setRemoteRepositoryManager(RemoteRepositoryManager remoteRepositoryManager) { this.remoteRepositoryManager = Objects.requireNonNull(remoteRepositoryManager, "remoteRepositoryManager cannot be null"); diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java index 23b7bc84b5..1104d49329 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java @@ -53,8 +53,6 @@ import org.eclipse.aether.resolution.VersionRangeRequest; import org.eclipse.aether.resolution.VersionRangeResolutionException; import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; import org.eclipse.aether.spi.synccontext.SyncContextFactory; import org.eclipse.aether.util.ConfigUtils; import org.eclipse.aether.util.version.GenericVersionScheme; @@ -69,7 +67,7 @@ */ @Named @Singleton -public class DefaultVersionRangeResolver implements VersionRangeResolver, Service { +public class DefaultVersionRangeResolver implements VersionRangeResolver { /** * Configuration property for version range resolution used metadata {@link Metadata.Nature}. * It may contain string names of {@link Metadata.Nature} enum values, or string value {@code "auto"} @@ -104,13 +102,6 @@ public DefaultVersionRangeResolver( setRepositoryEventDispatcher(repositoryEventDispatcher); } - @Deprecated - public void initService(ServiceLocator locator) { - setMetadataResolver(locator.getService(MetadataResolver.class)); - setSyncContextFactory(locator.getService(SyncContextFactory.class)); - setRepositoryEventDispatcher(locator.getService(RepositoryEventDispatcher.class)); - } - public DefaultVersionRangeResolver setMetadataResolver(MetadataResolver metadataResolver) { this.metadataResolver = Objects.requireNonNull(metadataResolver, "metadataResolver cannot be null"); return this; diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java index cccbd9f5ff..3c556d683b 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java @@ -60,8 +60,6 @@ import org.eclipse.aether.resolution.VersionRequest; import org.eclipse.aether.resolution.VersionResolutionException; import org.eclipse.aether.resolution.VersionResult; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; import org.eclipse.aether.spi.synccontext.SyncContextFactory; import org.eclipse.aether.util.ConfigUtils; @@ -70,7 +68,7 @@ */ @Named @Singleton -public class DefaultVersionResolver implements VersionResolver, Service { +public class DefaultVersionResolver implements VersionResolver { private static final String MAVEN_METADATA_XML = "maven-metadata.xml"; @@ -101,13 +99,6 @@ public DefaultVersionResolver( setRepositoryEventDispatcher(repositoryEventDispatcher); } - @Deprecated - public void initService(ServiceLocator locator) { - setMetadataResolver(locator.getService(MetadataResolver.class)); - setSyncContextFactory(locator.getService(SyncContextFactory.class)); - setRepositoryEventDispatcher(locator.getService(RepositoryEventDispatcher.class)); - } - public DefaultVersionResolver setMetadataResolver(MetadataResolver metadataResolver) { this.metadataResolver = Objects.requireNonNull(metadataResolver, "metadataResolver cannot be null"); return this; -- 2.55.0 ++++++ _multibuild ++++++ <multibuild> <package>bootstrap</package> </multibuild> ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.dcqZEF/_old 2026-07-15 16:53:11.394058925 +0200 +++ /var/tmp/diff_new_pack.dcqZEF/_new 2026-07-15 16:53:11.398059058 +0200 @@ -1,6 +1,6 @@ -mtime: 1779097350 -commit: 225f742bcea19c3bc2b41985977e74ef5a9d91912f68bfe6e34d60ca3461854c +mtime: 1783943115 +commit: 5c41158521490ad7722f9e103fa77febf707eeea63a4f6fe0351fcbaf36ea383 url: https://src.opensuse.org/java-packages/maven -revision: 225f742bcea19c3bc2b41985977e74ef5a9d91912f68bfe6e34d60ca3461854c +revision: 5c41158521490ad7722f9e103fa77febf707eeea63a4f6fe0351fcbaf36ea383 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ apache-maven-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bootstrap.xml new/bootstrap.xml --- old/bootstrap.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/bootstrap.xml 2026-07-12 08:12:55.575496343 +0200 @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="maven-bootstrap" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <ant antfile="build.xml" dir="maven-artifact" target="clean"/> + <ant antfile="build.xml" dir="maven-model" target="clean"/> + <ant antfile="build.xml" dir="maven-builder-support" target="clean"/> + <ant antfile="build.xml" dir="maven-model-builder" target="clean"/> + <ant antfile="build.xml" dir="maven-repository-metadata" target="clean"/> + <ant antfile="build.xml" dir="maven-resolver-provider" target="clean"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <ant antfile="build.xml" dir="maven-artifact" target="compile"/> + <ant antfile="build.xml" dir="maven-model" target="compile"/> + <ant antfile="build.xml" dir="maven-builder-support" target="compile"/> + <ant antfile="build.xml" dir="maven-model-builder" target="compile"/> + <ant antfile="build.xml" dir="maven-repository-metadata" target="compile"/> + <ant antfile="build.xml" dir="maven-resolver-provider" target="compile"/> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" description="Compile the test code"> + <ant antfile="build.xml" dir="maven-artifact" target="compile-tests"/> + <ant antfile="build.xml" dir="maven-model" target="compile-tests"/> + <ant antfile="build.xml" dir="maven-builder-support" target="compile-tests"/> + <ant antfile="build.xml" dir="maven-model-builder" target="compile-tests"/> + <ant antfile="build.xml" dir="maven-repository-metadata" target="compile-tests"/> + <ant antfile="build.xml" dir="maven-resolver-provider" target="compile-tests"/> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" description="Run the test cases"> + <ant antfile="build.xml" dir="maven-artifact" target="test"/> + <ant antfile="build.xml" dir="maven-model" target="test"/> + <ant antfile="build.xml" dir="maven-builder-support" target="test"/> + <ant antfile="build.xml" dir="maven-model-builder" target="test"/> + <ant antfile="build.xml" dir="maven-repository-metadata" target="test"/> + <ant antfile="build.xml" dir="maven-resolver-provider" target="test"/> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <ant antfile="build.xml" dir="maven-artifact" target="javadoc"/> + <ant antfile="build.xml" dir="maven-model" target="javadoc"/> + <ant antfile="build.xml" dir="maven-builder-support" target="javadoc"/> + <ant antfile="build.xml" dir="maven-model-builder" target="javadoc"/> + <ant antfile="build.xml" dir="maven-repository-metadata" target="javadoc"/> + <ant antfile="build.xml" dir="maven-resolver-provider" target="javadoc"/> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" description="Package the application"> + <ant antfile="build.xml" dir="maven-artifact" target="package"/> + <ant antfile="build.xml" dir="maven-model" target="package"/> + <ant antfile="build.xml" dir="maven-builder-support" target="package"/> + <ant antfile="build.xml" dir="maven-model-builder" target="package"/> + <ant antfile="build.xml" dir="maven-repository-metadata" target="package"/> + <ant antfile="build.xml" dir="maven-resolver-provider" target="package"/> + </target> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2019-03-21 15:47:59.233542172 +0100 +++ new/build.xml 2026-07-12 08:12:55.575760902 +0200 @@ -17,6 +17,7 @@ <ant antfile="build.xml" dir="maven-repository-metadata" target="clean"/> <ant antfile="build.xml" dir="maven-resolver-provider" target="clean"/> <ant antfile="build.xml" dir="maven-core" target="clean"/> + <ant antfile="build.xml" dir="maven-jline" target="clean"/> <ant antfile="build.xml" dir="maven-slf4j-provider" target="clean"/> <ant antfile="build.xml" dir="maven-embedder" target="clean"/> <ant antfile="build.xml" dir="maven-compat" target="clean"/> @@ -37,6 +38,7 @@ <ant antfile="build.xml" dir="maven-repository-metadata" target="compile"/> <ant antfile="build.xml" dir="maven-resolver-provider" target="compile"/> <ant antfile="build.xml" dir="maven-core" target="compile"/> + <ant antfile="build.xml" dir="maven-jline" target="compile"/> <ant antfile="build.xml" dir="maven-slf4j-provider" target="compile"/> <ant antfile="build.xml" dir="maven-embedder" target="compile"/> <ant antfile="build.xml" dir="maven-compat" target="compile"/> @@ -57,6 +59,7 @@ <ant antfile="build.xml" dir="maven-repository-metadata" target="compile-tests"/> <ant antfile="build.xml" dir="maven-resolver-provider" target="compile-tests"/> <ant antfile="build.xml" dir="maven-core" target="compile-tests"/> + <ant antfile="build.xml" dir="maven-jline" target="compile-tests"/> <ant antfile="build.xml" dir="maven-slf4j-provider" target="compile-tests"/> <ant antfile="build.xml" dir="maven-embedder" target="compile-tests"/> <ant antfile="build.xml" dir="maven-compat" target="compile-tests"/> @@ -77,6 +80,7 @@ <ant antfile="build.xml" dir="maven-repository-metadata" target="test"/> <ant antfile="build.xml" dir="maven-resolver-provider" target="test"/> <ant antfile="build.xml" dir="maven-core" target="test"/> + <ant antfile="build.xml" dir="maven-jline" target="test"/> <ant antfile="build.xml" dir="maven-slf4j-provider" target="test"/> <ant antfile="build.xml" dir="maven-embedder" target="test"/> <ant antfile="build.xml" dir="maven-compat" target="test"/> @@ -96,6 +100,7 @@ <ant antfile="build.xml" dir="maven-settings-builder" target="javadoc"/> <ant antfile="build.xml" dir="maven-repository-metadata" target="javadoc"/> <ant antfile="build.xml" dir="maven-resolver-provider" target="javadoc"/> + <ant antfile="build.xml" dir="maven-jline" target="javadoc"/> <ant antfile="build.xml" dir="maven-core" target="javadoc"/> <ant antfile="build.xml" dir="maven-slf4j-provider" target="javadoc"/> <ant antfile="build.xml" dir="maven-embedder" target="javadoc"/> @@ -117,6 +122,7 @@ <ant antfile="build.xml" dir="maven-repository-metadata" target="package"/> <ant antfile="build.xml" dir="maven-resolver-provider" target="package"/> <ant antfile="build.xml" dir="maven-core" target="package"/> + <ant antfile="build.xml" dir="maven-jline" target="package"/> <ant antfile="build.xml" dir="maven-slf4j-provider" target="package"/> <ant antfile="build.xml" dir="maven-embedder" target="package"/> <ant antfile="build.xml" dir="maven-compat" target="package"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2026-05-15 08:59:55.952210161 +0200 +++ new/common.xml 2026-07-12 08:12:55.576675447 +0200 @@ -3,12 +3,12 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="3.9.16"/> + <property name="project.version" value="3.10.0-SNAPSHOT"/> <property name="project.groupId" value="org.apache.maven"/> <property name="project.organization.name" value="The Apache Software Foundation"/> - <property name="spec.version" value="3.9"/> + <property name="spec.version" value="3.10"/> <property name="compiler.release" value="8"/> <property name="compiler.source" value="1.${compiler.release}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-artifact/build.xml new/maven-artifact/build.xml --- old/maven-artifact/build.xml 2024-06-11 17:01:58.383010068 +0200 +++ new/maven-artifact/build.xml 2026-07-12 08:12:55.577927995 +0200 @@ -211,6 +211,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.artifact"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-builder-support/build.xml new/maven-builder-support/build.xml --- old/maven-builder-support/build.xml 2024-06-11 17:01:47.496264249 +0200 +++ new/maven-builder-support/build.xml 2026-07-12 08:12:55.578213623 +0200 @@ -214,6 +214,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.builder"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-compat/build.xml new/maven-compat/build.xml --- old/maven-compat/build.xml 2024-06-11 17:01:34.176167398 +0200 +++ new/maven-compat/build.xml 2026-07-12 08:12:55.578531742 +0200 @@ -305,6 +305,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.builder"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-core/build.xml new/maven-core/build.xml --- old/maven-core/build.xml 2024-06-11 17:01:10.245993390 +0200 +++ new/maven-core/build.xml 2026-07-12 08:12:55.578865491 +0200 @@ -126,6 +126,9 @@ </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> + <filterchain> + <expandproperties/> + </filterchain> </copy> <mkdir dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/> <propertyfile file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties"> @@ -323,6 +326,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.core"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-embedder/build.xml new/maven-embedder/build.xml --- old/maven-embedder/build.xml 2025-07-16 06:38:13.058119341 +0200 +++ new/maven-embedder/build.xml 2026-07-12 08:12:55.579177464 +0200 @@ -26,15 +26,12 @@ <property name="build.mdoDir" value="src/main/mdo"/> <property name="build.mdoOutputDir" value="${build.dir}/generated-sources/modello"/> - <property name="repo.local" value="${user.home}/.m2/repository"/> - <property name="settings.offline" value="false"/> - <property name="settings.interactiveMode" value="true"/> - <!-- ====================================================================== --> <!-- Defining classpaths --> <!-- ====================================================================== --> <path id="build.classpath"> + <pathelement location="../maven-jline/target/classes"/> <pathelement location="../maven-settings/target/classes"/> <pathelement location="../maven-settings-builder/target/classes"/> <pathelement location="../maven-core/target/classes"/> @@ -51,6 +48,7 @@ </fileset> </path> <path id="build.test.classpath"> + <pathelement location="../maven-jline/target/classes"/> <pathelement location="../maven-settings/target/classes"/> <pathelement location="../maven-settings-builder/target/classes"/> <pathelement location="../maven-core/target/classes"/> @@ -307,6 +305,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.embedder"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-jline/build.xml new/maven-jline/build.xml --- old/maven-jline/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/maven-jline/build.xml 2026-07-12 08:12:55.579432840 +0200 @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="maven-jline" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="maven-jline"/> + <property name="project.name" value="Maven 3 JLine integration"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../maven-core/target/classes"/> + <pathelement location="../maven-model/target/classes"/> + <pathelement location="../maven-settings/target/classes"/> + <pathelement location="../maven-settings-builder/target/classes"/> + <pathelement location="../maven-repository-metadata/target/classes"/> + <pathelement location="../maven-plugin-api/target/classes"/> + <pathelement location="../maven-resolver-provider/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="build.test.classpath"> + <pathelement location="../maven-core/target/classes"/> + <pathelement location="../maven-model/target/classes"/> + <pathelement location="../maven-settings/target/classes"/> + <pathelement location="../maven-settings-builder/target/classes"/> + <pathelement location="../maven-repository-metadata/target/classes"/> + <pathelement location="../maven-plugin-api/target/classes"/> + <pathelement location="../maven-resolver-provider/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + encoding="UTF-8" + optimize="false" + deprecation="true" + release="${compiler.release}" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <mkdir dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/> + <propertyfile file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties"> + <entry key="artifactId" value="${project.artifactId}"/> + <entry key="groupId" value="${project.groupId}"/> + <entry key="version" value="${project.version}"/> + </propertyfile> + <copy file="pom.xml" tofile="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"/> + </target> + + <!-- ====================================================================== --> + <!-- Sisu javax.inject.Named generation target --> + <!-- ====================================================================== --> + + <target name="sisu" + depends="compile" + description="Generate javax.inject.Name index"> + <sequential> + <java classname="org.eclipse.sisu.space.SisuIndex" + failonerror="true" + fork="true"> + <classpath> + <path refid="build.classpath"/> + </classpath> + <arg value="${build.outputDir}"/> + </java> + <move todir="${build.outputDir}/META-INF"> + <fileset dir="META-INF"/> + </move> + </sequential> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + source="${compiler.source}" + verbose="false" + locale="en" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + encoding="UTF-8" + linksource="false" + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="sisu" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.jline"/> + <attribute name="Implementation-Title" value="${project.name}"/> + <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> + <attribute name="Implementation-Vendor" value="${project.organization.name}"/> + <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> + <attribute name="Implementation-Version" value="${project.version}"/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Specification-Title" value="${project.name}"/> + <attribute name="Specification-Vendor" value="${project.organization.name}"/> + <attribute name="Specification-Version" value="${spec.version}"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-model/build.xml new/maven-model/build.xml --- old/maven-model/build.xml 2024-06-11 17:00:14.222252699 +0200 +++ new/maven-model/build.xml 2026-07-12 08:12:55.579994916 +0200 @@ -79,6 +79,7 @@ <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-reader"/> <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-extended-reader"/> <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer"/> + <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-extended-writer"/> </sequential> </macrodef> <modello file="${build.mdoDir}/maven.mdo"/> @@ -254,6 +255,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.model"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-model-builder/build.xml new/maven-model-builder/build.xml --- old/maven-model-builder/build.xml 2024-06-11 17:00:30.885707192 +0200 +++ new/maven-model-builder/build.xml 2026-07-12 08:12:55.579716224 +0200 @@ -245,6 +245,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.model.builder"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-plugin-api/build.xml new/maven-plugin-api/build.xml --- old/maven-plugin-api/build.xml 2024-06-11 16:59:59.158809833 +0200 +++ new/maven-plugin-api/build.xml 2026-07-12 08:12:55.580279070 +0200 @@ -260,6 +260,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.plugin"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-repository-metadata/build.xml new/maven-repository-metadata/build.xml --- old/maven-repository-metadata/build.xml 2024-06-11 16:59:41.405347406 +0200 +++ new/maven-repository-metadata/build.xml 2026-07-12 08:12:55.580555672 +0200 @@ -202,6 +202,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.repository.metadata"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-resolver-provider/build.xml new/maven-resolver-provider/build.xml --- old/maven-resolver-provider/build.xml 2024-06-11 16:59:32.765284577 +0200 +++ new/maven-resolver-provider/build.xml 2026-07-12 08:12:55.581064637 +0200 @@ -246,6 +246,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.resolver.provider"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-settings/build.xml new/maven-settings/build.xml --- old/maven-settings/build.xml 2024-06-11 16:58:41.581579077 +0200 +++ new/maven-settings/build.xml 2026-07-12 08:12:55.581617310 +0200 @@ -209,6 +209,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.settings"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-settings-builder/build.xml new/maven-settings-builder/build.xml --- old/maven-settings-builder/build.xml 2024-06-11 16:59:14.518485235 +0200 +++ new/maven-settings-builder/build.xml 2026-07-12 08:12:55.581341979 +0200 @@ -240,6 +240,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.settings.builder"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-slf4j-provider/build.xml new/maven-slf4j-provider/build.xml --- old/maven-slf4j-provider/build.xml 2025-07-16 06:44:56.525459431 +0200 +++ new/maven-slf4j-provider/build.xml 2026-07-12 08:12:55.581877445 +0200 @@ -33,11 +33,15 @@ <!-- ====================================================================== --> <path id="build.classpath"> + <pathelement location="../maven-jline/target/classes"/> + <pathelement location="../maven-core/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> </path> <path id="build.test.classpath"> + <pathelement location="../maven-jline/target/classes"/> + <pathelement location="../maven-core/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -59,8 +63,8 @@ <mkdir dir="${build.unpackDir}"/> <unzip src="${slf4j.simple.sources.jar}" dest="${build.unpackDir}"> <patternset> - <include name="org/slf4j/impl/*.java"/> - <exclude name="org/slf4j/impl/StaticLoggerBinder*"/> + <include name="org/slf4j/simple/*.java"/> + <exclude name="org/slf4j/simple/SimpleServiceProvider*"/> </patternset> </unzip> </target> @@ -88,6 +92,9 @@ </src> <classpath refid="build.classpath"/> </javac> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"/> + </copy> <mkdir dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/> <propertyfile file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties"> <entry key="artifactId" value="${project.artifactId}"/> @@ -186,6 +193,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> + <attribute name="Automatic-Module-Name" value="org.apache.maven.v3.slf4j.provider"/> <attribute name="Implementation-Title" value="${project.name}"/> <attribute name="Implementation-URL" value="https://maven.apache.org/ref/${project.version}/${project.artifactId}/"/> <attribute name="Implementation-Vendor" value="${project.organization.name}"/> ++++++ 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-13 13:45:15.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ jline-4.1.x.patch ++++++ --- a/maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java +++ b/maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java @@ -33,6 +33,7 @@ import org.jline.terminal.Cursor; import org.jline.terminal.MouseEvent; import org.jline.terminal.Size; +import org.jline.terminal.Sized; import org.jline.terminal.Terminal; import org.jline.terminal.spi.SystemStream; import org.jline.terminal.spi.TerminalExt; @@ -169,6 +170,10 @@ public void setSize(Size size) { getTerminal().setSize(size); } + public void setSize(Sized sized) { + getTerminal().setSize(sized); + } + @Override public int getWidth() { return getTerminal().getWidth(); ++++++ pom_properties.py ++++++ from javapackages.maven.pom import POM, PomLoadingException from javapackages.xmvn.xmvn_resolve import (XMvnResolve, ResolutionRequest, XMvnResolveException) from javapackages.common.exception import JavaPackagesToolsException import sys import os def get_parent_pom(pom): req = ResolutionRequest(pom.groupId, pom.artifactId, extension="pom", version=pom.version) result = XMvnResolve.process_raw_request([req])[0] if not result: raise XMvnResolveException("Unable to resolve parent POM {g}:{a}:{e}:{v}" .format(g=pom.groupId, a=pom.artifactId, e="pom", v=pom.version)) return POM(result.artifactPath) def gather_properties(pom_path): pom = POM(pom_path) props = pom.properties curr_pom = pom parent = pom.parent while parent: ppom = None if hasattr(parent, "relativePath") and parent.relativePath != "": try: ppom_path = os.path.join(os.path.dirname(curr_pom._path), parent.relativePath) if os.path.isdir(ppom_path): ppom_path = os.path.join(ppom_path, 'pom.xml') ppom = POM(ppom_path) except PomLoadingException: pass else: try: ppom_path = os.path.join(os.path.dirname(curr_pom._path), '..') if os.path.isdir(ppom_path): ppom_path = os.path.join(ppom_path, 'pom.xml') ppom = POM(ppom_path) except PomLoadingException: pass if not ppom: try: ppom = get_parent_pom(parent) except XMvnResolveException: break parent = ppom.parent pprops = ppom.properties # merge "properties" sections for pkey in pprops: if pkey not in props: props[pkey] = pprops[pkey] curr_pom = ppom return props def _main(): if not os.path.exists(sys.argv[1]): message = ("The first argument '{0}' doesn't point to an existing file ").format(sys.argv[1]) parser.error(message) pom_path = sys.argv[1] props = gather_properties(pom_path) for key, value in props.items(): print(f"{key}={value}") if __name__ == "__main__": try: _main() except JavaPackagesToolsException as e: sys.exit(e)
