3 files changed, 11 insertions, 2 deletions
diff --git a/devel/nexus2-oss/Makefile b/devel/nexus2-oss/Makefile
index cfc7930010d4..911529f867f9 100644
--- a/devel/nexus2-oss/Makefile
+++ b/devel/nexus2-oss/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	nexus2
 PORTVERSION=	2.15.1
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	02
 CATEGORIES=	devel www java
 MASTER_SITES=	https://download.sonatype.com/nexus/oss/
diff --git a/devel/nexus2-oss/files/patch-conf_wrapper.conf b/devel/nexus2-oss/files/patch-conf_wrapper.conf
index 5175add7a8e8..3493ce233214 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	2022-03-23 19:24:46.000000000 +0100
 +++ conf/wrapper.conf	2022-04-06 21:10:27.448234000 +0200
-@@ -8,38 +8,34 @@
+@@ -8,38 +8,33 @@
  # keywords.
  
  # Set the JSW working directory (used as base for resolving relative paths)
@@ -40,7 +40,6 @@
 -#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.4.stripquotes=TRUE
 +wrapper.java.additional.5=-Djdk.tls.ephemeralDHKeySize=2048
  
 -wrapper.app.parameter.1=./conf/jetty.xml
diff --git a/devel/nexus2-oss/files/pkg-message.in b/devel/nexus2-oss/files/pkg-message.in
index 57ee0ab302aa..612378f0211e 100644
--- a/devel/nexus2-oss/files/pkg-message.in
+++ b/devel/nexus2-oss/files/pkg-message.in
@@ -32,6 +32,15 @@ Further documentation can be found at:
   https://help.sonatype.com/repomanager2
 EOM
 },
+{
+  type: upgrade
+  maximum_version: "2.15.1_1"
+  message: <<EOM
+With the upgrade to javaservicewrapper-3.6.3 Nexus won't start unless you
+remove all properties ending with '.stripquotes' in your
+%%ETCDIR%%/wrapper.conf.
+EOM
+},
 { type: remove
   message: <<EOM
 Consider deleting %%ETCDIR%%, %%RUNDIR%%, %%LOGDIR%% and %%WORKDIR%% manually!"