From nobody Fri May 13 21:08:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 18C871AE99CB; Fri, 13 May 2022 21:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L0Lp905bdz3MTG; Fri, 13 May 2022 21:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652476081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8PUp8R8nZsDJXQyuxL7YOl5DVfVNJMdJdsCIRLqgS+Q=; b=GzglmLAfq7MI8NGdeoWaMN8Oqee00Zi6wx1eYILn0GqbY2GNUiPt7ryu8BeYMHbQRBJHeU eT7A1NgknwpjjjLHwJwB/zYEGVGYTZ68+9gIpNuhIaMvGbTaGKVEkyZZ5G+zTT4V6AupEq eCygwVshzvwWshcu1Wlg4xkjV6ahvjOML3Bgby8/8Z3snec4ObD0XFijxkFM4rmHLFmTBY QA6UfLvQfmADE2LLkZugWbQUk+JiA3JtrqPZheu76I2x3X40JAc6/3pJ7FNTBprtULDqme 2dUjgqCv4mG9JydrNDBolFbllVBVzWiTceMJa/bLoAhVeyLERg68Aj4ZkPxtZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D36F919ED; Fri, 13 May 2022 21:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24DL80ab031149; Fri, 13 May 2022 21:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DL80Wp031148; Fri, 13 May 2022 21:08:00 GMT (envelope-from git) Date: Fri, 13 May 2022 21:08:00 GMT Message-Id: <202205132108.24DL80Wp031148@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: 42fc5985a32e - main - devel/nexus2-oss: update 2.14.20 -> 2.15.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42fc5985a32ed2d18c953ac5864a48c30c477b38 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652476081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8PUp8R8nZsDJXQyuxL7YOl5DVfVNJMdJdsCIRLqgS+Q=; b=r1/t7TpNtxGGre3nK1AT2i3r5n8K2PgP87Q9UROwosw+c9GOP1X5NCLMwx1meNHRVTNNIL STLitDLHlhIZhjBCQB4iVcBzjVphkCd2JOqYZDIBOjJ11xLxyUN4Ub3GyZSuNyMHiAubHh 7pfWGmz76V3jdG41wERe6AOabOtRRhJe1BbuciFsri8td07zxSd2NIhkLTjdkMfbyrAP8u y0OjGlW6D1waP6BrmuU9F/QX+oSaU8LyTEiQXlekXFBIkEhTbP0tFVcEHyxEWR0pd3nsyK j+UQmQKn0g898bbW+d/ftyBRFBx9zh8eIqn/QjbVRMPTxAV/Wcg5q31QA0d9iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652476081; a=rsa-sha256; cv=none; b=F60eUvNPELUTF6b9yBWN6c6H4loI5Ga+mzm8IKAGQA6UTaL6HffKQJfIPVPd72PgOcvHaK 5yykwo/+9JyDM2A1hITqft0MpRTNHA4tpnsDVgq1SNGh7OLz/Qg8HvWmyLQPsURMLAfHmO 0krjLSA3uf1KhEQz7eNwOdgGFYReK2buX4CElC+3RgfGTyxBay1MbEchrbnKdFy0hicEAN gUGE0yg19isbOkqRzxfowjCTWX+Imjnzbbg59SBmrk5ASsu2W26DUq3j/DNdtocnkgz6Y+ h84aOGaRgNxp3rTHG16baGFLthttOlOvWkth95zLkYGPWy06Gm7QLUmVIOBpXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=42fc5985a32ed2d18c953ac5864a48c30c477b38 commit 42fc5985a32ed2d18c953ac5864a48c30c477b38 Author: Michael Osipov AuthorDate: 2022-05-13 21:04:17 +0000 Commit: Kurt Jaeger CommitDate: 2022-05-13 21:04:17 +0000 devel/nexus2-oss: update 2.14.20 -> 2.15.1 PR: 263256 Approved by: Michael Osipov (maintainer) --- UPDATING | 13 ++ devel/nexus2-oss/Makefile | 8 +- devel/nexus2-oss/distinfo | 6 +- .../files/patch-conf_jetty-requestlog.xml | 8 +- devel/nexus2-oss/files/patch-conf_nexus.properties | 6 +- devel/nexus2-oss/files/patch-conf_wrapper.conf | 26 ++-- devel/nexus2-oss/files/pkg-message.in | 6 +- devel/nexus2-oss/pkg-descr | 2 +- devel/nexus2-oss/pkg-plist | 163 +++++++++++---------- 9 files changed, 135 insertions(+), 103 deletions(-) diff --git a/UPDATING b/UPDATING index 3ecb1a92e91c..bc65bf1b008d 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,19 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20220513: + AFFECTS: devel/nexus2-oss + AUTHOR: michael.osipov@siemens.com + + Nexus 2.15.x introduces incompatible configuration changes. You + must review changes in ETCDIR/wrapper.conf and ETCDIR/jetty*.xml + with updated samples as well as NEXUS_WORKDIR/conf/logback-nexus.xml + with its origin from + DATADIR/nexus/WEB-INF/lib/nexus-core-VERSION.jar!/META-INF/log/logback-nexus.xml, + grant write access to files in ETCDIR since Nexus itself might + update files in place otherwise your instance will not properly + work after the update. + 20220510 AFFECTS: sysutils/zrepl AUTHOR: monwarez@gmail.com diff --git a/devel/nexus2-oss/Makefile b/devel/nexus2-oss/Makefile index 3bc742f9f5da..542541de867e 100644 --- a/devel/nexus2-oss/Makefile +++ b/devel/nexus2-oss/Makefile @@ -1,5 +1,5 @@ PORTNAME= nexus2 -PORTVERSION= 2.14.20 +PORTVERSION= 2.15.1 DISTVERSIONSUFFIX= 02 CATEGORIES= devel www java MASTER_SITES= https://download.sonatype.com/nexus/oss/ @@ -24,7 +24,8 @@ NO_BUILD= yes NO_TEST= yes USE_JAVA= yes -JAVA_VERSION= 8+ +# Java 8 only, see https://issues.sonatype.org/browse/NEXUS-19183 +JAVA_VERSION= 8 USE_RC_SUBR= ${PORTNAME} @@ -56,7 +57,6 @@ SUB_FILES= pkg-message SUB_LIST= NEXUS_RC=${PORTNAME} \ DESC="${COMMENT}" \ VERSION=${PORTVERSION} \ - BOOKVERSION=${PORTVERSION:C/..$//1} \ USER=${NEXUS_USER} \ GROUP=${NEXUS_GROUP} \ WRAPPER_CMD=${WRAPPER_CMD} \ @@ -72,7 +72,6 @@ PLIST_SUB= USER=${NEXUS_USER} \ # PATCH NOTES # Several patches are necessary due to the following issues: -# * https://issues.sonatype.org/browse/NEXUS-10981 # * https://issues.sonatype.org/browse/NEXUS-10983 # * https://issues.sonatype.org/browse/NEXUS-10984 @@ -102,6 +101,7 @@ do-install: @(cd ${STAGEDIR}${DATADIR} && ${MV} conf ${STAGEDIR}${ETCDIR}) @(cd ${STAGEDIR}${ETCDIR} \ && ${FIND} . -type f -exec ${MV} '{}' '{}'.sample \;) + @${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/conf @${MKDIR} ${STAGEDIR}${NEXUS_RUNDIR} @${MKDIR} ${STAGEDIR}${NEXUS_LOGDIR} @${MKDIR} ${STAGEDIR}${NEXUS_WORKDIR} diff --git a/devel/nexus2-oss/distinfo b/devel/nexus2-oss/distinfo index a56e739dd40c..a3dd466035ff 100644 --- a/devel/nexus2-oss/distinfo +++ b/devel/nexus2-oss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1610303650 -SHA256 (nexus-2.14.20-02-bundle.tar.gz) = 0d09b35265b06e0f1ecadb00f31d0f7e187a35b39fc34d762c0393918ccf19c8 -SIZE (nexus-2.14.20-02-bundle.tar.gz) = 83560634 +TIMESTAMP = 1649271807 +SHA256 (nexus-2.15.1-02-bundle.tar.gz) = 6d371cfdedd787c4ce26bf9cde5597d5c6e21a718368c08fb420f788b7085d18 +SIZE (nexus-2.15.1-02-bundle.tar.gz) = 89266215 diff --git a/devel/nexus2-oss/files/patch-conf_jetty-requestlog.xml b/devel/nexus2-oss/files/patch-conf_jetty-requestlog.xml index 32df6bb3c3f1..207913243f07 100644 --- a/devel/nexus2-oss/files/patch-conf_jetty-requestlog.xml +++ b/devel/nexus2-oss/files/patch-conf_jetty-requestlog.xml @@ -1,9 +1,9 @@ ---- conf/jetty-requestlog.xml.orig 2016-09-17 19:33:10 UTC -+++ conf/jetty-requestlog.xml -@@ -27,7 +27,7 @@ +--- conf/jetty-requestlog.xml 2022-03-23 19:24:46.000000000 +0100 ++++ conf/jetty-requestlog.xml 2022-04-06 21:10:27.448020000 +0200 +@@ -22,7 +22,7 @@ - + - /conf/logback-access.xml + /logback-access.xml true diff --git a/devel/nexus2-oss/files/patch-conf_nexus.properties b/devel/nexus2-oss/files/patch-conf_nexus.properties index 0106fea00e1d..968333458276 100644 --- a/devel/nexus2-oss/files/patch-conf_nexus.properties +++ b/devel/nexus2-oss/files/patch-conf_nexus.properties @@ -1,6 +1,6 @@ ---- conf/nexus.properties.orig 2016-09-17 19:33:10 UTC -+++ conf/nexus.properties -@@ -22,7 +22,9 @@ nexus-webapp=${bundleBasedir}/nexus +--- conf/nexus.properties 2022-03-23 19:24:46.000000000 +0100 ++++ conf/nexus.properties 2022-04-06 21:10:27.448170000 +0200 +@@ -18,7 +18,9 @@ nexus-webapp-context-path=/nexus # Nexus section diff --git a/devel/nexus2-oss/files/patch-conf_wrapper.conf b/devel/nexus2-oss/files/patch-conf_wrapper.conf index 33dca2d91a1a..5175add7a8e8 100644 --- a/devel/nexus2-oss/files/patch-conf_wrapper.conf +++ b/devel/nexus2-oss/files/patch-conf_wrapper.conf @@ -1,6 +1,6 @@ ---- conf/wrapper.conf.orig 2019-03-06 04:24:48 UTC -+++ conf/wrapper.conf -@@ -8,36 +8,32 @@ +--- conf/wrapper.conf 2022-03-23 19:24:46.000000000 +0100 ++++ conf/wrapper.conf 2022-04-06 21:10:27.448234000 +0200 +@@ -8,38 +8,34 @@ # keywords. # Set the JSW working directory (used as base for resolving relative paths) @@ -32,23 +32,27 @@ wrapper.java.additional.2=-Djava.net.preferIPv4Stack=true -wrapper.java.additional.3=-Dcom.sun.jndi.ldap.connect.pool.protocol="plain ssl" -wrapper.java.additional.3.stripquotes=TRUE --#wrapper.java.additional.4=-Xdebug --#wrapper.java.additional.5=-Xnoagent --#wrapper.java.additional.6=-Djava.compiler=NONE --#wrapper.java.additional.7=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 --#wrapper.java.additional.8=-XX:+HeapDumpOnOutOfMemoryError +-wrapper.java.additional.4=-Djdk.tls.ephemeralDHKeySize=2048 +-#wrapper.java.additional.5=-Xdebug +-#wrapper.java.additional.6=-Xnoagent +-#wrapper.java.additional.7=-Djava.compiler=NONE +-#wrapper.java.additional.8=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +-#wrapper.java.additional.9=-XX:+HeapDumpOnOutOfMemoryError +wrapper.java.additional.3=-Djava.util.prefs.userRoot=%%WORKDIR%% +wrapper.java.additional.4=-Dcom.sun.jndi.ldap.connect.pool.protocol="plain ssl" -+wrapper.java.additional.5.stripquotes=TRUE ++wrapper.java.additional.4.stripquotes=TRUE ++wrapper.java.additional.5=-Djdk.tls.ephemeralDHKeySize=2048 -wrapper.app.parameter.1=./conf/jetty.xml -wrapper.app.parameter.2=./conf/jetty-requestlog.xml +-wrapper.app.parameter.3=./conf/jetty-http.xml +wrapper.app.parameter.1=%%ETCDIR%%/jetty.xml +wrapper.app.parameter.2=%%ETCDIR%%/jetty-requestlog.xml ++wrapper.app.parameter.3=%%ETCDIR%%/jetty-http.xml # Size Java memory, in MB (-Xms) wrapper.java.initmemory=256 -@@ -58,7 +54,7 @@ wrapper.restart.reload_configuration=TRUE +@@ -60,7 +56,7 @@ wrapper.on_exit.12=RESTART # Set up JSW logging @@ -57,7 +61,7 @@ wrapper.logfile.format=PM wrapper.logfile.loglevel=INFO wrapper.logfile.maxsize=10m -@@ -67,128 +63,5 @@ wrapper.logfile.maxfiles=10 +@@ -69,128 +65,5 @@ # Set up system logging (if needed, change to INFO or other valid values) wrapper.syslog.loglevel=NONE diff --git a/devel/nexus2-oss/files/pkg-message.in b/devel/nexus2-oss/files/pkg-message.in index 302d8fbf1eed..57ee0ab302aa 100644 --- a/devel/nexus2-oss/files/pkg-message.in +++ b/devel/nexus2-oss/files/pkg-message.in @@ -28,13 +28,13 @@ The work, log, and run directories are located at: Documentation ============= -Further documentation can be found in the official Nexus Book at: - https://books.sonatype.com/nexus-book/%%BOOKVERSION%%/reference/index.html +Further documentation can be found at: + https://help.sonatype.com/repomanager2 EOM }, { type: remove message: <