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-10-01 16:43:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven (Old) and /work/SRC/openSUSE:Factory/.maven.new.1253 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven" Thu Oct 1 16:43:14 2026 rev:40 rq:1381891 version:3.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven/maven.changes 2026-07-15 16:53:09.069981847 +0200 +++ /work/SRC/openSUSE:Factory/.maven.new.1253/maven.changes 2026-10-01 16:44:41.126106405 +0200 @@ -1,0 +2,121 @@ +Thu Oct 1 11:14:21 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to upstream release 3.10.0 + * New features and improvements + + Maven 3.10.x should use Maven 3.1 validation in strict mode + + Do not depend on maven-resolver-supplier-mvn3 + + MNG-6797: Remember if Maven model problems were encountered. + + feat: add relativePath validation + + Add validation for Plexus-based plugin dependency injection + + Introduce validation control + + Update to Resolver 2.0.21 + + MNG-5913: Allow defining aliases for existing server + configurations in settings.xml + * Bug Fixes + + Issue #13265: let a settings server declare the repository + origins its credentials may be used with + + Backport #13040: treat reactor BOM imports as ProjectSorter + edges so -am includes them + + MNG-8174: Fix NPE when a property references itself in a + plugin configuration (backport #12932) + + Fix #13200: publish a complete set from + MavenProject.getArtifacts + + Fixes #13135: ensure completeness of the reactor summary, + privilege failures last + + Fix #13084: sandbox profile activation context for external + model builds + + Fix #13100: honor repositories from legitimately-active + external model profiles + + Add support for MAVEN_PROJECTBASEDIR substitution in + jvm.config (backport of MNG-8598 to 3.10.x) + + Scope server credentials and validate legacy relocation + coordinates + + Honour configured policy and validate inputs on the legacy + compat paths + + Add unit test for #12600 null-guard in forked executions + + Fix: make ProjectIndex thread-safe for parallel builds + + Fail on misconfigured plugin-requested toolchains + + Resolve classified POM artifacts from the reactor in Maven 3.x + + Convert paths for MSYS2 and jvm.config placeholders in bin/mvn + + Preserve dependency scope in plugin artifacts + * Documentation updates + + docs: document plugin.xml V4 vs V3 + + Port the site documentation from APT to Markdown + + improve doc about deprecating plugin descriptor's requirement + + Drop mention of Plexus XML + * Maintenance + + maintenance: Align use of profiles + + Remove version from rat directory deployment + + Update NOTICE file in distribution packages + + Restrict what a repository-resolved model contributes to the + build + + Validate coordinates and repository precedence during artifact + resolution + + MNG-8129: Clarify relativePath validation comment + + Keep plexus-cipher at 2.0: POM note + + Use try-with-resources + + Migrate the embedder-test-project fixture to JUnit 5 + + Port the site documentation from APT to Markdown + + Migrate legacy plugin Javadoc annotations in Maven Embedder + tests + + Replace custom GraphLogger with DependencyGraphDumper in + dependency resolution + + Fix UT: do not use checkout directly + * Build + + Replace nicoulaj checksum plugin with maveniverse checksum + plugin + + 3.10.x Build by JDK 25, limit JDK to min and max LTS in build + + Update Maven version to 3.10.0-rc-1 in GH configuration + * Dependency updates + + deps: Update to Maven Resolver 2.0.24 + + bump xmlunitVersion from 2.12.0 to 2.14.0 + + build: bump org.apache.maven:maven-parent from 49 to 50 + + Resolver 2.0.23 and validation cleanup + + Bump org.codehaus.mojo:build-helper-maven-plugin from 3.6.1 + to 3.6.2 + + Bump org.codehaus.mojo:buildnumber-maven-plugin from 3.3.0 to + 3.3.1 + + Bump org.codehaus.mojo:exec-maven-plugin from 3.6.3 to 3.6.4 + + Bump org.codehaus.mojo:animal-sniffer-maven-plugin from 1.27 + to 1.28 + + Bump actions/setup-java from 5.4.0 to 6.0.1 + + Bump jlineVersion from 3.30.15 to 3.30.17 + + Bump slf4jVersion from 2.0.18 to 2.0.19 + + Bump org.codehaus.modello:modello-maven-plugin from 2.7.0 + to 2.8.1 + + [12811] Keep plexus-cipher at 2.0: POM note + + Deps: Bump to Resolver 2.0.22 + + Bump resolverVersion from 2.0.21 to 2.0.22 + + Bump org.codehaus.plexus:plexus-interpolation from 1.29 to + 1.30.0 + + Bump com.google.guava:guava from 33.6.0-jre to 33.7.1-jre + + Bump org.codehaus.plexus:plexus-utils from 3.6.1 to 3.6.2 + + Bump org.codehaus.plexus:plexus-testing from 2.1.0 to 2.2.0 + + Bump org.codehaus.modello:modello-maven-plugin from 2.7.0 + to 2.8.0 + + Bump org.codehaus.plexus:plexus-classworlds from 2.12.0 to + 2.12.1 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /release-drafter.yml from 4 to 5 + + Deps: Bump to Eclipse Sisu 1.1.0 + + Bump resolverVersion from 2.0.21-SNAPSHOT to 2.0.21 + + Bump actions/checkout from 7.0.0 to 7.0.1 + + Update to Resolver 2.0.21 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /pr-automation.yml from 4 to 5 +- 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 + * 0006-Plexus-utils-4.x-Plexus-xml-3.x-and-javax.annotation.patch + + rebase and adapt to new context + * jline-4.1.x.patch -> jline-4.4.x.patch + + allow building with jline 4.4.x if needed (this patch is only + conditionally applied) +- Removed patch: + * 0007-Do-not-depend-on-maven-resolver-supplier-mvn3.patch + + not needed any more, since landed upstream + +------------------------------------------------------------------- Old: ---- 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 New: ---- apache-maven-3.10.0-src.tar.gz jline-4.4.x.patch ----------(Old B)---------- Old:- Removed patch: * 0007-Do-not-depend-on-maven-resolver-supplier-mvn3.patch + not needed any more, since landed upstream Old: + rebase and adapt to new context * jline-4.1.x.patch -> jline-4.4.x.patch + allow building with jline 4.4.x if needed (this patch is only ----------(Old E)---------- ----------(New B)---------- New: + rebase and adapt to new context * jline-4.1.x.patch -> jline-4.4.x.patch + allow building with jline 4.4.x if needed (this patch is only ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven.spec ++++++ --- /var/tmp/diff_new_pack.0Ae7zH/_old 2026-10-01 16:44:42.559166479 +0200 +++ /var/tmp/diff_new_pack.0Ae7zH/_new 2026-10-01 16:44:42.561166563 +0200 @@ -19,14 +19,8 @@ %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 +Name: %{base_name}%{?maven_version_suffix} +Version: 3.10.0 Release: 0 Summary: Java project management and project comprehension tool # maven itself is ASL 2.0 @@ -34,7 +28,7 @@ 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}-3/%{file_version}/source/apache-%{base_name}-%{file_version}-src.tar.gz +Source0: https://archive.apache.org/dist/%{base_name}/%{base_name}-3/%{version}/source/apache-%{base_name}-%{version}-src.tar.gz Source1: maven-bash-completion Source2: mvn.1 Source10: apache-%{base_name}-build.tar.xz @@ -45,33 +39,13 @@ 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 +Patch7: jline-4.4.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 @@ -84,48 +58,57 @@ BuildRequires: j2objc-annotations BuildRequires: jakarta-inject BuildRequires: jansi +BuildRequires: javapackages-local BuildRequires: jcl-over-slf4j BuildRequires: jline3-jansi-core BuildRequires: jline3-native BuildRequires: jline3-terminal BuildRequires: jline3-terminal-jni BuildRequires: jspecify +BuildRequires: maven-resolver-api BuildRequires: maven-resolver-connector-basic -BuildRequires: maven-resolver-supplier-mvn3 +BuildRequires: maven-resolver-impl +BuildRequires: maven-resolver-named-locks +BuildRequires: maven-resolver-spi BuildRequires: maven-resolver-transport-apache BuildRequires: maven-resolver-transport-file 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-ant-task +BuildRequires: objectweb-asm BuildRequires: plexus-cipher >= 2.0 BuildRequires: plexus-classworlds BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-metadata-generator +BuildRequires: plexus-interpolation +BuildRequires: plexus-metadata-generator-ant BuildRequires: plexus-sec-dispatcher >= 2.0 +BuildRequires: plexus-utils +BuildRequires: plexus-xml +BuildRequires: sisu-inject BuildRequires: sisu-plexus +BuildRequires: slf4j BuildRequires: slf4j-sources BuildRequires: unix2dos 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 +# maven-lib cannot be noarch because of the position of jline-native.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 @@ -162,7 +145,6 @@ 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-wagon @@ -199,10 +181,8 @@ %description javadoc %{summary}. -%endif - %prep -%setup -q -n apache-maven-%{file_version} -a10 +%setup -q -n apache-maven-%{version} -a10 %patch -P 1 -p1 %patch -P 2 -p1 @@ -210,12 +190,8 @@ %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 +%patch -P 7 -p1 %endif # not really used during build, but a precaution @@ -223,6 +199,8 @@ find -name '*.class' -delete find -name '*.bat' -delete +sed -i "s/@{maven_version_suffix}/%{?maven_version_suffix}/" apache-maven/src/bin/mvn + sed -i 's:\r::' apache-maven/src/conf/settings.xml # Downloads dependency licenses from the Internet and aggregates them. @@ -250,9 +228,7 @@ %pom_xpath_remove pom:parent/pom:relativePath -%if %{without bootstrap} %{mvn_alias} :maven-resolver-provider :maven-aether-provider -%endif (cd maven-core && python3 %{SOURCE100} pom.xml >build.properties) @@ -260,39 +236,38 @@ mkdir -p lib build-jar-repository -s lib \ atinject \ + commons-cli \ + guice/google-guice \ + jakarta-inject \ + jline3/jansi-core \ + jline3/jline-terminal \ 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-transport-apache \ + maven-resolver/maven-resolver-transport-file \ maven-resolver/maven-resolver-util \ + maven-wagon/provider-api \ objectweb-asm/asm-commons \ objectweb-asm/asm \ org.eclipse.sisu.inject \ + 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 -%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/plexus-cipher \ - plexus/plexus-sec-dispatcher ln -s $(build-classpath slf4j/slf4j-simple-sources) lib/ ant \ -Dtest.skip=true \ - -Dproject.version=%{file_version} \ + -Dproject.version=%{version} \ package javadoc %{mvn_artifact} pom.xml @@ -313,27 +288,10 @@ embedder \ compat; do 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 + %{mvn_artifact} %{base_name}-${i}/pom.xml %{base_name}-${i}/target/%{base_name}-${i}-%{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} @@ -373,7 +331,6 @@ 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-wagon \ @@ -416,12 +373,7 @@ 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 @@ -440,5 +392,3 @@ %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE -%endif - ++++++ 0001-Adapt-mvn-script.patch ++++++ --- /var/tmp/diff_new_pack.0Ae7zH/_old 2026-10-01 16:44:42.594167946 +0200 +++ /var/tmp/diff_new_pack.0Ae7zH/_new 2026-10-01 16:44:42.598168114 +0200 @@ -1,14 +1,14 @@ -From c35261bf7c4041ccbf7a8999af54b1b28ec4ebc7 Mon Sep 17 00:00:00 2001 +From ee14a2820b9805637de096c2f3747364119f188c Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Wed, 1 Feb 2017 14:54:26 +0100 -Subject: [PATCH 1/7] Adapt mvn script +Subject: [PATCH 1/6] Adapt mvn script --- - apache-maven/src/bin/mvn | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) + apache-maven/src/bin/mvn | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn -index 2b3dc375fc..5028c5128e 100755 +index 73f6d12f81..e9c1370cad 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -22,7 +22,7 @@ @@ -20,12 +20,20 @@ # MAVEN_ARGS (Optional) Arguments passed to Maven before CLI arguments. # MAVEN_OPTS (Optional) Java runtime options used when Maven is executed. # MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files. -@@ -38,12 +38,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then +@@ -30,20 +30,28 @@ + + if [ -z "$MAVEN_SKIP_RC" ] ; then + +- if [ -f /usr/local/etc/mavenrc ] ; then +- . /usr/local/etc/mavenrc +- fi +- + if [ -f /etc/mavenrc ] ; then . /etc/mavenrc fi -+ if [ -f /etc/java/maven.conf ] ; then -+ . /etc/java/maven.conf ++ if [ -f /etc/java/maven@{maven_version_suffix}.conf ] ; then ++ . /etc/java/maven@{maven_version_suffix}.conf + fi + if [ -f "$HOME/.mavenrc" ] ; then @@ -42,10 +50,10 @@ +export JAVA_HOME +export JAVACMD + - # OS specific support. $var _must_ be set to either true or false. - cygwin=false; - mingw=false; -@@ -68,7 +80,8 @@ done + # Note on echo vs printf: several POSIX shells (dash and the other Almquist + # derivatives commonly installed as /bin/sh) expand backslash escapes in echo. + # Windows paths are full of backslashes, so C:\tmp\build would be printed with a +@@ -91,7 +99,8 @@ done saveddir=`pwd` @@ -55,7 +63,7 @@ # make it fully qualified MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` -@@ -106,7 +119,7 @@ if [ ! -x "$JAVACMD" ] ; then +@@ -129,7 +138,7 @@ if [ ! -x "$JAVACMD" ] ; then exit 1 fi @@ -63,7 +71,7 @@ +CLASSWORLDS_JAR=`build-classpath plexus-classworlds` CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - # For Cygwin, switch paths to Windows format before running java + # For Cygwin and MinGW, switch paths to Windows format before running java(1) -- 2.55.0 ++++++ 0002-Invoke-logback-via-reflection.patch ++++++ --- /var/tmp/diff_new_pack.0Ae7zH/_old 2026-10-01 16:44:42.619168994 +0200 +++ /var/tmp/diff_new_pack.0Ae7zH/_new 2026-10-01 16:44:42.623169162 +0200 @@ -1,7 +1,7 @@ -From 401c5b782c3c986b814c973c44044a011800f07d Mon Sep 17 00:00:00 2001 +From cdec1e78bcbd05c88fd3e365e0699347adef10ea Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Tue, 6 Jun 2017 13:47:43 +0200 -Subject: [PATCH 2/7] Invoke logback via reflection +Subject: [PATCH 2/6] Invoke logback via reflection --- .../cli/logging/impl/LogbackConfiguration.java | 18 +++++++++++++----- ++++++ 0003-Remove-dependency-on-powermock.patch ++++++ --- /var/tmp/diff_new_pack.0Ae7zH/_old 2026-10-01 16:44:42.640169874 +0200 +++ /var/tmp/diff_new_pack.0Ae7zH/_new 2026-10-01 16:44:42.645170084 +0200 @@ -1,7 +1,7 @@ -From 97b958109b3f619fc7cabfbc8928a8028eb0c6f2 Mon Sep 17 00:00:00 2001 +From fd43416e234cb3759f68bb4046d8b6324b1c5933 Mon Sep 17 00:00:00 2001 From: Marian Koncek <[email protected]> Date: Thu, 5 Sep 2019 15:21:04 +0200 -Subject: [PATCH 3/7] Remove dependency on powermock +Subject: [PATCH 3/6] Remove dependency on powermock --- .../StringSearchModelInterpolatorTest.java | 63 ------------------- ++++++ 0004-Fix-build-with-qdox-2.0.1.patch ++++++ --- /var/tmp/diff_new_pack.0Ae7zH/_old 2026-10-01 16:44:42.661170755 +0200 +++ /var/tmp/diff_new_pack.0Ae7zH/_new 2026-10-01 16:44:42.666170964 +0200 @@ -1,7 +1,7 @@ -From 7b0d2360d2d3ef056d297359b6acb6d49499df79 Mon Sep 17 00:00:00 2001 +From fa8a25c92d3bee549280aee091d49267cd127d9a 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/7] Fix build with qdox-2.0.1 +Subject: [PATCH 4/6] Fix build with qdox-2.0.1 --- .../org/apache/maven/plugin/DefaultExtensionRealmCache.java | 2 +- ++++++ 0005-Reproducible-maven.build.timestamp.patch ++++++ --- /var/tmp/diff_new_pack.0Ae7zH/_old 2026-10-01 16:44:42.685171761 +0200 +++ /var/tmp/diff_new_pack.0Ae7zH/_new 2026-10-01 16:44:42.690171970 +0200 @@ -1,7 +1,7 @@ -From afa628d996b7d503a83465ec3700b7cb121ae294 Mon Sep 17 00:00:00 2001 +From ebed7783c56fd47586558f1c181c27999350e079 Mon Sep 17 00:00:00 2001 From: Emmanuel Bourg <[email protected]> Date: Mon, 4 Sep 2023 17:10:19 +0200 -Subject: [PATCH 5/7] Reproducible maven.build.timestamp +Subject: [PATCH 5/6] 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 ++++++ 0006-Plexus-utils-4.x-Plexus-xml-3.x-and-javax.annotation.patch ++++++ --- /var/tmp/diff_new_pack.0Ae7zH/_old 2026-10-01 16:44:42.704172557 +0200 +++ /var/tmp/diff_new_pack.0Ae7zH/_new 2026-10-01 16:44:42.707172683 +0200 @@ -1,7 +1,7 @@ -From 1efd3c5f4ff91d127f416573685d0d00ad7ae3e5 Mon Sep 17 00:00:00 2001 +From 2e3d7ff5ace79a2ba6b81d67ba6b2a64a4b9c7aa 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 +Subject: [PATCH 6/6] Plexus-utils 4.x, Plexus-xml 3.x and javax.annotations --- maven-core/pom.xml | 4 ++++ @@ -12,10 +12,10 @@ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/maven-core/pom.xml b/maven-core/pom.xml -index 764050bde7..56630a5e1d 100644 +index 40f9184888..cd7a6b7820 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml -@@ -127,6 +127,10 @@ under the License. +@@ -123,6 +123,10 @@ under the License. <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> @@ -27,7 +27,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/maven-model/pom.xml b/maven-model/pom.xml -index ca28f22440..6c0d40af7e 100644 +index c18eeb8b3b..b4a2ff014a 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -41,6 +41,10 @@ under the License. @@ -42,7 +42,7 @@ <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 +index 51da7ab360..8fa91ea705 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -40,6 +40,10 @@ under the License. @@ -57,7 +57,7 @@ <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 +index 6182d35650..ff6410a5cf 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -40,6 +40,10 @@ under the License. @@ -72,20 +72,20 @@ <build> diff --git a/pom.xml b/pom.xml -index 07fd63400b..4672e7161e 100644 +index 50d61ba4ae..f0dd91395e 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,8 @@ under the License. <plexusVersion>2.2.0</plexusVersion> - <plexusInterpolationVersion>1.29</plexusInterpolationVersion> + <plexusInterpolationVersion>1.30.0</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>3.6.2</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> + <guavaVersion>33.7.1-jre</guavaVersion> <guavafailureaccessVersion>1.0.3</guavafailureaccessVersion> -@@ -248,6 +249,11 @@ under the License. +@@ -249,6 +250,11 @@ under the License. <artifactId>plexus-utils</artifactId> <version>${version.plexus-utils}</version> </dependency> ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.0Ae7zH/_old 2026-10-01 16:44:42.745174276 +0200 +++ /var/tmp/diff_new_pack.0Ae7zH/_new 2026-10-01 16:44:42.751174528 +0200 @@ -1,6 +1,6 @@ -mtime: 1783943115 -commit: 5c41158521490ad7722f9e103fa77febf707eeea63a4f6fe0351fcbaf36ea383 +mtime: 1790855493 +commit: cf3a41db38091c5ea9a6ac8fd9d2d69cb5a5986b44f1ee595cc038fb1d0a2533 url: https://src.opensuse.org/java-packages/maven -revision: 5c41158521490ad7722f9e103fa77febf707eeea63a4f6fe0351fcbaf36ea383 +revision: cf3a41db38091c5ea9a6ac8fd9d2d69cb5a5986b44f1ee595cc038fb1d0a2533 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ apache-maven-3.10.0-rc-1-src.tar.gz -> apache-maven-3.10.0-src.tar.gz ++++++ ++++ 14220 lines of diff (skipped) ++++++ apache-maven-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bootstrap.xml new/bootstrap.xml --- old/bootstrap.xml 2026-07-12 08:12:55.575496343 +0200 +++ new/bootstrap.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -<?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/common.xml new/common.xml --- old/common.xml 2026-07-12 08:12:55.576675447 +0200 +++ new/common.xml 2026-09-28 08:02:03.662190630 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="3.10.0-SNAPSHOT"/> + <property name="project.version" value="3.10.0"/> <property name="project.groupId" value="org.apache.maven"/> <property name="project.organization.name" value="The Apache Software Foundation"/> 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 2026-07-12 08:12:55.578531742 +0200 +++ new/maven-compat/build.xml 2026-09-28 09:11:30.232444742 +0200 @@ -75,34 +75,15 @@ <target name="mdo" description="Generate sources from mdo files"> <mkdir dir="${build.mdoOutputDir}"/> - <macrodef name="modello-single-mode"> - <attribute name="file"/> - <attribute name="mode"/> - <attribute name="version"/> - <sequential> - <exec executable="modello" failonerror="true"> - <arg file="@{file}"/> <!-- model file --> - <arg value="@{mode}"/> <!-- output type --> - <arg file="${build.mdoOutputDir}"/> <!-- output directory --> - <arg value="@{version}"/> <!-- model version --> - <arg value="false"/> <!-- package with version --> - <arg value="8"/> <!-- java source --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.0.0"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="java"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-reader"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/profiles.mdo"/> - <modello file="${build.mdoDir}/paramdoc.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.0.0" outputDirectory="${build.mdoOutputDir}" javaSource="8"> + <model file="${build.mdoDir}/profiles.mdo"/> + <model file="${build.mdoDir}/paramdoc.mdo"/> + <goal name="java"/> + <goal name="xpp3-reader"/> + <goal name="xpp3-writer"/> + </modello> </target> <!-- ====================================================================== --> @@ -147,21 +128,11 @@ <target name="plexus" depends="compile" description="Generate Plexus component.xml"> - <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <pathconvert property="classpath.string" pathsep=":"> - <path refid="build.classpath"/> - </pathconvert> - <exec executable="plexus-metadata-generator" failonerror="true"> - <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/> - <arg value="-s"/> - <arg value="${build.srcDir}"/> - <arg value="-c"/> - <arg value="${build.outputDir}"/> - <arg value="-m"/> - <arg value="${build.outputDir}/META-INF/plexus"/> - <arg value="-o"/> - <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </exec> + <typedef resource="org/codehaus/plexus/metadata/ant/antlib.xml"/> + <plexus-metadata classesDirectory="${build.outputDir}"> + <sourceDirectory location="${build.srcDir}"/> + <classpath refid="build.classpath"/> + </plexus-metadata> </target> <!-- ====================================================================== --> 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 2026-07-12 08:12:55.578865491 +0200 +++ new/maven-core/build.xml 2026-09-28 09:11:26.760393904 +0200 @@ -73,32 +73,14 @@ <target name="mdo" description="Generate sources from mdo files"> <mkdir dir="${build.mdoOutputDir}"/> - <macrodef name="modello-single-mode"> - <attribute name="file"/> - <attribute name="mode"/> - <attribute name="version"/> - <sequential> - <exec executable="modello" failonerror="true"> - <arg file="@{file}"/> <!-- model file --> - <arg value="@{mode}"/> <!-- output type --> - <arg file="${build.mdoOutputDir}"/> <!-- output directory --> - <arg value="@{version}"/> <!-- model version --> - <arg value="false"/> <!-- package with version --> - <arg value="8"/> <!-- java source --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.1.0"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="java"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-reader"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/toolchains.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + + <modello version="1.1.0" outputDirectory="${build.mdoOutputDir}" javaSource="8"> + <model file="${build.mdoDir}/toolchains.mdo"/> + <goal name="java"/> + <goal name="xpp3-reader"/> + <goal name="xpp3-writer"/> + </modello> </target> <!-- ====================================================================== --> @@ -168,21 +150,11 @@ <target name="plexus" depends="compile" description="Generate Plexus component.xml"> - <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <pathconvert property="classpath.string" pathsep=":"> - <path refid="build.classpath"/> - </pathconvert> - <exec executable="plexus-metadata-generator" failonerror="true"> - <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/> - <arg value="-s"/> - <arg value="${build.srcDir}"/> - <arg value="-c"/> - <arg value="${build.outputDir}"/> - <arg value="-m"/> - <arg value="${build.outputDir}/META-INF/plexus"/> - <arg value="-o"/> - <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </exec> + <typedef resource="org/codehaus/plexus/metadata/ant/antlib.xml"/> + <plexus-metadata classesDirectory="${build.outputDir}"> + <sourceDirectory location="${build.srcDir}"/> + <classpath refid="build.classpath"/> + </plexus-metadata> </target> <!-- ====================================================================== --> 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 2026-07-12 08:12:55.579177464 +0200 +++ new/maven-embedder/build.xml 2026-09-28 09:11:23.464310727 +0200 @@ -79,32 +79,14 @@ <target name="mdo" description="Generate sources from mdo files"> <mkdir dir="${build.mdoOutputDir}"/> - <macrodef name="modello-single-mode"> - <attribute name="file"/> - <attribute name="mode"/> - <attribute name="version"/> - <sequential> - <exec executable="modello" failonerror="true"> - <arg file="@{file}"/> <!-- model file --> - <arg value="@{mode}"/> <!-- output type --> - <arg file="${build.mdoOutputDir}"/> <!-- output directory --> - <arg value="@{version}"/> <!-- model version --> - <arg value="false"/> <!-- package with version --> - <arg value="8"/> <!-- java source --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.1.0"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="java"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-reader"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/core-extensions.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + + <modello version="1.1.0" outputDirectory="${build.mdoOutputDir}" javaSource="8"> + <model file="${build.mdoDir}/core-extensions.mdo"/> + <goal name="java"/> + <goal name="xpp3-reader"/> + <goal name="xpp3-writer"/> + </modello> </target> <!-- ====================================================================== --> 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 2026-07-12 08:12:55.579994916 +0200 +++ new/maven-model/build.xml 2026-09-28 09:11:20.096359928 +0200 @@ -55,34 +55,16 @@ <target name="mdo" description="Generate sources from mdo files"> <mkdir dir="${build.mdoOutputDir}"/> - <macrodef name="modello-single-mode"> - <attribute name="file"/> - <attribute name="mode"/> - <attribute name="version"/> - <sequential> - <exec executable="modello" failonerror="true"> - <arg file="@{file}"/> <!-- model file --> - <arg value="@{mode}"/> <!-- output type --> - <arg file="${build.mdoOutputDir}"/> <!-- output directory --> - <arg value="@{version}"/> <!-- model version --> - <arg value="false"/> <!-- package with version --> - <arg value="8"/> <!-- java source --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="4.0.0"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="java"/> - <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"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + + <modello version="4.0.0" outputDirectory="${build.mdoOutputDir}" javaSource="8"> + <model file="${build.mdoDir}/maven.mdo"/> + <goal name="java"/> + <goal name="xpp3-reader"/> + <goal name="xpp3-extended-reader"/> + <goal name="xpp3-writer"/> + <goal name="xpp3-extended-writer"/> + </modello> </target> <!-- ====================================================================== --> 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 2026-07-12 08:12:55.580279070 +0200 +++ new/maven-plugin-api/build.xml 2026-09-28 09:11:16.120340316 +0200 @@ -59,32 +59,14 @@ <target name="mdo" description="Generate sources from mdo files"> <mkdir dir="${build.mdoOutputDir}"/> - <macrodef name="modello-single-mode"> - <attribute name="file"/> - <attribute name="mode"/> - <attribute name="version"/> - <sequential> - <exec executable="modello" failonerror="true"> - <arg file="@{file}"/> <!-- model file --> - <arg value="@{mode}"/> <!-- output type --> - <arg file="${build.mdoOutputDir}"/> <!-- output directory --> - <arg value="@{version}"/> <!-- model version --> - <arg value="false"/> <!-- package with version --> - <arg value="8"/> <!-- java source --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.0.0"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="java"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-reader"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/lifecycle.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + + <modello version="1.0.0" outputDirectory="${build.mdoOutputDir}" javaSource="8"> + <model file="${build.mdoDir}/lifecycle.mdo"/> + <goal name="java"/> + <goal name="xpp3-reader"/> + <goal name="xpp3-writer"/> + </modello> </target> <!-- ====================================================================== --> 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 2026-07-12 08:12:55.580555672 +0200 +++ new/maven-repository-metadata/build.xml 2026-09-28 09:11:12.472254485 +0200 @@ -53,33 +53,14 @@ <target name="mdo" description="Generate sources from mdo files"> <mkdir dir="${build.mdoOutputDir}"/> - <macrodef name="modello-single-mode"> - <attribute name="file"/> - <attribute name="mode"/> - <attribute name="version"/> - <sequential> - <exec executable="modello" failonerror="true"> - <arg file="@{file}"/> <!-- model file --> - <arg value="@{mode}"/> <!-- output type --> - <arg file="${build.mdoOutputDir}"/> <!-- output directory --> - <arg value="@{version}"/> <!-- model version --> - <arg value="false"/> <!-- package with version --> - <arg value="8"/> <!-- java source --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.1.0"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="java"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-reader"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/metadata.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.1.0" outputDirectory="${build.mdoOutputDir}" javaSource="8"> + <model file="${build.mdoDir}/metadata.mdo"/> + <goal name="java"/> + <goal name="xpp3-reader"/> + <goal name="xpp3-writer"/> + </modello> </target> <!-- ====================================================================== --> 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 2026-07-12 08:12:55.581617310 +0200 +++ new/maven-settings/build.xml 2026-09-28 09:14:32.817746047 +0200 @@ -55,33 +55,15 @@ <target name="mdo" description="Generate sources from mdo files"> <mkdir dir="${build.mdoOutputDir}"/> - <macrodef name="modello-single-mode"> - <attribute name="file"/> - <attribute name="mode"/> - <attribute name="version"/> - <sequential> - <exec executable="modello" failonerror="true"> - <arg file="@{file}"/> <!-- model file --> - <arg value="@{mode}"/> <!-- output type --> - <arg file="${build.mdoOutputDir}"/> <!-- output directory --> - <arg value="@{version}"/> <!-- model version --> - <arg value="false"/> <!-- package with version --> - <arg value="8"/> <!-- java source --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.2.0"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="java"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-reader"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/settings.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.3.0" outputDirectory="${build.mdoOutputDir}" javaSource="8"> + <model file="${build.mdoDir}/settings.mdo"/> + <goal name="java"/> + <goal name="xpp3-reader"/> + <goal name="xpp3-writer"/> + <pluralException name="aliases" value="alias"/> + </modello> </target> <!-- ====================================================================== --> ++++++ 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-10-01 13:51:33.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ jline-4.1.x.patch -> jline-4.4.x.patch ++++++ --- /work/SRC/openSUSE:Factory/maven/jline-4.1.x.patch 2026-07-15 16:53:08.541964335 +0200 +++ /work/SRC/openSUSE:Factory/.maven.new.1253/jline-4.4.x.patch 2026-10-01 16:44:41.119106111 +0200 @@ -8,14 +8,37 @@ 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); +@@ -170,13 +171,18 @@ public void setSize(Size size) { } + @Override +- public int getWidth() { +- return getTerminal().getWidth(); + public void setSize(Sized sized) { + getTerminal().setSize(sized); + } + + @Override +- public int getHeight() { +- return getTerminal().getHeight(); ++ public int getColumns() { ++ return getTerminal().getColumns(); + } + ++ @Override ++ public int getRows() { ++ return getTerminal().getRows(); + } + @Override - public int getWidth() { - return getTerminal().getWidth(); +--- a/maven-jline/src/main/java/org/apache/maven/jline/MessageUtils.java ++++ b/maven-jline/src/main/java/org/apache/maven/jline/MessageUtils.java +@@ -121,7 +121,7 @@ public static boolean isColorEnabled() { + } + + public static int getTerminalWidth() { +- return terminal != null ? terminal.getWidth() : -1; ++ return terminal != null ? terminal.getColumns() : -1; + } + + public static MessageBuilder builder() {
