CVS commit: pkgsrc/devel/apache-maven

["Kevin Bloom" <ktnb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Thu Jul 10 20:25:40 UTC 2025

Modified Files:
        pkgsrc/devel/apache-maven: Makefile PLIST distinfo
        pkgsrc/devel/apache-maven/patches: patch-bin_m2.conf patch-bin_mvn

Log Message:
apache-maven: update to 3.9.10

Brought to newest version.

Many, many changes:
https://maven.apache.org/docs/history.html


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/apache-maven/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/apache-maven/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/apache-maven/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/apache-maven/patches/patch-bin_mvn

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/apache-maven/Makefile
diff -u pkgsrc/devel/apache-maven/Makefile:1.19 pkgsrc/devel/apache-maven/Makefile:1.20
--- pkgsrc/devel/apache-maven/Makefile:1.19     Thu Dec  8 12:28:41 2022
+++ pkgsrc/devel/apache-maven/Makefile  Thu Jul 10 20:25:40 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2022/12/08 12:28:41 schmonz Exp $
+# $NetBSD: Makefile,v 1.20 2025/07/10 20:25:40 ktnb Exp $
 
-DISTNAME=      apache-maven-3.8.6
+DISTNAME=      apache-maven-3.9.10
 CATEGORIES=    devel java
 MASTER_SITES=  ${MASTER_SITE_APACHE:=maven/maven-3/${PKGVERSION_NOREV}/binaries/}
 DISTFILES=     ${DISTNAME}-bin${EXTRACT_SUFX}
@@ -18,7 +18,7 @@ NO_BUILD=     yes
 SUBST_CLASSES+=                maven
 SUBST_FILES.maven=     bin/m2.conf bin/mvn
 SUBST_STAGE.maven=     pre-configure
-SUBST_VARS.maven=      PKG_JAVA_HOME PKG_SYSCONFDIR PREFIX
+SUBST_VARS.maven=      PKG_JAVA_HOME PKG_SYSCONFDIR
 
 INSTALLATION_DIRS=     bin etc/maven lib/java/maven lib/java/maven/boot \
                        share/doc/java/maven share/examples/maven \

Index: pkgsrc/devel/apache-maven/PLIST
diff -u pkgsrc/devel/apache-maven/PLIST:1.13 pkgsrc/devel/apache-maven/PLIST:1.14
--- pkgsrc/devel/apache-maven/PLIST:1.13        Thu Dec  8 12:28:41 2022
+++ pkgsrc/devel/apache-maven/PLIST     Thu Jul 10 20:25:40 2025
@@ -1,15 +1,20 @@
-@comment $NetBSD: PLIST,v 1.13 2022/12/08 12:28:41 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/07/10 20:25:40 ktnb Exp $
 bin/mvn
-lib/java/maven/boot/plexus-classworlds-2.6.0.jar
-lib/java/maven/commons-cli-1.4.jar
-lib/java/maven/commons-io-2.6.jar
-lib/java/maven/commons-lang3-3.8.1.jar
-lib/java/maven/guava-25.1-android.jar
-lib/java/maven/guice-4.2.2-no_aop.jar
-lib/java/maven/jansi-2.4.0.jar
-lib/java/maven/javax.annotation-api-1.2.jar
+lib/java/maven/aopalliance-1.0.jar
+lib/java/maven/asm-9.8.jar
+lib/java/maven/boot/plexus-classworlds-2.9.0.jar
+lib/java/maven/commons-cli-1.9.0.jar
+lib/java/maven/commons-codec-1.18.0.jar
+lib/java/maven/failureaccess-1.0.3.jar
+lib/java/maven/guava-33.4.8-jre.jar
+lib/java/maven/guice-5.1.0-classes.jar
+lib/java/maven/httpclient-4.5.14.jar
+lib/java/maven/httpcore-4.4.16.jar
+lib/java/maven/jansi-2.4.2.jar
+lib/java/maven/javax.annotation-api-1.3.2.jar
 lib/java/maven/javax.inject-1.jar
 lib/java/maven/jcl-over-slf4j-1.7.36.jar
+lib/java/maven/jspecify-1.0.0.jar
 lib/java/maven/maven-artifact-${PKGVERSION}.jar
 lib/java/maven/maven-builder-support-${PKGVERSION}.jar
 lib/java/maven/maven-compat-${PKGVERSION}.jar
@@ -19,28 +24,32 @@ lib/java/maven/maven-model-${PKGVERSION}
 lib/java/maven/maven-model-builder-${PKGVERSION}.jar
 lib/java/maven/maven-plugin-api-${PKGVERSION}.jar
 lib/java/maven/maven-repository-metadata-${PKGVERSION}.jar
-lib/java/maven/maven-resolver-api-1.6.3.jar
-lib/java/maven/maven-resolver-connector-basic-1.6.3.jar
-lib/java/maven/maven-resolver-impl-1.6.3.jar
+lib/java/maven/maven-resolver-api-1.9.23.jar
+lib/java/maven/maven-resolver-connector-basic-1.9.23.jar
+lib/java/maven/maven-resolver-impl-1.9.23.jar
+lib/java/maven/maven-resolver-named-locks-1.9.23.jar
 lib/java/maven/maven-resolver-provider-${PKGVERSION}.jar
-lib/java/maven/maven-resolver-spi-1.6.3.jar
-lib/java/maven/maven-resolver-transport-wagon-1.6.3.jar
-lib/java/maven/maven-resolver-util-1.6.3.jar
+lib/java/maven/maven-resolver-spi-1.9.23.jar
+lib/java/maven/maven-resolver-transport-file-1.9.23.jar
+lib/java/maven/maven-resolver-transport-http-1.9.23.jar
+lib/java/maven/maven-resolver-transport-wagon-1.9.23.jar
+lib/java/maven/maven-resolver-util-1.9.23.jar
 lib/java/maven/maven-settings-${PKGVERSION}.jar
 lib/java/maven/maven-settings-builder-${PKGVERSION}.jar
-lib/java/maven/maven-shared-utils-3.3.4.jar
+lib/java/maven/maven-shared-utils-3.4.2.jar
 lib/java/maven/maven-slf4j-provider-${PKGVERSION}.jar
-lib/java/maven/org.eclipse.sisu.inject-0.3.5.jar
-lib/java/maven/org.eclipse.sisu.plexus-0.3.5.jar
+lib/java/maven/org.eclipse.sisu.inject-0.9.0.M4.jar
+lib/java/maven/org.eclipse.sisu.plexus-0.9.0.M4.jar
 lib/java/maven/plexus-cipher-2.0.jar
-lib/java/maven/plexus-component-annotations-2.1.0.jar
-lib/java/maven/plexus-interpolation-1.26.jar
+lib/java/maven/plexus-component-annotations-2.2.0.jar
+lib/java/maven/plexus-interpolation-1.28.jar
 lib/java/maven/plexus-sec-dispatcher-2.0.jar
-lib/java/maven/plexus-utils-3.3.1.jar
+lib/java/maven/plexus-utils-3.6.0.jar
 lib/java/maven/slf4j-api-1.7.36.jar
-lib/java/maven/wagon-file-3.5.1.jar
-lib/java/maven/wagon-http-3.5.1-shaded.jar
-lib/java/maven/wagon-provider-api-3.5.1.jar
+lib/java/maven/wagon-file-3.5.3.jar
+lib/java/maven/wagon-http-3.5.3.jar
+lib/java/maven/wagon-http-shared-3.5.3.jar
+lib/java/maven/wagon-provider-api-3.5.3.jar
 share/doc/java/maven/LICENSE
 share/doc/java/maven/NOTICE
 share/doc/java/maven/README.txt

Index: pkgsrc/devel/apache-maven/distinfo
diff -u pkgsrc/devel/apache-maven/distinfo:1.22 pkgsrc/devel/apache-maven/distinfo:1.23
--- pkgsrc/devel/apache-maven/distinfo:1.22     Thu Dec  8 12:28:41 2022
+++ pkgsrc/devel/apache-maven/distinfo  Thu Jul 10 20:25:40 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2022/12/08 12:28:41 schmonz Exp $
+$NetBSD: distinfo,v 1.23 2025/07/10 20:25:40 ktnb Exp $
 
-BLAKE2s (apache-maven-3.8.6-bin.tar.gz) = f8c4f231ab4e04a38fee9cc82d837be1e89a8bc4cc2ed7bc905abace69c3d283
-SHA512 (apache-maven-3.8.6-bin.tar.gz) = f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26
-Size (apache-maven-3.8.6-bin.tar.gz) = 8676320 bytes
-SHA1 (patch-bin_m2.conf) = 4fb50adbfb744635281853f0b81ec95a5fdab504
-SHA1 (patch-bin_mvn) = 77195b4e468af5041e11e5d4c0677a58465060e2
+BLAKE2s (apache-maven-3.9.10-bin.tar.gz) = 3f22534dea29ce40296e616ffcbbce4ed8fb38d3736d5327b031c7017e4d132f
+SHA512 (apache-maven-3.9.10-bin.tar.gz) = 4ef617e421695192a3e9a53b3530d803baf31f4269b26f9ab6863452d833da5530a4d04ed08c36490ad0f141b55304bceed58dbf44821153d94ae9abf34d0e1b
+Size (apache-maven-3.9.10-bin.tar.gz) = 8885210 bytes
+SHA1 (patch-bin_m2.conf) = a61e30a06282a4e08914a85793449a3a60a9ab75
+SHA1 (patch-bin_mvn) = 9aa27abc262cd4788c140ff9d5564e87d64b6c7a

Index: pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf
diff -u pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf:1.3 pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf:1.4
--- pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf:1.3     Wed Sep  6 10:17:51 2017
+++ pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf Thu Jul 10 20:25:40 2025
@@ -1,15 +1,20 @@
-$NetBSD: patch-bin_m2.conf,v 1.3 2017/09/06 10:17:51 fhajny Exp $
+$NetBSD: patch-bin_m2.conf,v 1.4 2025/07/10 20:25:40 ktnb Exp $
 
 Follow pkgsrc path convention.
 
---- bin/m2.conf.orig   2017-04-03 19:36:16.000000000 +0000
+--- bin/m2.conf.orig   2025-06-01 18:42:27.000000000 +0000
 +++ bin/m2.conf
-@@ -3,6 +3,6 @@ main is org.apache.maven.cli.MavenCli fr
+@@ -3,8 +3,8 @@ main is org.apache.maven.cli.MavenCli fr
  set maven.conf default ${maven.home}/conf
  
  [plexus.core]
 -load       ${maven.conf}/logging
+-optionally ${maven.home}/lib/ext/redisson/*.jar
+-optionally ${maven.home}/lib/ext/hazelcast/*.jar
 -optionally ${maven.home}/lib/ext/*.jar
-+load       @PKG_SYSCONFDIR@/logging
-+optionally ${maven.home}/lib/java/maven/*.jar
- load       ${maven.home}/lib/*.jar
+-load       ${maven.home}/lib/*.jar
++load       @PKG_SYSCONFDIR@/maven/logging
++optionally ${maven.home}/lib/java/maven/ext/redisson/*.jar
++optionally ${maven.home}/lib/java/maven/ext/hazelcast/*.jar
++optionally ${maven.home}/lib/java/maven/ext/*.jar
++load       ${maven.home}/lib/java/maven/*.jar

Index: pkgsrc/devel/apache-maven/patches/patch-bin_mvn
diff -u pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.10 pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.11
--- pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.10        Thu Dec  8 12:28:41 2022
+++ pkgsrc/devel/apache-maven/patches/patch-bin_mvn     Thu Jul 10 20:25:40 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-bin_mvn,v 1.10 2022/12/08 12:28:41 schmonz Exp $
+$NetBSD: patch-bin_mvn,v 1.11 2025/07/10 20:25:40 ktnb Exp $
 
 Reconcile JAVA_HOME evaluated at run time on Darwin vs. hardcoded
 via PKG_JAVA_HOME elsewhere.
 Follow pkgsrc path convention.
 
---- bin/mvn.orig       2022-06-06 16:16:38.000000000 +0000
+--- bin/mvn.orig       2025-06-01 18:42:27.000000000 +0000
 +++ bin/mvn
-@@ -46,9 +46,11 @@ fi
+@@ -47,9 +47,11 @@ fi
  # OS specific support. $var _must_ be set to either true or false.
  cygwin=false;
  mingw=false;
@@ -18,7 +18,7 @@ Follow pkgsrc path convention.
  esac
  
  ## resolve links - $0 may be a link to Maven's home
-@@ -93,19 +95,24 @@ if $mingw ; then
+@@ -94,19 +96,24 @@ if $mingw ; then
    # TODO classpath?
  fi
  
@@ -47,7 +47,7 @@ Follow pkgsrc path convention.
  CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
  
  # For Cygwin, switch paths to Windows format before running java
-@@ -195,8 +202,10 @@ exec "$JAVACMD" \
+@@ -209,8 +216,10 @@ exec "$JAVACMD" \
    $MAVEN_OPTS \
    $MAVEN_DEBUG_OPTS \
    -classpath "${CLASSWORLDS_JAR}" \
@@ -58,4 +58,4 @@ Follow pkgsrc path convention.
    "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
 +  "-Dorg.apache.maven.global-settings=@PKG_SYSCONFDIR@/settings.xml" \
 +  "-Dorg.apache.maven.global-plugin-registry=@PKG_SYSCONFDIR@/plugin-registry.xml" \
-   ${CLASSWORLDS_LAUNCHER} "$@"
+   ${CLASSWORLDS_LAUNCHER} ${MAVEN_ARGS} "$@"