Update maven to 3.8.3.
I have noticed that maven will use JDK 11 if 1.8,11,17 are present, so I
guess we can switch to MODJAVA_VER 11.
$ mvn -v
Apache Maven 3.8.3 (ff8e977a158738155dc465c6a97ffaf31982d739)
Maven home: /usr/local/maven
Java version: 11.0.13, vendor: Oracle Corporation, runtime: /usr/local/jdk-11
Default locale: en_US, platform encoding: UTF-8
OS name: "openbsd", version: "7.0", arch: "amd64", family: "unix"
OK?
diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index 9c6cafa7637..9f46cf884c2 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -2,24 +2,23 @@
COMMENT= software project management and comprehension tool
-V= 3.6.3
+V= 3.8.3
DISTNAME= apache-maven-$V
PKGNAME= ${DISTNAME:S/apache-//}
CATEGORIES= devel
-REVISION= 0
-HOMEPAGE= http://maven.apache.org/
+HOMEPAGE= https://maven.apache.org/
# Apache Software License 2.0
PERMIT_PACKAGE= Yes
MASTER_SITES= ${MASTER_SITE_APACHE:=maven/maven-3/${V}/binaries/} \
- http://archive.apache.org/dist/maven/binaries/
+ https://archive.apache.org/dist/maven/binaries/
EXTRACT_SUFX= -bin.tar.gz
MODULES= java
-MODJAVA_VER= 1.8+
+MODJAVA_VER= 11
RUN_DEPENDS= java/javaPathHelper
NO_BUILD= Yes
diff --git a/devel/maven/distinfo b/devel/maven/distinfo
index 34e9ef3c18c..7f0742d56ef 100644
--- a/devel/maven/distinfo
+++ b/devel/maven/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-maven-3.6.3-bin.tar.gz) =
Jq2R11GzqaUwh676dD9OFqF3QdORWyGc90ESv4ekOMU=
-SIZE (apache-maven-3.6.3-bin.tar.gz) = 9506321
+SHA256 (apache-maven-3.8.3-bin.tar.gz) =
DxWX0RCFuP6T2EZSoYxt7qcezp+rukWgLPZgDHdY/Vs=
+SIZE (apache-maven-3.8.3-bin.tar.gz) = 9042049
diff --git a/devel/maven/patches/patch-bin_mvn
b/devel/maven/patches/patch-bin_mvn
index 7b18981744c..52b95a10cca 100644
--- a/devel/maven/patches/patch-bin_mvn
+++ b/devel/maven/patches/patch-bin_mvn
@@ -2,9 +2,9 @@ $OpenBSD: patch-bin_mvn,v 1.6 2018/04/23 10:41:52 jasper Exp $
Index: bin/mvn
--- bin/mvn.orig
+++ bin/mvn
-@@ -29,8 +29,8 @@
-
- if [ -z "$MAVEN_SKIP_RC" ] ; then
+@@ -33,8 +33,8 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
+ . /usr/local/etc/mavenrc
+ fi
- if [ -f /etc/mavenrc ] ; then
- . /etc/mavenrc
diff --git a/devel/maven/pkg/PLIST b/devel/maven/pkg/PLIST
index 75991da90da..ec2e372df54 100644
--- a/devel/maven/pkg/PLIST
+++ b/devel/maven/pkg/PLIST
@@ -15,11 +15,9 @@ maven/boot/plexus-classworlds-2.6.0.jar
maven/boot/plexus-classworlds.license
maven/conf
maven/lib/
-maven/lib/cdi-api-1.0.jar
-maven/lib/cdi-api.license
maven/lib/commons-cli-1.4.jar
maven/lib/commons-cli.license
-maven/lib/commons-io-2.5.jar
+maven/lib/commons-io-2.6.jar
maven/lib/commons-io.license
maven/lib/commons-lang3-3.8.1.jar
maven/lib/commons-lang3.license
@@ -27,73 +25,63 @@ maven/lib/ext/
maven/lib/ext/README.txt
maven/lib/guava-25.1-android.jar
maven/lib/guava.license
-maven/lib/guice-4.2.1-no_aop.jar
+maven/lib/guice-4.2.2-no_aop.jar
maven/lib/guice.license
-maven/lib/jansi-1.17.1.jar
+maven/lib/jansi-2.3.4.jar
maven/lib/jansi-native/
maven/lib/jansi-native/README.txt
-maven/lib/jansi-native/freebsd32/
-maven/lib/jansi-native/freebsd32/libjansi.so
-maven/lib/jansi-native/freebsd64/
-maven/lib/jansi-native/freebsd64/libjansi.so
-maven/lib/jansi-native/linux32/
-maven/lib/jansi-native/linux32/libjansi.so
-maven/lib/jansi-native/linux64/
-maven/lib/jansi-native/linux64/libjansi.so
-maven/lib/jansi-native/osx/
-maven/lib/jansi-native/osx/libjansi.jnilib
-maven/lib/jansi-native/windows32/
-maven/lib/jansi-native/windows32/jansi.dll
-maven/lib/jansi-native/windows64/
-maven/lib/jansi-native/windows64/jansi.dll
+maven/lib/jansi-native/Windows/
+maven/lib/jansi-native/Windows/x86/
+maven/lib/jansi-native/Windows/x86/jansi.dll
+maven/lib/jansi-native/Windows/x86_64/
+maven/lib/jansi-native/Windows/x86_64/jansi.dll
maven/lib/jansi.license
+maven/lib/javax.annotation-api-1.2.jar
+maven/lib/javax.annotation-api.license
maven/lib/javax.inject-1.jar
maven/lib/javax.inject.license
-maven/lib/jcl-over-slf4j-1.7.29.jar
+maven/lib/jcl-over-slf4j-1.7.32.jar
maven/lib/jcl-over-slf4j.license
-maven/lib/jsoup-1.12.1.jar
maven/lib/jsoup.license
-maven/lib/jsr250-api-1.0.jar
-maven/lib/jsr250-api.license
-maven/lib/maven-artifact-3.6.3.jar
-maven/lib/maven-builder-support-3.6.3.jar
-maven/lib/maven-compat-3.6.3.jar
-maven/lib/maven-core-3.6.3.jar
-maven/lib/maven-embedder-3.6.3.jar
-maven/lib/maven-model-3.6.3.jar
-maven/lib/maven-model-builder-3.6.3.jar
-maven/lib/maven-plugin-api-3.6.3.jar
-maven/lib/maven-repository-metadata-3.6.3.jar
-maven/lib/maven-resolver-api-1.4.1.jar
-maven/lib/maven-resolver-connector-basic-1.4.1.jar
-maven/lib/maven-resolver-impl-1.4.1.jar
-maven/lib/maven-resolver-provider-3.6.3.jar
-maven/lib/maven-resolver-spi-1.4.1.jar
-maven/lib/maven-resolver-transport-wagon-1.4.1.jar
-maven/lib/maven-resolver-util-1.4.1.jar
-maven/lib/maven-settings-3.6.3.jar
-maven/lib/maven-settings-builder-3.6.3.jar
-maven/lib/maven-shared-utils-3.2.1.jar
-maven/lib/maven-slf4j-provider-3.6.3.jar
-maven/lib/org.eclipse.sisu.inject-0.3.4.jar
+maven/lib/maven-artifact-3.8.3.jar
+maven/lib/maven-builder-support-3.8.3.jar
+maven/lib/maven-compat-3.8.3.jar
+maven/lib/maven-core-3.8.3.jar
+maven/lib/maven-embedder-3.8.3.jar
+maven/lib/maven-model-3.8.3.jar
+maven/lib/maven-model-builder-3.8.3.jar
+maven/lib/maven-plugin-api-3.8.3.jar
+maven/lib/maven-repository-metadata-3.8.3.jar
+maven/lib/maven-resolver-api-1.6.3.jar
+maven/lib/maven-resolver-connector-basic-1.6.3.jar
+maven/lib/maven-resolver-impl-1.6.3.jar
+maven/lib/maven-resolver-provider-3.8.3.jar
+maven/lib/maven-resolver-spi-1.6.3.jar
+maven/lib/maven-resolver-transport-wagon-1.6.3.jar
+maven/lib/maven-resolver-util-1.6.3.jar
+maven/lib/maven-settings-3.8.3.jar
+maven/lib/maven-settings-builder-3.8.3.jar
+maven/lib/maven-shared-utils-3.3.4.jar
+maven/lib/maven-slf4j-provider-3.8.3.jar
+maven/lib/org.eclipse.sisu.inject-0.3.5.jar
maven/lib/org.eclipse.sisu.inject.license
-maven/lib/org.eclipse.sisu.plexus-0.3.4.jar
+maven/lib/org.eclipse.sisu.plexus-0.3.5.jar
maven/lib/org.eclipse.sisu.plexus.license
-maven/lib/plexus-cipher-1.7.jar
+maven/lib/plexus-cipher-2.0.jar
maven/lib/plexus-cipher.license
maven/lib/plexus-component-annotations-2.1.0.jar
maven/lib/plexus-component-annotations.license
-maven/lib/plexus-interpolation-1.25.jar
+maven/lib/plexus-interpolation-1.26.jar
maven/lib/plexus-interpolation.license
-maven/lib/plexus-sec-dispatcher-1.4.jar
+maven/lib/plexus-sec-dispatcher-2.0.jar
maven/lib/plexus-sec-dispatcher.license
-maven/lib/plexus-utils-3.2.1.jar
+maven/lib/plexus-utils-3.3.0.jar
maven/lib/plexus-utils.license
-maven/lib/slf4j-api-1.7.29.jar
+maven/lib/slf4j-api-1.7.32.jar
maven/lib/slf4j-api.license
-maven/lib/wagon-file-3.3.4.jar
-maven/lib/wagon-http-3.3.4-shaded.jar
-maven/lib/wagon-provider-api-3.3.4.jar
+maven/lib/wagon-file-3.4.3.jar
+maven/lib/wagon-http-3.4.3-shaded.jar
+maven/lib/wagon-provider-api-3.4.3.jar
share/examples/maven/
@sample ${SYSCONFDIR}/maven/
share/examples/maven/logging/
