damage/JPushover11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: damage:b7aee612083216eb1b13446ce3a43447d69a6fce
Branches Tags
damage:main
..
compare: damage:main
Branches Tags
damage:main

22 Commits
b7aee61208 ... main

Author SHA1 Message Date
damage
60137a437e replace fork master distributionManagement 2023-07-20 08:24:13 +02:00
damage
1b8d1e5d1a Merge branch 'main' of https://github.com/svenkubiak/JPushover 2023-07-20 08:23:46 +02:00
Sven Kubiak
42dd11678a Added release script 2023-07-19 10:41:39 +02:00
damage
e2b041fb4b artefactid changed to 11 and revert "evil" fix 2023-07-18 22:32:49 +02:00
damage
2e7d9127ec evil "fix" to remove snapshot 2023-07-18 22:24:16 +02:00
Sven Kubiak
7e6cc8e1bb New SNAPSHOT version 2023-07-17 14:18:31 +02:00
Sven Kubiak
f0effe5240 Moved release plugins to profile 2023-07-17 14:15:33 +02:00
Sven Kubiak
49616e1d9d Signing is only activated on release 2023-07-17 14:13:27 +02:00
Sven Kubiak
f9809e444e New snapshot version 2023-07-17 14:10:15 +02:00
Sven Kubiak
8f71cf8164 Switched from maven release to sonatype staging plugin 2023-07-17 14:09:42 +02:00
Sven Kubiak
772f9a590a Updates to pom.xml 2023-07-17 13:41:05 +02:00
Sven Kubiak
f4aeb42e61 Version bumps 2023-07-16 19:19:36 +02:00
damage
b5eeef426d Java 11 settings; maven enforcer removed 2023-07-14 21:07:08 +02:00
Sven Kubiak
1d594097d9 [maven-release-plugin] prepare for next development iteration 2023-07-13 12:03:49 +02:00
Sven Kubiak
19e36db4ed [maven-release-plugin] prepare release 7.0.3 2023-07-13 12:03:45 +02:00
Sven Kubiak
f9ca3b8890 Minor refactorings 2023-07-13 12:03:11 +02:00
Sven Kubiak
0cbcf27da7 Merge pull request #7 from tuxmainy/main 
implemented TTL feature
 2023-07-13 11:58:19 +02:00
damage
be619b1843 implemented TTL feature 2023-07-12 22:50:46 +02:00
Sven Kubiak
a9286162c8 Version bumps 2023-06-12 13:19:50 +02:00
Sven Kubiak
c4a063ebda Version bumps 2023-05-15 10:02:24 +02:00
Sven Kubiak
1e3ab9eb2f Version bumps 2023-05-12 09:18:16 +02:00
Sven Kubiak
ff4bf598ba Version bumps 2023-04-28 08:39:47 +02:00
6 changed files with 118 additions and 90 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

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

159
pom.xml
View File

@ -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>
<version>7.0.3-SNAPSHOT</version>
<artifactId>jpushover11</artifactId>
<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>
<artifactId>dependency-check-maven</artifactId>
<version>7.4.1</version>
<configuration>
<cveValidForHours>12</cveValidForHours>
<failBuildOnCVSS>1</failBuildOnCVSS>
<!--
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>8.3.1</version>
<configuration>
<cveValidForHours>12</cveValidForHours>
<failBuildOnCVSS>1</failBuildOnCVSS>
<!--
<suppressionFiles>
<suppressionFile>${maven.multiModuleProjectDirectory}/owasp-suppression.xml</suppressionFile>
<suppressionFile>${maven.multiModuleProjectDirectory}/owasp-suppression.xml</suppressionFile>
</suppressionFiles>
-->
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
<composerAnalyzerEnabled>false</composerAnalyzerEnabled>
<nodeAuditAnalyzerEnabled>false</nodeAuditAnalyzerEnabled>
<nuspecAnalyzerEnabled>false</nuspecAnalyzerEnabled>
<cocoapodsAnalyzerEnabled>false</cocoapodsAnalyzerEnabled>
<golangDepEnabled>false</golangDepEnabled>
</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>
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
<composerAnalyzerEnabled>false</composerAnalyzerEnabled>
<nodeAuditAnalyzerEnabled>false</nodeAuditAnalyzerEnabled>
<nuspecAnalyzerEnabled>false</nuspecAnalyzerEnabled>
<cocoapodsAnalyzerEnabled>false</cocoapodsAnalyzerEnabled>
<golangDepEnabled>false</golangDepEnabled>
</configuration>
</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>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>deploy</goals>
</configuration>
<version>3.0.1</version>
</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>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<id>source.devloop.de-damage</id>
<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>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<id>release</id>
<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>

18
release.sh Executable file
View File

@ -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

13
src/main/java/de/svenkubiak/jpushover/apis/Message.java
View File

@ -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
*

3
src/main/java/de/svenkubiak/jpushover/enums/Param.java
View File

@ -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;

12
src/test/java/jpushover/apis/MessageTests.java
View File

@ -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