Add JDK 16+ workaround for Nexus Staging Maven Plugin

Plugin version 1.6.8 does not work on JDK 16+ without special MAVEN_OPTS
opening certain modules, because the XStream version used needs it. One
workaround is to use a more recent XStream version.

TODO: remove plugin dependency after OSSRH-66257, NEXUS-26993 are fixed.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/docs/developer/RELEASE.md b/docs/developer/RELEASE.md
index d505b1735ee9795eff53fd2a81567d8485fb79f1..7c8b04d9fc28d87d1a63b33d21474a757d81a4a6 100644 (file)
--- a/docs/developer/RELEASE.md
+++ b/docs/developer/RELEASE.md
@@ -91,10 +91,6 @@ mvn versions:set -DnewVersion=1.9.7.M2
 # Verify if the POM changes are OK, then remove the POM backup files
 mvn versions:commit
 
-# Set some environment variables needed by Nexus Staging Maven plugin on JDK 16,
-# until https://issues.sonatype.org/browse/OSSRH-66257 is resolved
-export MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
-
 # Build and deploy the release to a Nexus staging repository.
 # The 'release' profile will activate:
 #   - Maven GPG plugin for signing artifacts (stand by to enter your passpharase).

diff --git a/pom.xml b/pom.xml
index 2e7060f68e7c62d129b2e9a37ad2b9e0571d440b..5dd236142d22000882150874dbf6ca74772f7c00 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,18 @@
                                                <!-- Activate in order to directly release to Maven Central after successful staging -->
                                                <autoReleaseAfterClose>false</autoReleaseAfterClose>
                                        </configuration>
+                                       <dependencies>
+                                               <!--
+                                                       Plugin version 1.6.8 does not work on JDK 16+ without special MAVEN_OPTS opening certain modules,
+                                                       because the XStream version used needs it. One workaround is to use a more recent XStream version.
+                                                       TODO: remove plugin dependency after OSSRH-66257, NEXUS-26993 are fixed.
+                                               -->
+                                               <dependency>
+                                                       <groupId>com.thoughtworks.xstream</groupId>
+                                                       <artifactId>xstream</artifactId>
+                                                       <version>1.4.15</version>
+                                               </dependency>
+                                       </dependencies>
                                </plugin>
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>