Index: devel/nexus2-oss/Makefile =================================================================== --- devel/nexus2-oss/Makefile (revision 495694) +++ devel/nexus2-oss/Makefile (working copy) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= nexus2 -PORTVERSION= 2.14.9 -DISTVERSIONSUFFIX= 01 +PORTVERSION= 2.14.12 +DISTVERSIONSUFFIX= 02 CATEGORIES= devel www java MASTER_SITES= http://download.sonatype.com/nexus/oss/ PKGNAMESUFFIX= -oss @@ -18,15 +18,16 @@ PATCH_DEPENDS= zip:archivers/zip RUN_DEPENDS= javaservicewrapper:sysutils/javaservicewrapper +USES= cpe + +CPE_VENDOR= sonatype + NO_ARCH= yes NO_BUILD= yes NO_TEST= yes -USES= cpe -CPE_VENDOR= sonatype - USE_JAVA= yes -JAVA_VERSION= 1.7+ +JAVA_VERSION= 1.8+ USE_RC_SUBR= ${PORTNAME} @@ -96,7 +97,7 @@ ${WRKSRC}/conf/nexus.properties ${WRKSRC}/conf/wrapper.conf @${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete @(cd ${FILESDIR}/nexus/WEB-INF/lib/nexus-core.jar \ - && ${ZIP_CMD} -r ${NEXUS_CORE_JAR} META-INF) + && ${ZIP_CMD} -rq ${NEXUS_CORE_JAR} META-INF) do-install: @${MKDIR} ${STAGEDIR}${DATADIR} Index: devel/nexus2-oss/distinfo =================================================================== --- devel/nexus2-oss/distinfo (revision 495694) +++ devel/nexus2-oss/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533395818 -SHA256 (nexus-2.14.9-01-bundle.tar.gz) = 870a1052f1a23ee4879f9b37263ee4d67972df30dae5f3ae83a5afcbbe41ab2d -SIZE (nexus-2.14.9-01-bundle.tar.gz) = 81729327 +TIMESTAMP = 1552408014 +SHA256 (nexus-2.14.12-02-bundle.tar.gz) = 2123325b6aaaae1ff2131fd1b2958ff4f828b27847c8e1afe0f26b06c9bb8a60 +SIZE (nexus-2.14.12-02-bundle.tar.gz) = 82390689 Index: devel/nexus2-oss/files/patch-conf_wrapper.conf =================================================================== --- devel/nexus2-oss/files/patch-conf_wrapper.conf (revision 495694) +++ devel/nexus2-oss/files/patch-conf_wrapper.conf (working copy) @@ -1,6 +1,6 @@ ---- conf/wrapper.conf.orig 2016-09-17 19:33:10 UTC +--- conf/wrapper.conf.orig 2019-03-06 04:24:48 UTC +++ conf/wrapper.conf -@@ -8,37 +8,32 @@ +@@ -8,36 +8,32 @@ # keywords. # Set the JSW working directory (used as base for resolving relative paths) @@ -27,19 +27,18 @@ +wrapper.java.library.path.1=%%WRAPPER_LIBDIR%% # Additional JVM parameters (tune if needed, but match the sequence of numbers!) --wrapper.java.additional.1=-XX:MaxPermSize=192m --wrapper.java.additional.2=-Djava.io.tmpdir=./tmp --wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true +-wrapper.java.additional.1=-Djava.io.tmpdir=./tmp +wrapper.java.additional.1=-Djava.io.tmpdir=%%WORKDIR%%/tmp -+wrapper.java.additional.2=-Djava.net.preferIPv4Stack=true + 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.3=-Djava.util.prefs.userRoot=%%WORKDIR%% - wrapper.java.additional.4=-Dcom.sun.jndi.ldap.connect.pool.protocol="plain ssl" --wrapper.java.additional.4.stripquotes=TRUE --#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.4=-Dcom.sun.jndi.ldap.connect.pool.protocol="plain ssl" +wrapper.java.additional.5.stripquotes=TRUE -wrapper.app.parameter.1=./conf/jetty.xml @@ -49,7 +48,7 @@ # Size Java memory, in MB (-Xms) wrapper.java.initmemory=256 -@@ -59,7 +54,7 @@ wrapper.restart.reload_configuration=TRU +@@ -58,7 +54,7 @@ wrapper.restart.reload_configuration=TRUE wrapper.on_exit.12=RESTART # Set up JSW logging @@ -58,7 +57,7 @@ wrapper.logfile.format=PM wrapper.logfile.loglevel=INFO wrapper.logfile.maxsize=10m -@@ -68,128 +63,5 @@ wrapper.logfile.maxfiles=10 +@@ -67,128 +63,5 @@ wrapper.logfile.maxfiles=10 # Set up system logging (if needed, change to INFO or other valid values) wrapper.syslog.loglevel=NONE Index: devel/nexus2-oss/pkg-plist =================================================================== --- devel/nexus2-oss/pkg-plist (revision 495694) +++ devel/nexus2-oss/pkg-plist (working copy) @@ -38,7 +38,7 @@ %%DATADIR%%/lib/plexus-interpolation-1.16.jar %%DATADIR%%/lib/slf4j-api-1.7.25.jar %%DATADIR%%/nexus/LICENSE.html -%%DATADIR%%/nexus/WEB-INF/bundles/bcprov-jdk15on-1.59.jar +%%DATADIR%%/nexus/WEB-INF/bundles/bcprov-jdk15on-1.60.jar %%DATADIR%%/nexus/WEB-INF/classes/META-INF/sisu/javax.inject.Named %%DATADIR%%/nexus/WEB-INF/classes/ehcache.xml %%DATADIR%%/nexus/WEB-INF/classes/nexus.properties @@ -85,7 +85,7 @@ %%DATADIR%%/nexus/WEB-INF/lib/javax.mail-1.6.1.jar %%DATADIR%%/nexus/WEB-INF/lib/jcl-over-slf4j-1.7.25.jar %%DATADIR%%/nexus/WEB-INF/lib/joda-time-2.2.jar -%%DATADIR%%/nexus/WEB-INF/lib/jsoup-1.7.2.jar +%%DATADIR%%/nexus/WEB-INF/lib/jsoup-1.11.3.jar %%DATADIR%%/nexus/WEB-INF/lib/jsr250-api-1.0.jar %%DATADIR%%/nexus/WEB-INF/lib/jsr305-2.0.1.jar %%DATADIR%%/nexus/WEB-INF/lib/log4j-over-slf4j-1.7.25.jar @@ -125,7 +125,7 @@ %%DATADIR%%/nexus/WEB-INF/lib/sisu-mailer-1.10.jar %%DATADIR%%/nexus/WEB-INF/lib/sisu-resource-scanner-1.1.jar %%DATADIR%%/nexus/WEB-INF/lib/statemap-6.0.1-java.jar -%%DATADIR%%/nexus/WEB-INF/lib/tika-core-1.17.jar +%%DATADIR%%/nexus/WEB-INF/lib/tika-core-1.20.jar %%DATADIR%%/nexus/WEB-INF/lib/velocity-1.7.jar %%DATADIR%%/nexus/WEB-INF/lib/xmlpull-1.1.3.1.jar %%DATADIR%%/nexus/WEB-INF/lib/xpp3_min-1.1.4c.jar @@ -144,13 +144,13 @@ %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-content-plugin-%%VERSION%%/META-INF/MANIFEST.MF %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-content-plugin-%%VERSION%%/nexus-content-plugin-%%VERSION%%.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-crypto-plugin-%%VERSION%%/META-INF/MANIFEST.MF -%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-crypto-plugin-%%VERSION%%/dependencies/bcpg-jdk15on-1.59.jar -%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-crypto-plugin-%%VERSION%%/dependencies/bcpkix-jdk15on-1.59.jar -%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-crypto-plugin-%%VERSION%%/dependencies/bcprov-jdk15on-1.59.jar +%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-crypto-plugin-%%VERSION%%/dependencies/bcpg-jdk15on-1.60.jar +%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-crypto-plugin-%%VERSION%%/dependencies/bcpkix-jdk15on-1.60.jar +%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-crypto-plugin-%%VERSION%%/dependencies/bcprov-jdk15on-1.60.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-crypto-plugin-%%VERSION%%/dependencies/goodies-crypto-1.9.1.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-crypto-plugin-%%VERSION%%/nexus-crypto-plugin-%%VERSION%%.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-groovy-plugin-%%VERSION%%/META-INF/MANIFEST.MF -%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-groovy-plugin-%%VERSION%%/dependencies/groovy-all-2.4.4.jar +%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-groovy-plugin-%%VERSION%%/dependencies/groovy-all-2.4.15.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-groovy-plugin-%%VERSION%%/nexus-groovy-plugin-%%VERSION%%.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-h2-plugin-%%VERSION%%/META-INF/MANIFEST.MF %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-h2-plugin-%%VERSION%%/dependencies/h2-1.3.175.jar @@ -208,7 +208,7 @@ %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-migrationagent-plugin-%%VERSION%%/dependencies/jackson-dataformat-smile-2.9.3.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-migrationagent-plugin-%%VERSION%%/nexus-migrationagent-plugin-%%VERSION%%.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-npm-repository-plugin-%%VERSION%%/META-INF/MANIFEST.MF -%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-npm-repository-plugin-%%VERSION%%/dependencies/commons-compress-1.9.jar +%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-npm-repository-plugin-%%VERSION%%/dependencies/commons-compress-1.18.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-npm-repository-plugin-%%VERSION%%/dependencies/jackson-dataformat-smile-2.9.3.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-npm-repository-plugin-%%VERSION%%/nexus-npm-repository-plugin-%%VERSION%%.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-nuget-plugin-%%VERSION%%/META-INF/MANIFEST.MF @@ -231,7 +231,7 @@ %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-restlet1x-plugin-%%VERSION%%/META-INF/MANIFEST.MF %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-restlet1x-plugin-%%VERSION%%/dependencies/com.noelios.restlet-1.1.6-SONATYPE-5348-V8.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-restlet1x-plugin-%%VERSION%%/dependencies/com.noelios.restlet.ext.servlet-1.1.6-SONATYPE-5348-V8.jar -%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-restlet1x-plugin-%%VERSION%%/dependencies/commons-fileupload-1.3.2.jar +%%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-restlet1x-plugin-%%VERSION%%/dependencies/commons-fileupload-1.3.2.SONATYPE.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-restlet1x-plugin-%%VERSION%%/dependencies/enunciate-core-1.26.2.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-restlet1x-plugin-%%VERSION%%/dependencies/javax.ws.rs-1.0.jar %%DATADIR%%/nexus/WEB-INF/plugin-repository/nexus-restlet1x-plugin-%%VERSION%%/dependencies/nexus-restlet-bridge-%%VERSION%%.jar