CVS commit: pkgsrc/devel/apache-maven

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/apache-maven
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Thu, 8 Dec 2022 12:28:41 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Dec  8 12:28:41 UTC 2022

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

Log Message:
Update to 3.8.6. From the changelog:

3.8.6:

** Bug

  * [[MNG-7432](https://issues.apache.org/jira/browse/MNG-7432)] - [REGRESSION] Resolver session contains non-MavenWorkspaceReader
  * [[MNG-7433](https://issues.apache.org/jira/browse/MNG-7433)] - [REGRESSION] Multiple maven instances working on same source tree can lock each other
  * [[MNG-7441](https://issues.apache.org/jira/browse/MNG-7441)] - Update Version of (optional) Logback to Address CVE-2021-42550
  * [[MNG-7448](https://issues.apache.org/jira/browse/MNG-7448)] - Don't ignore bin/ otherwise bin/ in apache-maven module cannot be readded
  * [[MNG-7455](https://issues.apache.org/jira/browse/MNG-7455)] - [REGRESSION] IllegalStateException in SessionScope during guice injection in multithreaded build
  * [[MNG-7459](https://issues.apache.org/jira/browse/MNG-7459)] - Revert MNG-7347 (SessionScoped beans should be singletons for a given session)
  * [[MNG-7467](https://issues.apache.org/jira/browse/MNG-7467)] - [REGRESSION] Compilation failure with relocated transitive dependency
  * [[MNG-7487](https://issues.apache.org/jira/browse/MNG-7487)] - Fix deadlock during forked lifecycle executions
  * [[MNG-7493](https://issues.apache.org/jira/browse/MNG-7493)] - [REGRESSION] Resolving dependencies between submodules fails

** New Feature

  * [[MNG-7486](https://issues.apache.org/jira/browse/MNG-7486)] - Create a multiline message helper for boxed log messages

** Improvement

  * [[MNG-7445](https://issues.apache.org/jira/browse/MNG-7445)] - to refactor some useless code
  * [[MNG-7476](https://issues.apache.org/jira/browse/MNG-7476)] - Display a warning when an aggregator mojo is locking other mojo executions

** Task

  * [[MNG-7466](https://issues.apache.org/jira/browse/MNG-7466)] - Align Assembly Descriptor NS versions

** Dependency upgrade

  * [[MNG-7488](https://issues.apache.org/jira/browse/MNG-7488)] - Upgrade SLF4J to 1.7.36
  * [[MNG-7489](https://issues.apache.org/jira/browse/MNG-7489)] - Upgrade JUnit to 4.13.2
  * [[MNG-7490](https://issues.apache.org/jira/browse/MNG-7490)] - Upgrade Plexus Utils to 3.3.1

3.8.5:

** Bug

  * [[MNG-5180](https://issues.apache.org/jira/browse/MNG-5180)] - Versioning's snapshot version list is not included in metadata merge
  * [[MNG-5561](https://issues.apache.org/jira/browse/MNG-5561)] - Plugin relocation loses configuration
  * [[MNG-5982](https://issues.apache.org/jira/browse/MNG-5982)] - The POM for ... is invalid, transitive dependencies ... while property was overriden
  * [[MNG-6326](https://issues.apache.org/jira/browse/MNG-6326)] - Build continues when core extensions aren't found
  * [[MNG-6727](https://issues.apache.org/jira/browse/MNG-6727)] - Using version range in parent and CI Friendly Version fails
  * [[MNG-6802](https://issues.apache.org/jira/browse/MNG-6802)] - FileProfileActivator changes FileProfileActivator.exists which lets flattened resolveCiFriendliesOnly depending fail activating 
profile
  * [[MNG-7156](https://issues.apache.org/jira/browse/MNG-7156)] - Parallel build can cause issues between clean and forked goals
  * [[MNG-7335](https://issues.apache.org/jira/browse/MNG-7335)] - [Regression] Parallel build fails due to missing JAR artifacts in compilePath
  * [[MNG-7347](https://issues.apache.org/jira/browse/MNG-7347)] - SessionScoped beans should be singletons for a given session
  * [[MNG-7357](https://issues.apache.org/jira/browse/MNG-7357)] - All Maven Core JARs have unusual entry order
  * [[MNG-7362](https://issues.apache.org/jira/browse/MNG-7362)] - DefaultArtifactResolver has spurious "Failure detected" INFO log
  * [[MNG-7374](https://issues.apache.org/jira/browse/MNG-7374)] - Mutating RelocatedArtifact does not retain type
  * [[MNG-7386](https://issues.apache.org/jira/browse/MNG-7386)] - ModelMerger$MergingList is not serializable
  * [[MNG-7402](https://issues.apache.org/jira/browse/MNG-7402)] - BuildListCalculator never detaches the classloader
  * [[MNG-7417](https://issues.apache.org/jira/browse/MNG-7417)] - Several classes do not set properties properly for building requests

** New Feature

  * [[MNG-7395](https://issues.apache.org/jira/browse/MNG-7395)] - Support interpolation in extensions.xml
  * [[MNG-7407](https://issues.apache.org/jira/browse/MNG-7407)] - Introduce a ModelVersionProcessor component to make CI Friendly Versions pluggable

** Improvement

  * [[MNG-6960](https://issues.apache.org/jira/browse/MNG-6960)] - Use RuntimeInformation instead of reading properties
  * [[MNG-7349](https://issues.apache.org/jira/browse/MNG-7349)] - Limit relocation warning message to direct dependencies only
  * [[MNG-7380](https://issues.apache.org/jira/browse/MNG-7380)] - Don't log non-threadsafe warning if only building a single module
  * [[MNG-7381](https://issues.apache.org/jira/browse/MNG-7381)] - Shorten parallel builder thread name to artifactId, conditionally with groupId
  * [[MNG-7385](https://issues.apache.org/jira/browse/MNG-7385)] - Improve documentation on repository metadata
  * [[MNG-7400](https://issues.apache.org/jira/browse/MNG-7400)] - Allow more WorkspaceReaders to participate
  * [[MNG-7408](https://issues.apache.org/jira/browse/MNG-7408)] - Explain reporting plugin version automatic selection (in Maven 3)

** Dependency upgrade

  * [[MNG-7370](https://issues.apache.org/jira/browse/MNG-7370)] - Upgrade Maven Wagon to 3.5.1
  * [[MNG-7384](https://issues.apache.org/jira/browse/MNG-7384)] - Upgrade Maven JAR Plugin to 3.2.2
  * [[MNG-7428](https://issues.apache.org/jira/browse/MNG-7428)] - Upgrade Maven Parent to 35

3.8.4:

** Bug

  * [[MNG-7270](https://issues.apache.org/jira/browse/MNG-7270)] - Maven startup script (init) calls which(1) which is an external command
  * [[MNG-7285](https://issues.apache.org/jira/browse/MNG-7285)] - [Regression] MavenProject.getArtifacts() not returning correct value across multiple threads
  * [[MNG-7300](https://issues.apache.org/jira/browse/MNG-7300)] - [Regression] Reloading web application (Enter) fails due to java.lang.ClassNotFoundException

** Task

  * [[MNG-7312](https://issues.apache.org/jira/browse/MNG-7312)] - Revert ThreadLocal approach from MNG-6843 and MNG-7251

** Dependency upgrade

  * [[MNG-7331](https://issues.apache.org/jira/browse/MNG-7331)] - Upgrade Jansi to 2.4.0


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/apache-maven/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/apache-maven/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/apache-maven/distinfo
cvs rdiff -u -r1.9 -r1.10 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.18 pkgsrc/devel/apache-maven/Makefile:1.19
--- pkgsrc/devel/apache-maven/Makefile:1.18     Fri Oct  8 15:08:21 2021
+++ pkgsrc/devel/apache-maven/Makefile  Thu Dec  8 12:28:41 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2021/10/08 15:08:21 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/12/08 12:28:41 schmonz Exp $
 
-DISTNAME=      apache-maven-3.8.3
+DISTNAME=      apache-maven-3.8.6
 CATEGORIES=    devel java
 MASTER_SITES=  ${MASTER_SITE_APACHE:=maven/maven-3/${PKGVERSION_NOREV}/binaries/}
 DISTFILES=     ${DISTNAME}-bin${EXTRACT_SUFX}

Index: pkgsrc/devel/apache-maven/PLIST
diff -u pkgsrc/devel/apache-maven/PLIST:1.12 pkgsrc/devel/apache-maven/PLIST:1.13
--- pkgsrc/devel/apache-maven/PLIST:1.12        Fri Oct  8 15:08:21 2021
+++ pkgsrc/devel/apache-maven/PLIST     Thu Dec  8 12:28:41 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2021/10/08 15:08:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2022/12/08 12:28:41 schmonz Exp $
 bin/mvn
 lib/java/maven/boot/plexus-classworlds-2.6.0.jar
 lib/java/maven/commons-cli-1.4.jar
@@ -6,10 +6,10 @@ 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.3.4.jar
+lib/java/maven/jansi-2.4.0.jar
 lib/java/maven/javax.annotation-api-1.2.jar
 lib/java/maven/javax.inject-1.jar
-lib/java/maven/jcl-over-slf4j-1.7.32.jar
+lib/java/maven/jcl-over-slf4j-1.7.36.jar
 lib/java/maven/maven-artifact-${PKGVERSION}.jar
 lib/java/maven/maven-builder-support-${PKGVERSION}.jar
 lib/java/maven/maven-compat-${PKGVERSION}.jar
@@ -36,11 +36,11 @@ 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-sec-dispatcher-2.0.jar
-lib/java/maven/plexus-utils-3.3.0.jar
-lib/java/maven/slf4j-api-1.7.32.jar
-lib/java/maven/wagon-file-3.4.3.jar
-lib/java/maven/wagon-http-3.4.3-shaded.jar
-lib/java/maven/wagon-provider-api-3.4.3.jar
+lib/java/maven/plexus-utils-3.3.1.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
 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.21 pkgsrc/devel/apache-maven/distinfo:1.22
--- pkgsrc/devel/apache-maven/distinfo:1.21     Tue Oct 26 10:14:14 2021
+++ pkgsrc/devel/apache-maven/distinfo  Thu Dec  8 12:28:41 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 10:14:14 nia Exp $
+$NetBSD: distinfo,v 1.22 2022/12/08 12:28:41 schmonz Exp $
 
-BLAKE2s (apache-maven-3.8.3-bin.tar.gz) = 36d7c5d309ee822c5a294d8c91b09d9fdbff5e8f133f0396bc3a2d998828153c
-SHA512 (apache-maven-3.8.3-bin.tar.gz) = 1c12a5df43421795054874fd54bb8b37d242949133b5bf6052a063a13a93f13a20e6e9dae2b3d85b9c7034ec977bbc2b6e7f66832182b9c863711d78bfe60faa
-Size (apache-maven-3.8.3-bin.tar.gz) = 9042049 bytes
+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) = 2efaaa95837cc0a626161d5fb9903e0a3f353c0f
+SHA1 (patch-bin_mvn) = 77195b4e468af5041e11e5d4c0677a58465060e2

Index: pkgsrc/devel/apache-maven/patches/patch-bin_mvn
diff -u pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.9 pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.10
--- pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.9 Fri Oct  8 15:08:21 2021
+++ pkgsrc/devel/apache-maven/patches/patch-bin_mvn     Thu Dec  8 12:28:41 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_mvn,v 1.9 2021/10/08 15:08:21 wiz Exp $
+$NetBSD: patch-bin_mvn,v 1.10 2022/12/08 12:28:41 schmonz Exp $
 
 Reconcile JAVA_HOME evaluated at run time on Darwin vs. hardcoded
 via PKG_JAVA_HOME elsewhere.
 Follow pkgsrc path convention.
 
---- bin/mvn.orig       2021-09-27 18:25:22.000000000 +0000
+--- bin/mvn.orig       2022-06-06 16:16:38.000000000 +0000
 +++ bin/mvn
 @@ -46,9 +46,11 @@ fi
  # OS specific support. $var _must_ be set to either true or false.
@@ -28,7 +28,7 @@ Follow pkgsrc path convention.
 +fi
 +
  if [ -z "$JAVA_HOME" ] ; then
--  JAVACMD=`which java`
+-  JAVACMD="`\\unset -f command; \\command -v java`"
 -else
 -  JAVACMD="$JAVA_HOME/bin/java"
 +  JAVA_HOME="@PKG_JAVA_HOME@"

Prev by Date: CVS commit: pkgsrc/wm/marco
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/wm/marco
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index