replace fork master distributionManagement

implemented TTL feature

.gitignore

@@ -5,3 +5,4 @@
 /target
 /*.versionsBackup
 /bin
+.vscode/

pom.xml

@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.svenkubiak</groupId>
-	<artifactId>jpushover</artifactId>
+	<artifactId>jpushover11</artifactId>
-	<version>7.0.3-SNAPSHOT</version>
+	<version>7.0.10-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<licenses>
 		<license>
@@ -18,7 +18,7 @@
 		</developer>
 	</developers>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>11</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<scm>
@@ -28,38 +28,25 @@
 		<tag>HEAD</tag>
 	</scm>
 	<name>JPushover</name>
-	<description>Zero-dependency convenient class for sending messages to Pushover in Java project</description>
+	<description>Zero-dependency convenient class for sending messages to
+		Pushover in Java project</description>
 	<url>https://github.com/svenkubiak/JPushover</url>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.11.0</version>
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
 					<debug>false</debug>
-					<optimize>true</optimize>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>3.2.1</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.3.0</version>
 				<configuration>
 					<rules>
 						<DependencyConvergence>
@@ -75,19 +62,6 @@
 						</goals>
 						<phase>validate</phase>
 					</execution>
-					<execution>
-						<id>enforce-maven</id>
-						<goals>
-							<goal>enforce</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<requireMavenVersion>
-									<version>3.8.0</version>
-								</requireMavenVersion>
-							</rules>
-						</configuration>
-					</execution>
 					<execution>
 						<id>enforce-ban-circular-dependencies</id>
 						<goals>
@@ -105,42 +79,29 @@
 					<dependency>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>extra-enforcer-rules</artifactId>
-						<version>1.6.2</version>
+						<version>1.7.0</version>
 					</dependency>
 				</dependencies>
 			</plugin>
 			<plugin>
-					<groupId>org.owasp</groupId>
+				<groupId>org.owasp</groupId>
-					<artifactId>dependency-check-maven</artifactId>
+				<artifactId>dependency-check-maven</artifactId>
-					<version>7.4.1</version>
+				<version>8.3.1</version>
-					<configuration>
+				<configuration>
-						<cveValidForHours>12</cveValidForHours>
+					<cveValidForHours>12</cveValidForHours>
-						<failBuildOnCVSS>1</failBuildOnCVSS>
+					<failBuildOnCVSS>1</failBuildOnCVSS>
-						<!--
+					<!--
 						<suppressionFiles>
-							<suppressionFile>${maven.multiModuleProjectDirectory}/owasp-suppression.xml</suppressionFile>
+					<suppressionFile>${maven.multiModuleProjectDirectory}/owasp-suppression.xml</suppressionFile>
 						</suppressionFiles>
 						-->
-						<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+					<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
-						<composerAnalyzerEnabled>false</composerAnalyzerEnabled>
+					<composerAnalyzerEnabled>false</composerAnalyzerEnabled>
-						<nodeAuditAnalyzerEnabled>false</nodeAuditAnalyzerEnabled>
+					<nodeAuditAnalyzerEnabled>false</nodeAuditAnalyzerEnabled>
-						<nuspecAnalyzerEnabled>false</nuspecAnalyzerEnabled>
+					<nuspecAnalyzerEnabled>false</nuspecAnalyzerEnabled>
-						<cocoapodsAnalyzerEnabled>false</cocoapodsAnalyzerEnabled>
+					<cocoapodsAnalyzerEnabled>false</cocoapodsAnalyzerEnabled>
-						<golangDepEnabled>false</golangDepEnabled>
+					<golangDepEnabled>false</golangDepEnabled>
-					</configuration>
+				</configuration>
-				</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.4.1</version>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.sonarsource.scanner.maven</groupId>
@@ -150,31 +111,27 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.5.3</version>
+				<version>3.0.1</version>
-				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<goals>deploy</goals>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>3.1.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.14.0</version>
+				<version>2.16.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.1.2</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -184,12 +141,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>4.0.0-M4</version>
+				<version>4.0.0-M9</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-install-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.1.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -202,35 +159,35 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.9.2</version>
+			<version>5.10.0-RC1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
 		<repository>
-			<id>ossrh</id>
+			<id>source.devloop.de-damage</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+			<url>https://source.devloop.de/api/packages/damage/maven</url>
 		</repository>
+		<snapshotRepository>
+			<id>source.devloop.de-damage</id>
+			<url>https://source.devloop.de/api/packages/damage/maven</url>
+		</snapshotRepository>
 	</distributionManagement>
+	<repositories>
+		<repository>
+			<id>source.devloop.de-damage</id>
+			<url>https://source.devloop.de/api/packages/damage/maven</url>
+		</repository>
+	</repositories>
 	<profiles>
 		<profile>
-			<id>release-sign-artifacts</id>
+			<id>release</id>
-			<activation>
-				<property>
-					<name>performRelease</name>
-					<value>true</value>
-				</property>
-			</activation>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.0.1</version>
+						<version>3.1.0</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -241,6 +198,32 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.5.0</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>3.3.0</version>
+						<executions>
+							<execution>
+								<id>attach-sources</id>
+								<goals>
+									<goal>jar-no-fork</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>

release.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+mvn versions:set
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  echo "Failed to set new version!"
+else
+  mvn clean deploy -Prelease
+  STATUS=$?
+  if [ $STATUS -ne 0 ]; then
+    echo "Failed to release!"  
+  else
+    mvn release:update-versions
+  fi
+fi
+
+rm pom.xml.versionsBackup
+
+

src/main/java/de/svenkubiak/jpushover/apis/Message.java

@@ -224,6 +224,19 @@ public class Message implements API {
         return this;
     }
 
+    /**
+     * Adds a ttl to the Pushover message
+     * 
+     * @param ttl Seconds until this message should be automatically removed from the device. Needs to be positive
+     * @return Message instance
+     */
+    public Message withTTL(int ttl) {
+        Validate.checkArgument(ttl > 0, "TTL must be a positive value");
+        
+        body.put(Param.TTL.toString(), String.valueOf(ttl));
+        return this;
+    }
+
     /**
      * Uses a given proxy for the HTTP requests to Pushover
      *

src/main/java/de/svenkubiak/jpushover/enums/Param.java

@@ -24,7 +24,8 @@ public enum Param {
     TOKEN("token"),
     URL("url"),
     URL_TITLE("url_title"),
-    USER("user");
+    USER("user"),
+    TTL("ttl");
 
     private final String value;
 

src/test/java/jpushover/apis/MessageTests.java

@@ -58,6 +58,18 @@ public class MessageTests {
         assertTrue(message.getValue(Param.USER.toString()).equals(value));
     }
     
+    @Test
+    void testWithTTL() {
+        //given
+        int ttl = 5;
+        
+        //when
+        Message message = JPushover.messageAPI().withTTL(5);
+        
+        //then
+        assertTrue(message.getValue(Param.TTL.toString()).equals(String.valueOf(ttl)));
+    }
+    
     @Test
     void testWithRetry() {
         //given