Re: devel/maven: 3.8.7 -> 3.9.6
> But I may missed it, I not sure that had happened. No worries, happens. > Anyway, here a patch which fixed the issue. Confirmed and committed, thanks!
Re: devel/maven: 3.8.7 -> 3.9.6
On Tue, 07 May 2024 10:28:16 +0100, Theo Buehler wrote: > > > Tested on -current/amd64, tests includes building game/libgdx and > > net/jitsi which uses devel/maven as port dependncy. > > net/jitsi/videobridge doesn't build here > Wired. I had checked it via make in net/jitsi and I recall that it was sucessful. But I may missed it, I not sure that had happened. Anyway, here a patch which fixed the issue. Sorry for broken it. diff --git net/jitsi/videobridge/patches/patch-pom_xml net/jitsi/videobridge/patches/patch-pom_xml new file mode 100644 index 000..03db5b1bddb --- /dev/null +++ net/jitsi/videobridge/patches/patch-pom_xml @@ -0,0 +1,21 @@ +Enforce version of maven-resources-plugin and maven-jar-plugin from videobridge-deps-2.0.8319.tgz +Index: pom.xml +--- pom.xml.orig pom.xml +@@ -61,6 +61,16 @@ + + + ++ ++org.apache.maven.plugins ++maven-resources-plugin ++2.6 ++ ++ ++org.apache.maven.plugins ++maven-jar-plugin ++3.2.0 ++ + + + -- wbr, Kirill
Re: devel/maven: 3.8.7 -> 3.9.6
> Tested on -current/amd64, tests includes building game/libgdx and > net/jitsi which uses devel/maven as port dependncy. net/jitsi/videobridge doesn't build here >>> Building on localhost under net/jitsi/videobridge BDEPENDS = [devel/maven;devel/jdk/11] DIST = [net/jitsi/videobridge:jitsi-videobridge-deps-2.0.8319.tgz;net/jitsi/videobridge:jitsi-videobridge-2.0.8319-f6426ea0.tar.gz] FULLPKGNAME = jitsi-videobridge-2.0.8319 RDEPENDS = [java/javaPathHelper;devel/jdk/11;net/jitsi/srtp] (Junk lock obtained for localhost at 1715073767.89) >>> Running depends in net/jitsi/videobridge at 1715073767.90 last junk was in archivers/pecl-lzf,php74 /usr/sbin/pkg_add -aI -Drepair jdk-11.0.23.9.1v0 maven-3.9.6 was: /usr/sbin/pkg_add -aI -Drepair jdk-11.0.23.9.1v0 maven-3.9.6 /usr/sbin/pkg_add -aI -Drepair jdk-11.0.23.9.1v0 maven-3.9.6 New and changed readme(s): /usr/local/share/doc/pkg-readmes/jdk-11 --- +jdk-11.0.23.9.1v0 --- You may wish to add /usr/local/jdk-11/man to /etc/man.conf >>> Running show-prepare-results in net/jitsi/videobridge at 1715073771.54 ===> net/jitsi/videobridge ===> Building from scratch jitsi-videobridge-2.0.8319 ===> jitsi-videobridge-2.0.8319 depends on: maven-* -> maven-3.9.6 ===> jitsi-videobridge-2.0.8319 depends on: jdk->=11v0,<12v0 -> jdk-11.0.23.9.1v0 jdk-11.0.23.9.1v0 maven-3.9.6 (Junk lock released for localhost at 1715073771.76) distfiles size=251743152 >>> Running patch in net/jitsi/videobridge at 1715073771.78 ===> net/jitsi/videobridge ===> Checking files for jitsi-videobridge-2.0.8319 `/data/distfiles/jitsi-videobridge-2.0.8319-f6426ea0.tar.gz' is up to date. `/data/distfiles/jitsi-videobridge-deps-2.0.8319.tgz' is up to date. >> (SHA256) jitsi-videobridge-2.0.8319-f6426ea0.tar.gz: OK >> (SHA256) jitsi-videobridge-deps-2.0.8319.tgz: OK ===> Extracting for jitsi-videobridge-2.0.8319 ===> Patching for jitsi-videobridge-2.0.8319 ===> Compiler link: clang -> /usr/bin/clang ===> Compiler link: clang++ -> /usr/bin/clang++ ===> Compiler link: cc -> /usr/bin/cc ===> Compiler link: c++ -> /usr/bin/c++ >>> Running configure in net/jitsi/videobridge at 1715073776.21 ===> net/jitsi/videobridge ===> Generating configure for jitsi-videobridge-2.0.8319 ===> Configuring for jitsi-videobridge-2.0.8319 >>> Running build in net/jitsi/videobridge at 1715073776.31 ===> net/jitsi/videobridge ===> Building for jitsi-videobridge-2.0.8319 cd /tmp/pobj/jitsi-videobridge-2.0.8319/jitsi-videobridge-f6426ea01d6d4426149dd2bf658d388f447b9f5d && /usr/bin/env -i JAVA_HOME=/usr/local/jdk-11 PORTSDIR="/usr/ports" LIBTOOL="/usr/bin/libtool" PATH='/tmp/pobj/jitsi-videobridge-2.0.8319/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin' PREFIX='/usr/local' LOCALBASE='/usr/local' X11BASE='/usr/X11R6' CFLAGS='-O2 -pipe' TRUEPREFIX='/usr/local' DESTDIR='' HOME='/jitsi-videobridge-2.0.8319_writes_to_HOME' PICFLAG="-fpic" BINGRP=bin BINOWN=root BINMODE=755 NONBINMODE=644 DIRMODE=755 INSTALL_COPY=-c INSTALL_STRIP=-s MANGRP=bin MANOWN=root MANMODE=644 BSD_INSTALL_PROGRAM="/tmp/pobj/jitsi-videobridge-2.0.8319/bin/install -c -s -m 755" BSD_INSTALL_SCRIPT="/tmp/pobj/jitsi-videobridge-2.0.8319/bin/install -c -m 755" BSD_INSTALL_DATA="/tmp/pobj/jitsi-videobridge-2.0.8319/bin/install -c -m 644" BSD_INSTALL_MAN="/tmp/pobj/jitsi-videobridge-2.0.8319/bin/install -c -m 644" BSD_INSTALL_PROGRAM_DIR="/tmp/pobj/jitsi-videobridge-2.0.8319/bin/install -d -m 755" BSD_INSTALL_SCRIPT_DIR="/tmp/pobj/jitsi-videobridge-2.0.8319/bin/install -d -m 755" BSD_INSTALL_DATA_DIR="/tmp/pobj/jitsi-videobridge-2.0.8319/bin/install -d -m 755" BSD_INSTALL_MAN_DIR="/tmp/pobj/jitsi-videobridge-2.0.8319/bin/install -d -m 755" mvn -Dmaven.repo.local=/tmp/pobj/jitsi-videobridge-2.0.8319/m2 --offline -PbuildFatJar -DskipTests -Dassembly.skipAssembly=false package [INFO] Scanning for projects... [INFO] [INFO] Reactor Build Order: [INFO] [INFO] jvb-parent [pom] [INFO] rtp[jar] [INFO] jitsi-media-transform [jar] [INFO] jitsi-videobridge [jar] [INFO] [INFO] < org.jitsi:jvb-parent > [INFO] Building jvb-parent 2.1-SNAPSHOT [1/4] [INFO] from pom.xml [INFO] [ pom ]- [INFO] [INFO] --- enforcer:3.0.0-M3:enforce (enforce-maven) @ jvb-parent --- [INFO] [INFO] ---< org.jitsi:rtp > [INFO] Building rtp 2.1-SNAPSHOT [2/4] [INFO] from rtp/pom.xml [INFO] [ jar ]- [WARNING]
Re: 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
>
