Sync from SUSE:SLFO:Main maven revision c0c1c8e0fc1fe8f963ec97b9d6adb3e3

maven.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Tue Jun 11 15:23:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.9.7
+  * Bug
+    + MNG-8106: Maven Metadata corruption if repository directory
+      role overlaps
+    + MNG-8121: NullPointerException at
+      org.apache.maven.artifact.repository.metadata.Metadata.merge
+      (Metadata.java:293)
+  * New Feature
+    + MNG-5726: Update OS Activation To Allow Wildcards In OS
+      Version
+    + MNG-8030: Backport: Add ability to ignore dependency
+      repositories: mvn -itr
+  * Improvement
+    + MNG-8019: Streamline update policy of
+      pluginRepository/repository of Maven Central in Super POM
+    + MNG-8029: improve documentation of mirror in settings
+    + MNG-8031: Backport: Make Maven transfer listener used with
+      Resolver more concurrent friendly
+    + MNG-8081: default profile activation should consider available
+      system and user properties
+    + MNG-8085: swtich from png+imagemap to svg
+    + MNG-8117: Improve prerequisite evaluation and plugin version
+      selection logging
+  * Task
+    + MNG-7309: Remove redundant MojoDescriptor parameterMap
+    + MNG-8011: Minimize and make generic the README.txt
+    + MNG-8055: Investigate possible solutions for build number
+      diffs on deploy
+  * Dependency upgrade
+    + MNG-8094: Resolver 1.9.19
+    + MNG-8100: Upgrade default plugin bindings
+    + MNG-8101: Upgrade Parent to 42
+    + MNG-8109: Resolver 1.9.20
+    + MNG-8115: Upgrade minimal set of dependencies
+    + MNG-8125: (build) Bump buildhelper-maven-plugin to 3.6.0 (was
+      3.4.0)
+    + MNG-8126: Bump logback classic to 1.2.13 (was 1.2.12)
+    + MNG-8127: Bump guava to 33.2.0-jre
+
+-------------------------------------------------------------------
+Mon Jun 10 13:58:23 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on jakarta-inject, needed by google-guice 6.0.0
+
 -------------------------------------------------------------------
 Tue Apr  2 17:21:14 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
@@ -13,7 +60,6 @@ Wed Feb 21 15:10:43 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 Tue Jan 30 07:13:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
 - Upgrade tu upstream version 3.9.6
-
   * Bug
     + MNG-7851: Error message when modelVersion is 4.0 is confusing
   * Improvement

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.6
+Version:        3.9.7
 Release:        0
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
@@ -52,6 +52,7 @@ BuildRequires:  google-guice
 BuildRequires:  guava
 BuildRequires:  httpcomponents-client
 BuildRequires:  httpcomponents-core
+BuildRequires:  jakarta-inject
 BuildRequires:  jansi
 BuildRequires:  javapackages-local
 BuildRequires:  jcl-over-slf4j
@@ -125,6 +126,7 @@ Requires:       google-guice
 Requires:       guava
 Requires:       httpcomponents-client
 Requires:       httpcomponents-core
+Requires:       jakarta-inject
 Requires:       jansi
 Requires:       javapackages-tools
 Requires:       jcl-over-slf4j
@@ -232,9 +234,8 @@ build-jar-repository -s lib \
     atinject \
     commons-cli \
     glassfish-annotation-api \
-    guava/guava \
     guice/google-guice \
-    jdom2/jdom2 \
+    jakarta-inject \
     maven-resolver/maven-resolver-api \
     maven-resolver/maven-resolver-impl \
     maven-resolver/maven-resolver-named-locks \
@@ -247,18 +248,14 @@ build-jar-repository -s lib \
     org.eclipse.sisu.inject \
     org.eclipse.sisu.plexus \
     plexus-classworlds \
-    plexus/cli \
     plexus-containers/plexus-component-annotations \
     plexus/interpolation \
-    plexus-metadata-generator \
     plexus/plexus-cipher \
     plexus/plexus-sec-dispatcher \
     plexus/utils \
     plexus/xml \
-    qdox \
     slf4j/api \
-    slf4j/simple \
-    xbean/xbean-reflect
+    slf4j/simple
 ln -s $(build-classpath slf4j/slf4j-simple-sources) lib/
 %{ant} \
   -Dtest.skip=true \
@@ -309,6 +306,7 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \
     guice/google-guice \
     httpcomponents/httpclient \
     httpcomponents/httpcore \
+    jakarta-inject \
     jansi/jansi \
     maven-resolver/maven-resolver-api \
     maven-resolver/maven-resolver-connector-basic \