Download raw body.
devel/maven: 3.8.7 -> 3.9.6
thanks, committed.
On 2024/05/03 15:51, Kirill A. Korinsky wrote:
> ports@
>
> Here an update of devel/maven to the last version.
>
> Changelogs available here: https://maven.apache.org/release-notes-all.html
>
> Tested on -current/amd64, tests includes building game/libgdx and
> net/jitsi which uses devel/maven as port dependncy.
>
> net/jitsi/jicofo requires a patch to enforce version of
> maven-resources-plugin from jicofo-deps-2.0.8319.tgz
>
> Everything else works well.
>
> diff --git devel/maven/Makefile devel/maven/Makefile
> index 825dc92984b..d8ee9d8e528 100644
> --- devel/maven/Makefile
> +++ devel/maven/Makefile
> @@ -1,6 +1,6 @@
> COMMENT= software project management and comprehension tool
>
> -V= 3.8.7
> +V= 3.9.6
> DISTNAME= apache-maven-$V
> PKGNAME= ${DISTNAME:S/apache-//}
> CATEGORIES= devel
> diff --git devel/maven/distinfo devel/maven/distinfo
> index f70c4b796f7..fa108564c9f 100644
> --- devel/maven/distinfo
> +++ devel/maven/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (apache-maven-3.8.7-bin.tar.gz) = YotJNSEw0dJdVRmxxyTw7+WLhrrVXzemlMqPc/EeNgQ=
> -SIZE (apache-maven-3.8.7-bin.tar.gz) = 8293440
> +SHA256 (apache-maven-3.9.6-bin.tar.gz) = bu3SyuNibWrTpcnuMkvSZYU9ZCl/B/AzQwdVvQ4MOks=
> +SIZE (apache-maven-3.9.6-bin.tar.gz) = 9410508
> diff --git devel/maven/patches/patch-bin_mvn devel/maven/patches/patch-bin_mvn
> index 240dafc5b02..34da9dac3aa 100644
> --- devel/maven/patches/patch-bin_mvn
> +++ devel/maven/patches/patch-bin_mvn
> @@ -1,7 +1,7 @@
> Index: bin/mvn
> --- bin/mvn.orig
> +++ bin/mvn
> -@@ -33,8 +33,8 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
> +@@ -34,8 +34,8 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
> . /usr/local/etc/mavenrc
> fi
>
> diff --git devel/maven/pkg/PLIST devel/maven/pkg/PLIST
> index b7562796909..bc71adbc861 100644
> --- devel/maven/pkg/PLIST
> +++ devel/maven/pkg/PLIST
> @@ -10,20 +10,34 @@ maven/bin/mvn
> maven/bin/mvnDebug
> maven/bin/mvnyjp
> maven/boot/
> -maven/boot/plexus-classworlds-2.6.0.jar
> +maven/boot/plexus-classworlds-2.7.0.jar
> maven/boot/plexus-classworlds.license
> maven/conf
> maven/lib/
> -maven/lib/commons-cli-1.4.jar
> +maven/lib/aopalliance-1.0.jar
> +maven/lib/aopalliance.license
> +maven/lib/commons-cli-1.5.0.jar
> maven/lib/commons-cli.license
> -maven/lib/commons-lang3-3.8.1.jar
> +maven/lib/commons-codec-1.16.0.jar
> +maven/lib/commons-codec.license
> +maven/lib/commons-lang3-3.12.0.jar
> maven/lib/commons-lang3.license
> maven/lib/ext/
> maven/lib/ext/README.txt
> -maven/lib/guava-25.1-android.jar
> +maven/lib/ext/hazelcast/
> +maven/lib/ext/hazelcast/README.txt
> +maven/lib/ext/redisson/
> +maven/lib/ext/redisson/README.txt
> +maven/lib/failureaccess-1.0.1.jar
> +maven/lib/failureaccess.license
> +maven/lib/guava-32.0.1-jre.jar
> maven/lib/guava.license
> -maven/lib/guice-4.2.2-no_aop.jar
> +maven/lib/guice-5.1.0.jar
> maven/lib/guice.license
> +maven/lib/httpclient-4.5.14.jar
> +maven/lib/httpclient.license
> +maven/lib/httpcore-4.4.16.jar
> +maven/lib/httpcore.license
> maven/lib/jansi-2.4.0.jar
> maven/lib/jansi-native/
> maven/lib/jansi-native/README.txt
> @@ -33,35 +47,38 @@ 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-1.3.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.36.jar
> maven/lib/jcl-over-slf4j.license
> -maven/lib/maven-artifact-3.8.7.jar
> -maven/lib/maven-builder-support-3.8.7.jar
> -maven/lib/maven-compat-3.8.7.jar
> -maven/lib/maven-core-3.8.7.jar
> -maven/lib/maven-embedder-3.8.7.jar
> -maven/lib/maven-model-3.8.7.jar
> -maven/lib/maven-model-builder-3.8.7.jar
> -maven/lib/maven-plugin-api-3.8.7.jar
> -maven/lib/maven-repository-metadata-3.8.7.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.7.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.7.jar
> -maven/lib/maven-settings-builder-3.8.7.jar
> +maven/lib/maven-artifact-3.9.6.jar
> +maven/lib/maven-builder-support-3.9.6.jar
> +maven/lib/maven-compat-3.9.6.jar
> +maven/lib/maven-core-3.9.6.jar
> +maven/lib/maven-embedder-3.9.6.jar
> +maven/lib/maven-model-3.9.6.jar
> +maven/lib/maven-model-builder-3.9.6.jar
> +maven/lib/maven-plugin-api-3.9.6.jar
> +maven/lib/maven-repository-metadata-3.9.6.jar
> +maven/lib/maven-resolver-api-1.9.18.jar
> +maven/lib/maven-resolver-connector-basic-1.9.18.jar
> +maven/lib/maven-resolver-impl-1.9.18.jar
> +maven/lib/maven-resolver-named-locks-1.9.18.jar
> +maven/lib/maven-resolver-provider-3.9.6.jar
> +maven/lib/maven-resolver-spi-1.9.18.jar
> +maven/lib/maven-resolver-transport-file-1.9.18.jar
> +maven/lib/maven-resolver-transport-http-1.9.18.jar
> +maven/lib/maven-resolver-transport-wagon-1.9.18.jar
> +maven/lib/maven-resolver-util-1.9.18.jar
> +maven/lib/maven-settings-3.9.6.jar
> +maven/lib/maven-settings-builder-3.9.6.jar
> maven/lib/maven-shared-utils-3.3.4.jar
> -maven/lib/maven-slf4j-provider-3.8.7.jar
> -maven/lib/org.eclipse.sisu.inject-0.3.5.jar
> +maven/lib/maven-slf4j-provider-3.9.6.jar
> +maven/lib/org.eclipse.sisu.inject-0.9.0.M2.jar
> maven/lib/org.eclipse.sisu.inject.license
> -maven/lib/org.eclipse.sisu.plexus-0.3.5.jar
> +maven/lib/org.eclipse.sisu.plexus-0.9.0.M2.jar
> maven/lib/org.eclipse.sisu.plexus.license
> maven/lib/plexus-cipher-2.0.jar
> maven/lib/plexus-cipher.license
> @@ -71,12 +88,13 @@ maven/lib/plexus-interpolation-1.26.jar
> maven/lib/plexus-interpolation.license
> maven/lib/plexus-sec-dispatcher-2.0.jar
> maven/lib/plexus-sec-dispatcher.license
> -maven/lib/plexus-utils-3.3.1.jar
> +maven/lib/plexus-utils-3.5.1.jar
> maven/lib/plexus-utils.license
> maven/lib/slf4j-api-1.7.36.jar
> maven/lib/slf4j-api.license
> maven/lib/wagon-file-3.5.3.jar
> -maven/lib/wagon-http-3.5.3-shaded.jar
> +maven/lib/wagon-http-3.5.3.jar
> +maven/lib/wagon-http-shared-3.5.3.jar
> maven/lib/wagon-provider-api-3.5.3.jar
> share/examples/maven/
> @sample ${SYSCONFDIR}/maven/
> diff --git net/jitsi/jicofo/patches/patch-pom_xml net/jitsi/jicofo/patches/patch-pom_xml
> new file mode 100644
> index 00000000000..d6b745d782c
> --- /dev/null
> +++ net/jitsi/jicofo/patches/patch-pom_xml
> @@ -0,0 +1,16 @@
> +Enforce version of maven-resources-plugin from jicofo-deps-2.0.8319.tgz
> +Index: pom.xml
> +--- pom.xml.orig
> ++++ pom.xml
> +@@ -68,6 +68,11 @@
> + </execution>
> + </executions>
> + </plugin>
> ++ <plugin>
> ++ <groupId>org.apache.maven.plugins</groupId>
> ++ <artifactId>maven-resources-plugin</artifactId>
> ++ <version>2.6</version>
> ++ </plugin>
> + </plugins>
> + </build>
> + <modules>
>
>
> --
> wbr, Kirill
>
devel/maven: 3.8.7 -> 3.9.6