Merge pull request #3 from mateusz-bajorek/master

mateusz-bajorek · web-flow · commit 8f82f92e88f9 · 2017-01-19T15:40:21.000+01:00
contributing; travis-ci deployment job
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,37 @@
 sudo: false
 
-language: java
-
-jdk:
-  - oraclejdk8
 cache:
   directories:
     - ~/.m2/repository
 
-install: mvn install -P !build-extras -DskipTests=true -Dmaven.javadoc.skip=true -B -V
-script: mvn test -P !build-extras -B
+language: java
+jdk:
+  - oraclejdk8
+
+install:
+  - mvn --settings .travis/mvnsettings.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V
 
-after_success:
-  - ./cd/before-deploy.sh
-  - ./cd/deploy.sh
+before_install:
+  - if [ ! -z "$GPG_SECRET_KEYS" ]; then echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import; fi
+  - if [ ! -z "$GPG_OWNERTRUST" ]; then echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust; fi
+
+deploy:
+  -
+    provider: script
+    script: .travis/deploy.sh
+    skip_cleanup: true
+    on:
+      repo: CurrencyFair/OneSignal-Java-SDK
+      branch: master
+      jdk: oraclejdk8
+  -
+    provider: script
+    script: .travis/deploy.sh
+    skip_cleanup: true
+    on:
+      repo: CurrencyFair/OneSignal-Java-SDK
+      tags: true
+      jdk: oraclejdk8
 
 notifications:
   slack:
@@ -25,14 +43,3 @@ notifications:
       - tech@currencyfair.com
     on_success: change
     on_failure: always
-
-env:
-  global:
-  # Ex. travis encrypt SONATYPE_USER=your_sonatype_username
-  - secure: "UdFsmrAHMJzTND6P7omOByXDmW+qRATl1Kr6oXXrPfdekMtpLgZZpk65gYTF7tpL2ITKc/Kz6WEU0kAkFGAlhaQQCPyjW8TdzxUCs5TtidlbA5cG/Fofn0K3zP5/j7s4QLCLcX8pqv4OG0EDxQbKHH/yTaWLxgHF+ffPwqAhDJXyFYxujqoMjg5XnRIrwmJxzUSyYehWYeAEBCUBnCq3HBX1J7lCR+laD6KI5oXoEHU2XMYWZHcNeduGm2jG2fueI2otP1Qyn1mmEUjnzNeWax8SNOQtRzMWnIZ3enqcUfBpNp/CudaU3tzTP0Xxp+eYMLp/EbgW+7R2KpIjF43g11fwhG9pCLZedJUkL4u2EhVsc80vs5InPFPFk7B4xuD5VQVj9HYKVFqV9F9lx6uEMe3/XOatsGbO4nXp7iCjOGdwo8GYfTRkoa9ICtWfxmPGl4IYCvyG8czZTFFpYAxAG0CMpOrj6MBesW2Xm8cK4/zewuU+YM/T3pLi7im7x58I76fKpt2lQ0doSZK6NXr5MUntHJOanVOT+k3TKZoFySHefsV/zVVE2Mao6P8ui/PC7oJJLdhSGQkT/g97dP6HWyF1SiSJiP2LIhN8Aw+7YfGo+M/RAC8tQwWDLwZVplVrCTiYKDaPMFt38nbwzESXgYYtwm1sH//bE2gNe11fZrA="
-  # Ex. travis encrypt SONATYPE_PASSWORD=your_sonatype_password
-  - secure: "inMzoLUpg5igKAE06WC31NLDBomI7SguPJmYKaH1DRaz7fwIcqOESVUOcG/MSBhHFvPFD6P+mtWwQrbbLUNFBR6zPxh7N0y/pBMhavUqxLaomwrPWeDYubOP7mRv/HdVKjU5R4bl2Bt2UoEkLI2GwgBxGbWjN+KHzWwmSM4X/fmxdSPiulIYRGSXNzKbdBgWZeQCIgjGrnyuNlWevpDKuoD4OIYobeNkrTAUCzK8K7B7TfVXsiQ76htvHNNr16+G4qnm4TTWrdnD1CxsEICmMuJ1vBuyp1KaTUCqbNaOhwZO3VMU9R+1mq3PBTt9OwbG/VrOcrYtDGdt7AooH73Xm/pVolJrgpv3Ux2dE5S9i+HITJws2hy7o7+EZDTnLLxLpsOUzKx+NTDLugZpiTfTqPtjjJIjLyoEnciQoSmgnE9UiPXEng4O2jN12wTZw2qYvSGeUxbSis2EvBEyYs3ohzPd9Zjo69DvgFyTcR5D4C0QLO4GnNtqoHySn39UPkOioetuuYJjdFw7uy0OvacMOINveqGzmiYAD5SGPwbP3Icu8HlykH4eGtBmre2Ey2YODyDjbR1fErPS5ihRRNpxpAtlz4g8EWZ4lQicBbrVAWfZXJWX1b0z7KQFd1DkERBH71oztP9ak6zrMemRHW97tt0t30Et9HWoo9BmQ/sIP7M="
-  # Ex. travis encrypt GPG_KEY_NAME=your_gpg_email
-  - secure: "ZeEPrlvihxicTWU+4FojgjBh4wjuqxiyMJ0t4nO2zcNywRZdKcCX1cARzBXvCmQ2opWUKuc3dk5yTs3XuxNKlCEmHFz3YAyKtam6wpmyjWI+2ZqkDxb1ulpJ5zyBTIT5YAeShfz6XJEwKjO309hZw9Kxm8u73PSasavFkj9/50w7RF6bs6w6dIFhVBi74Rdx3wGfW11y/Y39KnRl45/F8rsYQbExn2Idi+OmMvajRpV6HLvXCeKGSevOnsiqAcr4NlUdZhwqFN7QAxhv3Hf64zbawcVQ2Gjuk3r7ByiihG3I/7DB+e8jXI3UND+LUzUwcMUOytXyj2gk4fTex9k/7ysrdNdAE7/MnSXsIFR3+b3kgbzZwCqLQiFFSf+glk0sembcaPJW44AP4BLxbcnoqpN9lGJmnf9xPM2Mmu2RQ83eg0BEcCWEGm6BCK+bCnBAD1JaP7XOkKdoXGBPwHF2a9rEtpdhhYL2D+2bqVyor+rBDLqkwUhiTEiQShMPrQgg5w1EPiU9iNSlZIx3Qidmr5arBvP2LhFfxoJZMv80vhbej0uRR56aByW2mAJLAF0kZsz8MFWgyoN3wUH1YnvgEIlG/nG8NnQ+VZ67jY3u5J19Mv3dzjaYHPMo+VA/uczXAJYnzRaV5UTVTBuhmah8NO+CRyL3nfURMsPErLps1Nw="
-  # Ex. travis encrypt GPG_PASSPHRASE=your_gpg_password
-  - secure: "wR3RAAIWiU2A+IzQu58mteMmYDZYlBbIxFmDCtPNc4MJkMUKm7/YT0/qJSo+FChd1AjB7U3e7R7XeWJeituDaDU+gHppIy2TZmhOtzgPMMTnZOKp7AaLTn5LkilzarLhtbiEFkX/t4FG4pABssDJu2E+vk5UhklXwdOFIDZTSE18rVY9gWdob8K9U9A/sS8fPCi66lS/hukmLUTN7gPLxCBWEDg/u+O/Ae79Fh5O5KKNC4XevHPrUKXr1Y/FTQ2BE/myau22Q1w5kYsymsiQVoHDgiBSLvp3R6UqyIBBOEfnKV5YwqGl8BP7wu1mwn/P2kAhMhqMCS/zFLA/5YUwJjymA9pLvqnAIP0EyViFz5eAG21su85NV8B0V3o30aRsht+mF+/9gxpQ2jDcEi0JsFJWzWW+W5NEIcyV6tl8bOlhCKUCcNfolOX+VD3N0PcbiKtN2RSkwapqIAMTTjU9DicQJHe/ULXSq5MTJnUfR+gJiquUhVBUk1ewT0aqwleoOY7LWh6BlksD2tiRzzgUsFSSiN1REXCqS8MprKfKzMuTXn403ZS/CQwKQpcSrYEuBmZMWhlhb8xpUWp0N5PgkTE5dqcTw0YIjpz/DXAN11yoDKVj9RV4ec944yeSY74vLXLTi0ZCeZccdgVLXvvz6jBydf80EXBP499/p05mxws="
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+if [ ! -z "$TRAVIS_TAG" ]
+then
+    echo "on a tag -> set pom.xml <version> to $TRAVIS_TAG"
+    mvn --settings .travis/mvnsettings.xml org.codehaus.mojo:versions-maven-plugin:2.3:set -DnewVersion=$TRAVIS_TAG 1>/dev/null 2>/dev/null
+else
+    echo "not on a tag -> keep snapshot version in pom.xml"
+fi
+
+mvn clean deploy --settings .travis/mvnsettings.xml -DskipTests=true -B -U
diff --git a/.travis/mvnsettings.xml b/.travis/mvnsettings.xml
@@ -1,8 +1,12 @@
-<settings>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
     <servers>
         <server>
+            <!-- Maven Central Deployment -->
             <id>ossrh</id>
-            <username>${env.SONATYPE_USER}</username>
+            <username>${env.SONATYPE_USERNAME}</username>
             <password>${env.SONATYPE_PASSWORD}</password>
         </server>
     </servers>
@@ -14,10 +18,10 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <gpg.executable>gpg</gpg.executable>
-                <gpg.keyname>${env.GPG_KEY_NAME}</gpg.keyname>
+                <gpg.executable>${env.GPG_EXECUTABLE}</gpg.executable>
                 <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
             </properties>
         </profile>
     </profiles>
+
 </settings>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,36 @@
+# Contributing
+
+We love pull requests from everyone. By participating in this project, you
+agree to abide by the [Contributor Covenant Code of Conduct](http://contributor-covenant.org/version/1/4/).
+
+Fork, then clone the repo:
+
+```
+git clone git@github.com:your-username/OneSignal-Java-SDK.git
+```
+
+## Making Changes
+
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * To quickly create a topic branch based on master; `git checkout -b my_contribution master`. Please avoid working 
+    directly on the `master` branch.
+* Make commits of logical units.
+* Make sure your commit messages are descriptive.
+* Make sure your code compiles and adheres to CurrencyFair's coding standards: `mvn clean package`
+
+## Submitting Changes
+
+* Push your changes to a topic branch in your fork of the repository.
+* [Submit a pull request](https://github.com/CurrencyFair/OneSignal-Java-SDK/compare/).
+* The CurrencyFair team will look at your Pull Request. We may suggest some changes or improvements or alternatives. 
+  Your code will be accepted when two people approve the pull request.
+* After feedback has been given we expect responses within two weeks. After two weeks we may close the pull request if 
+  it isn't showing any activity.
+
+## Releasing
+
+* Your `pom.xml` should always use SNAPSHOT `<version>x.y.z-SNAPSHOT</version>` version.
+* If you push a commit to master of your repository, a new snapshot will be uploaded and is available as `x.y.z-SNAPSHOT`.
+* The owner of the repo has to `git tag x.y.z` and `git push --tags` afterwards. This will make `x.y.z` of your library 
+  available at maven central.
diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
 # OneSignal-Java-SDK: Simple OneSignal Java REST client
 
-[![Build Status](https://travis-ci.org/CurrencyFair/OneSignal-Java-SDK.svg?branch=master)](https://travis-ci.org/CurrencyFair/OneSignal-Java-SDK)
+* Build status [![Build Status](https://travis-ci.org/CurrencyFair/OneSignal-Java-SDK.svg?branch=master)](https://travis-ci.org/CurrencyFair/OneSignal-Java-SDK)
+* Latest release [![GitHub version](https://badge.fury.io/gh/CurrencyFair%2FOneSignal-Java-SDK.svg)](https://badge.fury.io/gh/CurrencyFair%2FOneSignal-Java-SDK)
 
 [OneSignal](https://onesignal.com/) provides Push Notification delivery and automation. This SDK is its unofficial Java REST client library.
 
-## Using SDK
+## Usage
 All you need to do is call a method from `com.currencyfair.onesignal.OneSignal` class.
 
 This SDK provides easy to use builders for `Notification`, `App`, `Session` and `Device` objects.
@@ -22,6 +23,8 @@ $ mvn install
 ## Binaries
 Binaries and dependency information for Maven, Ivy, Gradle and others can be found at [http://search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Ccom.currencyfair.onesignal).
 
+Replace `x.y.z` with [![GitHub version](https://badge.fury.io/gh/CurrencyFair%2FOneSignal-Java-SDK.svg)](https://badge.fury.io/gh/CurrencyFair%2FOneSignal-Java-SDK) or current SNAPSHOT version.
+
 Example for Gradle:
 ```groovy
 compile 'com.currencyfair:onesignal:x.y.z'
@@ -35,10 +38,15 @@ and for Maven:
     <version>x.y.z</version>
 </dependency>
 ```
+
 and for Ivy:
 ```xml
 <dependency org="com.currencyfair" name="onesignal" rev="x.y.z" />
 ```
 
 ## Bugs and Feedback
 For bugs, questions and discussions please use the [Github Issues](https://github.com/CurrencyFair/OneSignal-Java-SDK/issues).
+
+## License
+
+This work is copyright by CurrencyFair (<https://currencyfair.com>) and licensed under the terms of [Apache License, Version 2.0](LICENSE.txt).
diff --git a/cd/before-deploy.sh b/cd/before-deploy.sh
diff --git a/cd/codesigning.asc.enc b/cd/codesigning.asc.enc
diff --git a/cd/deploy.sh b/cd/deploy.sh
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.currencyfair</groupId>
     <artifactId>onesignal</artifactId>
-    <version>1.0.5</version>
+    <version>1.0.5-SNAPSHOT</version>
 
     <name>OneSignal Java SDK</name>
     <description>OneSignal Java SDK is a java library enabling easy usage of OneSignal REST API</description>
@@ -45,6 +45,10 @@
             <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>
+        </repository>
     </distributionManagement>
 
     <issueManagement>
@@ -354,17 +358,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>${maven-release-plugin.version}</version>
-                <configuration>
-                    <useReleaseProfile>false</useReleaseProfile>
-                    <releaseProfiles>release</releaseProfiles>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <tagNameFormat>@${project.version}</tagNameFormat>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>${maven-jar-plugin.version}</version>
@@ -415,6 +408,49 @@
                     <autoReleaseAfterClose>true</autoReleaseAfterClose>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>${maven-gpg-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${maven-source-plugin.version}</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-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -434,65 +470,4 @@
         </plugins>
     </reporting>
 
-    <profiles>
-        <profile>
-            <id>sign</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${maven-gpg-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>build-extras</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>${maven-source-plugin.version}</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-javadoc-plugin</artifactId>
-                        <version>${maven-javadoc-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
