From f05d1d4b1c4fb223ff5d2308c64f0d3e059289b6547df29cf6358154302d55ce Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 11 May 2023 11:28:28 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=75 --- 0001-Adapt-mvn-script.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index 48bc3a3..3ff5026 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -11,6 +11,15 @@ diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index dfa384b8e..8c03825ed 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn +@@ -22,7 +22,7 @@ + # + # Environment Variable Prerequisites + # +-# JAVA_HOME Must point at your Java Development Kit installation. ++# JAVA_HOME (Optional) Must point at your Java Development Kit installation. + # 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 . /etc/mavenrc fi From 994513bd8d770b87494dca0275c14dd7fc04068a92257a80cc937f1f88a1c0b8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 19 Jun 2023 09:53:17 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=76 --- apache-maven-3.9.1-build.tar.xz | 3 --- apache-maven-3.9.1-src.tar.gz | 3 --- apache-maven-3.9.2-build.tar.xz | 3 +++ apache-maven-3.9.2-src.tar.gz | 3 +++ maven.spec | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 apache-maven-3.9.1-build.tar.xz delete mode 100644 apache-maven-3.9.1-src.tar.gz create mode 100644 apache-maven-3.9.2-build.tar.xz create mode 100644 apache-maven-3.9.2-src.tar.gz diff --git a/apache-maven-3.9.1-build.tar.xz b/apache-maven-3.9.1-build.tar.xz deleted file mode 100644 index fec7838..0000000 --- a/apache-maven-3.9.1-build.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69b7c0318e2191f7c819be2bb69cdd041f337ed6cbee62d5d2e7582eea5e23ba -size 5232 diff --git a/apache-maven-3.9.1-src.tar.gz b/apache-maven-3.9.1-src.tar.gz deleted file mode 100644 index 6efc87f..0000000 --- a/apache-maven-3.9.1-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83276c67dfa8084a1f6369fae4ec6fd6b47b31138a970f6f1819c7ad5e250b55 -size 2784624 diff --git a/apache-maven-3.9.2-build.tar.xz b/apache-maven-3.9.2-build.tar.xz new file mode 100644 index 0000000..4972b29 --- /dev/null +++ b/apache-maven-3.9.2-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cebf6ecfcdfcaefcb1b29f089e0134b192d70aa4acab87157b3cc4f4a3eab90 +size 5116 diff --git a/apache-maven-3.9.2-src.tar.gz b/apache-maven-3.9.2-src.tar.gz new file mode 100644 index 0000000..2a61904 --- /dev/null +++ b/apache-maven-3.9.2-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9f3ba1c9563a3cd5256fe6caf92f7e6a69a174fe8c803efe5137e843254801b +size 2793399 diff --git a/maven.spec b/maven.spec index af35b82..059da12 100644 --- a/maven.spec +++ b/maven.spec @@ -20,7 +20,7 @@ %global homedir %{_datadir}/%{name}%{?maven_version_suffix} %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix} Name: maven -Version: 3.9.1 +Version: 3.9.2 Release: 0 Summary: Java project management and project comprehension tool # maven itself is ASL 2.0 From dcb56d86e7c21b674e355821c47a79f8fd7b3520c05e90a1e8298097e394b74e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 19 Jun 2023 15:35:15 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=77 --- maven.changes | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/maven.changes b/maven.changes index ffefcc0..339560c 100644 --- a/maven.changes +++ b/maven.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Jun 19 15:31:21 UTC 2023 - Fridrich Strba + +- Upgrade to upstream version 3.9.2 + * Bug + + [MNG-7750] - Interpolated properties in originalModel in + an active profile. + + [MNG-7759] - java.lang.NullPointerException at org.apache + .maven.repository.internal.DefaultModelCache.newInstance + (DefaultModelCache.java:37) + * Improvement + + [MNG-7712] - Core should issue a warning if plugin depends + on maven-compat + + [MNG-7741] - Add more information when using + -Dmaven.repo.local.recordReverseTree=true + + [MNG-7754] - Improvement and extension of plugin validation + + [MNG-7767] - Tone down plugin validation report + + [MNG-7776] - don't fingerprint Sigstore signatures (like GPG) + + [MNG-7778] - Maven should print suppressed exceptions when a + mojo fails + * Task + + [MNG-7749] - Upgrade animal-sniffer from 1.21 to 1.23 + + [MNG-7774] - Maven config and command line interpolation + ------------------------------------------------------------------- Thu May 11 08:39:04 UTC 2023 - Fridrich Strba