maven: 3.8.1 -> 3.8.2; dependency changed from openjdk8 to openjdk16-jdk

3 files changed, 40 insertions, 50 deletions

diff --git a/maven/.footprint b/maven/.footprint
index 3bbc21d0d..4f84a9b45 100644
--- a/maven/.footprint
+++ b/maven/.footprint
@@ -16,59 +16,44 @@ drwxr-xr-x	root/root	usr/conf/logging/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/cdi-api-1.0.jar
 -rw-r--r--	root/root	usr/lib/commons-cli-1.4.jar
--rw-r--r--	root/root	usr/lib/commons-io-2.5.jar
+-rw-r--r--	root/root	usr/lib/commons-io-2.6.jar
 -rw-r--r--	root/root	usr/lib/commons-lang3-3.8.1.jar
 drwxr-xr-x	root/root	usr/lib/ext/
 -rw-r--r--	root/root	usr/lib/guava-25.1-android.jar
--rw-r--r--	root/root	usr/lib/guice-4.2.1-no_aop.jar
--rw-r--r--	root/root	usr/lib/jansi-1.17.1.jar
-drwxr-xr-x	root/root	usr/lib/jansi-native/
-drwxr-xr-x	root/root	usr/lib/jansi-native/freebsd32/
--rwxr-xr-x	root/root	usr/lib/jansi-native/freebsd32/libjansi.so
-drwxr-xr-x	root/root	usr/lib/jansi-native/freebsd64/
--rwxr-xr-x	root/root	usr/lib/jansi-native/freebsd64/libjansi.so
-drwxr-xr-x	root/root	usr/lib/jansi-native/linux32/
--rwxr-xr-x	root/root	usr/lib/jansi-native/linux32/libjansi.so
-drwxr-xr-x	root/root	usr/lib/jansi-native/linux64/
--rwxr-xr-x	root/root	usr/lib/jansi-native/linux64/libjansi.so
-drwxr-xr-x	root/root	usr/lib/jansi-native/osx/
--rwxr-xr-x	root/root	usr/lib/jansi-native/osx/libjansi.jnilib
-drwxr-xr-x	root/root	usr/lib/jansi-native/windows32/
--rwxr-xr-x	root/root	usr/lib/jansi-native/windows32/jansi.dll
-drwxr-xr-x	root/root	usr/lib/jansi-native/windows64/
--rwxr-xr-x	root/root	usr/lib/jansi-native/windows64/jansi.dll
+-rw-r--r--	root/root	usr/lib/guice-4.2.2-no_aop.jar
+-rw-r--r--	root/root	usr/lib/jansi-2.3.4.jar
 -rw-r--r--	root/root	usr/lib/javax.inject-1.jar
--rw-r--r--	root/root	usr/lib/jcl-over-slf4j-1.7.29.jar
+-rw-r--r--	root/root	usr/lib/jcl-over-slf4j-1.7.32.jar
 -rw-r--r--	root/root	usr/lib/jsoup-1.12.1.jar
 -rw-r--r--	root/root	usr/lib/jsr250-api-1.0.jar
--rw-r--r--	root/root	usr/lib/maven-artifact-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-builder-support-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-compat-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-core-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-embedder-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-model-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-model-builder-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-plugin-api-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-repository-metadata-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-resolver-api-1.6.2.jar
--rw-r--r--	root/root	usr/lib/maven-resolver-connector-basic-1.6.2.jar
--rw-r--r--	root/root	usr/lib/maven-resolver-impl-1.6.2.jar
--rw-r--r--	root/root	usr/lib/maven-resolver-provider-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-resolver-spi-1.6.2.jar
--rw-r--r--	root/root	usr/lib/maven-resolver-transport-wagon-1.6.2.jar
--rw-r--r--	root/root	usr/lib/maven-resolver-util-1.6.2.jar
--rw-r--r--	root/root	usr/lib/maven-settings-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-settings-builder-3.8.1.jar
--rw-r--r--	root/root	usr/lib/maven-shared-utils-3.2.1.jar
--rw-r--r--	root/root	usr/lib/maven-slf4j-provider-3.8.1.jar
+-rw-r--r--	root/root	usr/lib/maven-artifact-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-builder-support-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-compat-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-core-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-embedder-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-model-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-model-builder-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-plugin-api-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-repository-metadata-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-resolver-api-1.6.3.jar
+-rw-r--r--	root/root	usr/lib/maven-resolver-connector-basic-1.6.3.jar
+-rw-r--r--	root/root	usr/lib/maven-resolver-impl-1.6.3.jar
+-rw-r--r--	root/root	usr/lib/maven-resolver-provider-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-resolver-spi-1.6.3.jar
+-rw-r--r--	root/root	usr/lib/maven-resolver-transport-wagon-1.6.3.jar
+-rw-r--r--	root/root	usr/lib/maven-resolver-util-1.6.3.jar
+-rw-r--r--	root/root	usr/lib/maven-settings-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-settings-builder-3.8.2.jar
+-rw-r--r--	root/root	usr/lib/maven-shared-utils-3.3.4.jar
+-rw-r--r--	root/root	usr/lib/maven-slf4j-provider-3.8.2.jar
 -rw-r--r--	root/root	usr/lib/org.eclipse.sisu.inject-0.3.4.jar
 -rw-r--r--	root/root	usr/lib/org.eclipse.sisu.plexus-0.3.4.jar
--rw-r--r--	root/root	usr/lib/plexus-cipher-1.7.jar
+-rw-r--r--	root/root	usr/lib/plexus-cipher-1.8.jar
 -rw-r--r--	root/root	usr/lib/plexus-component-annotations-2.1.0.jar
 -rw-r--r--	root/root	usr/lib/plexus-interpolation-1.25.jar
 -rw-r--r--	root/root	usr/lib/plexus-sec-dispatcher-1.4.jar
 -rw-r--r--	root/root	usr/lib/plexus-utils-3.2.1.jar
--rw-r--r--	root/root	usr/lib/slf4j-api-1.7.29.jar
+-rw-r--r--	root/root	usr/lib/slf4j-api-1.7.32.jar
 -rw-r--r--	root/root	usr/lib/wagon-file-3.4.3.jar
 -rw-r--r--	root/root	usr/lib/wagon-http-3.4.3-shaded.jar
 -rw-r--r--	root/root	usr/lib/wagon-provider-api-3.4.3.jar
diff --git a/maven/.signature b/maven/.signature
index 8fb349d14..2ed210873 100644
--- a/maven/.signature
+++ b/maven/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wYUnOi482Ftl7NHfS/HHq8YA9TFx1KrTMLeUdWxdjZzAzJLiBCtgP39/6HmLHAYzPiIZx7EAUtjyFBYEhOBzw8=
-SHA256 (Pkgfile) = 4808a495611e1c5522e9b51e6e391982ad9c1468c4581af7b4ebaaa57dbaed61
-SHA256 (.footprint) = e566b627fa37b3e6a7e617ffc17b216093faa1918cd3fc802476c9dcd6d51e1d
-SHA256 (apache-maven-3.8.1-src.tar.gz) = 86dc0df5950bb22dedcab326499531ee9c155016c9a7a3d3f33315becb0c71b1
+RWSagIOpLGJF3zxaaDsBZ60ASusHInZXvkSO4QAYl/6rzt6Nf03Sj6b8RD57AiXCWnBhIDSqfAJ1KV/GPumNNlyh/0TtOwH8ZwA=
+SHA256 (Pkgfile) = 40c4748e40c2b78d5cbbd8bb761d9b376ce246461722b1af2c20d5485ac3d840
+SHA256 (.footprint) = ce3def25e68e1c3cb3247a7dfbf2f8622dec99e17c2aee82d8fbae173c6e47f0
+SHA256 (apache-maven-3.8.2-src.tar.gz) = 05e1d6bdbf7b35bc4c31c33f1607ebc41cf5cfe34b3d38b780c980fa0a36ebe6
diff --git a/maven/Pkgfile b/maven/Pkgfile
index 74aafbbed..a161fec20 100644
--- a/maven/Pkgfile
+++ b/maven/Pkgfile
@@ -1,15 +1,16 @@
 # Description: Java project management and project comprehension tool
 # URL: https://maven.apache.org/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: openjdk8
+# Depends on: openjdk16-jdk
 
 name=maven
-version=3.8.1
+version=3.8.2
 release=1
 source=(https://www-eu.apache.org/dist/maven/maven-3/$version/source/apache-$name-$version-src.tar.gz)
 bin_source=(https://archive.apache.org/dist/maven/maven-3/$version/binaries/apache-$name-$version-bin.tar.gz)
-_bootstrapsum=b98a1905eb554d07427b2e5509ff09bd53e2f1dd7a0afa38384968b113abef02
+_bootstrapsum=8dae10b09feb7b8e4c079fc39a11f3296ab630fd9bc44ecea0fb288cec7770f7
 
+# bootstrap_mvn() {{{
 bootstrap_mvn() {
   # check if the binary is already available
   if [ ! -f "$PKGMK_SOURCE_DIR/apache-$name-$version-bin.tar.gz" ];
@@ -35,23 +36,27 @@ bootstrap_mvn() {
   export PATH="$SRC/binary/apache-$name-$version/bin:${PATH}"
   cd $SRC
 }
-
+# }}}
 build() {
+  export PATH="/usr/lib/java/openjdk16-jdk/bin:${PATH}"
+
   # if we don't have maven on our system already, bootstrap it
   if [ ! -e "/usr/bin/mvn" ]; then
     bootstrap_mvn
   fi
 
   cd apache-$name-$version
-  export PATH="/usr/lib/java/openjdk8/bin:${PATH}"
+
   mvn -DdistributionTargetDir=$PKG/usr \
     -Dproject.build.sourceEncoding=UTF-8 -e \
     -Dmaven.repo.local=$PKGMK_SOURCE_DIR/maven-repo \
     -DskipTests -Dmaven.test.skip=true \
     install
+
   find $PKG \( \
     -iname "*readme*" -o \
     -iname "*notice*" -o \
     -iname "*license*" -o \
     -iname "*licence*" \) -exec rm -fr '{}' \+
 }
+# vim: foldmethod=marker foldlevelstart=1