Merge pull request #175 from funfried/release/1.14.x

Fixed deployment to Maven central
funfried · Dec 31, 2021 · 3c844cd · 3c844cd
2 parents 68d87db + 2838e96
commit 3c844cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/.ci.settings.xml b/.ci.settings.xml
@@ -28,6 +28,7 @@
 			<properties>
 				<repoToken>${env.repoToken}</repoToken>
 				<gpg.passphrase>${env.signing_keypass}</gpg.passphrase>
+				<skipRemoteStaging>${env.skipRemoteStaging}</skipRemoteStaging>
 			</properties>
 			<repositories>
 				<repository>

diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ jobs:
     - name: build and deploy
       if: (NOT type IN (pull_request)) AND (branch = master)
       before_script:
+      - export MAVEN_OPTS="-Xms128m -Xmx512m --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"
       - export GPG_TTY=$(tty)
       - echo $signing_secret_key | base64 --decode | gpg --batch --import
       - echo $signing_ownertrust | base64 --decode | gpg --import-ownertrust

diff --git a/pom.xml b/pom.xml
@@ -424,13 +424,6 @@
 						<nexusUrl>https://oss.sonatype.org/</nexusUrl>
 						<autoReleaseAfterClose>true</autoReleaseAfterClose>
 					</configuration>
-					<dependencies>
-						<dependency>
-							<groupId>com.thoughtworks.xstream</groupId>
-							<artifactId>xstream</artifactId>
-							<version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
-						</dependency>
-					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -646,11 +639,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<extensions>true</extensions>
-			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
@@ -893,6 +881,11 @@
 			<id>sonatype-oss-release</id>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<extensions>true</extensions>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>