From d8b36caf62e380615beadb7b7a386392c4974d7f Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Tue, 6 Feb 2018 01:31:58 +0100 Subject: [PATCH 01/11] Android Note ~ Switched to incompatible with new links --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 61553be7d..18cd17736 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -| Android developers | -| ------------------------------------- | -| You can use this library in your Android app. However, you should have a look at the [Android Wrapper](https://www.github.com/kaaes/spotify-web-api-android) project built by [kaaes](https://www.github.com/kaaes) as it's made specifically for Android. See also [Spotify's Android SDK](https://developer.spotify.com/technologies/spotify-android-sdk/). | +| Android Developers | +| ------------------ | +| You **cannot** use this library for Android app development. Have a look at [kaaes/spotify-web-api-android](https://www.github.com/kaaes/spotify-web-api-android) and [Spotify's Android SDK](https://developer.spotify.com/technologies/spotify-android-sdk/) and [see why](https://github.com/thelinmichael/spotify-web-api-java/issues/120#issuecomment-363266591). | Spotify Web API Java [![Build Status](https://travis-ci.org/thelinmichael/spotify-web-api-java.svg?branch=master)](https://travis-ci.org/thelinmichael/spotify-web-api-java) ================== From b8a7184e156b7d9066ef3c248ff564d9d539d536 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 8 Feb 2018 03:18:04 +0100 Subject: [PATCH 02/11] Travis Releases + Maven settings file + Before deploy script + Encrypted signing file ~ Travis release configuration ~ POM restructuring --- .travis.yml | 37 +++++-- pom.xml | 200 +++++++++++++++++++------------------ travis/.m2.settings.xml | 22 ++++ travis/before-deploy.sh | 3 + travis/codesigning.asc.enc | Bin 0 -> 7808 bytes 5 files changed, 161 insertions(+), 101 deletions(-) create mode 100644 travis/.m2.settings.xml create mode 100644 travis/before-deploy.sh create mode 100644 travis/codesigning.asc.enc diff --git a/.travis.yml b/.travis.yml index 91622c994..ade863d8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,36 @@ language: java -install: mvn install -DskipTests=true -Dgpg.skip=true jdk: - - oraclejdk8 - - oraclejdk9 - - openjdk7 - - openjdk8 +- openjdk7 +- openjdk8 +- oraclejdk8 +- oraclejdk9 +env: + global: + - secure: hiAE0Gt7pcTmcQ/rjfK+KB+Mj1O3LaEM6wNgFleG04fuPbsUgTpF3U1HMTfEvU8nB0AEoIHgPZ2qWHIqGdJ23HfC7pTXtZXy8YSMOnPpTx8j9+qX0i7kJsqA6CNd+5i1CN0aM0uSd2CXRj7CFpwBa+5kfQmsml90oG3mev1MXcs= + - # ^^SONATYPE_USERNAME + - secure: Sa7tSlz29eOhOazmyGAfv7tFtaZjI1PMtgQJ3fFFZ2EVaAbxxGU/l+TVmcCOxOt7OdCf1MTgB9/dRGPZAuVdtelPIytoJEpB7U2qBci72K1at2zqKF6dq0pPswuwdbkqJeAf39M3J1nZcXKXwirU/J4OfwWyi5qwXpM8pO7W/qM= + - # ^^SONATYPE_PASSWORD + - secure: hiAE0Gt7pcTmcQ/rjfK+KB+Mj1O3LaEM6wNgFleG04fuPbsUgTpF3U1HMTfEvU8nB0AEoIHgPZ2qWHIqGdJ23HfC7pTXtZXy8YSMOnPpTx8j9+qX0i7kJsqA6CNd+5i1CN0aM0uSd2CXRj7CFpwBa+5kfQmsml90oG3mev1MXcs= + - # ^^GPG_KEY_NAME + - secure: ECyldY3OJbgw5GzMXeBwH8LduVzFcKYhy9nMLzUdHT/pc+4+/z/kJNGuEFHlVaUwCYLGmdBhUx7HbJ+VOdFO75dwgX1zFQqnfH9TxPprHPXWpq2dAic8a+Lv4JuuU1jvrwZfRsvpNUKRLk5YjO5BaNA2haKvAtK3yMEwd0Sjnpw= + - # ^^GPG_PASSPHRASE +cache: + directories: + - $HOME/.m2 +before_deploy: + - ./travis/before_deploy.sh + - cp /travis/.m2.settings.xml $HOME/.m2/settings.xml +deploy: + provider: script + skip_cleanup: true + script: "mvn deploy -P release" + on: + repo: thelinmichael/spotify-web-api-wrapper + branch: + - master + - v1 + tags: true notifications: email: on_success: never - on_failure: always \ No newline at end of file + on_failure: always diff --git a/pom.xml b/pom.xml index 931905a5e..45c5ab80d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,28 +7,12 @@ se.michaelthelin.spotify spotify-web-api-java - 1.7.3 - - jar + 1.7.4-SNAPSHOT Spotify Web API Java Client A Java client for Spotify's Web API https://github.com/thelinmichael/spotify-web-api-java - - - MIT License - http://www.opensource.org/licenses/mit-license.php - repo - - - - - https://github.com/thelinmichael/spotify-web-api-java - scm:git:git://github.com/thelinmichael/spotify-web-api-java.git - scm:git:git@github.com:thelinmichael/spotify-web-api-java.git - - Michael Thelin @@ -52,84 +36,19 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - + + + MIT License + http://www.opensource.org/licenses/mit-license.php + repo + + - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20.1 - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - - sign - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - false - - 3.0.0-M1 - - - + + https://github.com/thelinmichael/spotify-web-api-java + scm:git:git://github.com/thelinmichael/spotify-web-api-java.git + scm:git:git@github.com:thelinmichael/spotify-web-api-java.git + @@ -167,9 +86,100 @@ + jar + + + + default + + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20.1 + + + + + + release + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + + attach-javadocs + + + jar + + + + + false + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + + + sign + + + + + + + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + UTF-8 - true diff --git a/travis/.m2.settings.xml b/travis/.m2.settings.xml new file mode 100644 index 000000000..b5ce152e6 --- /dev/null +++ b/travis/.m2.settings.xml @@ -0,0 +1,22 @@ + + + + + ossrh + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + + + ossrh + + true + + + ${env.GPG_KEY_NAME} + ${env.GPG_PASSPHRASE} + + + + diff --git a/travis/before-deploy.sh b/travis/before-deploy.sh new file mode 100644 index 000000000..42d1c10d5 --- /dev/null +++ b/travis/before-deploy.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +openssl aes-256-cbc -K $encrypted_3e6b49107f67_key -iv $encrypted_3e6b49107f67_iv -in codesigning.asc.enc -out codesigning.asc -d +gpg --fast-import travis/codesigning.asc diff --git a/travis/codesigning.asc.enc b/travis/codesigning.asc.enc new file mode 100644 index 0000000000000000000000000000000000000000..728dfec4feba38fa60f247ad9e64308a4a685ae9 GIT binary patch literal 7808 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 SAoCPG-TX}) Date: Thu, 8 Feb 2018 03:35:53 +0100 Subject: [PATCH 03/11] Repo Name ~ Correct name --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ade863d8e..6b271e203 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ deploy: skip_cleanup: true script: "mvn deploy -P release" on: - repo: thelinmichael/spotify-web-api-wrapper + repo: thelinmichael/spotify-web-api-java branch: - master - v1 From 206221819c159fd970a84384eef8c312040a49ba Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Sat, 10 Feb 2018 15:48:18 +0100 Subject: [PATCH 04/11] 1.7.4 ~ Version number updates --- README.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 18cd17736..ef865d593 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Get the latest version: se.michaelthelin.spotify spotify-web-api-java - 1.7.3 + 1.7.4 ``` @@ -66,7 +66,7 @@ Get the latest version: This project uses net.sf.json-lib for marshalling, which may cause your Android build to fail if you're using Android Studio 1.0 ([relevant Stack Overflow post](http://stackoverflow.com/questions/27458227/org-apache-commons-collections-arraystack-has-already-been-added-to-output-plea)). It may therefore necessary to make an exclusion of common-beanutils when setting up this library as a dependency. ```Gradle -compile('se.michaelthelin.spotify:spotify-web-api-java:1.7.3') { +compile('se.michaelthelin.spotify:spotify-web-api-java:1.7.4') { exclude group: "commons-beanutils", module: "commons-beanutils" } compile 'commons-beanutils:commons-beanutils:20030211.134440' diff --git a/pom.xml b/pom.xml index 45c5ab80d..392dd0d63 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ se.michaelthelin.spotify spotify-web-api-java - 1.7.4-SNAPSHOT + 1.7.4 Spotify Web API Java Client A Java client for Spotify's Web API From 7de5f3a06e40e8f696f59cce334f642b81e2a122 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Sat, 10 Feb 2018 16:00:41 +0100 Subject: [PATCH 05/11] Travis Dash ~ Correct file name --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b271e203..7e9a8e1f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ cache: directories: - $HOME/.m2 before_deploy: - - ./travis/before_deploy.sh + - ./travis/before-deploy.sh - cp /travis/.m2.settings.xml $HOME/.m2/settings.xml deploy: provider: script From ac11b4896dd25bac76ec5c6e47d2389a049349cf Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Sat, 10 Feb 2018 16:09:03 +0100 Subject: [PATCH 06/11] Travis Permission + Executable permission for deploy script --- travis/before-deploy.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 travis/before-deploy.sh diff --git a/travis/before-deploy.sh b/travis/before-deploy.sh old mode 100644 new mode 100755 From 0db3c8bc07c6f470c188fce9d369a5c016c239b8 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Sat, 10 Feb 2018 16:14:56 +0100 Subject: [PATCH 07/11] Travis Subfolder ~ Correct file paths --- travis/before-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/before-deploy.sh b/travis/before-deploy.sh index 42d1c10d5..500437e3e 100755 --- a/travis/before-deploy.sh +++ b/travis/before-deploy.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -openssl aes-256-cbc -K $encrypted_3e6b49107f67_key -iv $encrypted_3e6b49107f67_iv -in codesigning.asc.enc -out codesigning.asc -d +openssl aes-256-cbc -K $encrypted_3e6b49107f67_key -iv $encrypted_3e6b49107f67_iv -in travis/codesigning.asc.enc -out travis/codesigning.asc -d gpg --fast-import travis/codesigning.asc From 6ab8ce484a97cdbe40399a9de5aa22c363b4dac3 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Sat, 10 Feb 2018 16:19:50 +0100 Subject: [PATCH 08/11] Travis Path ~ Corrected file path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e9a8e1f0..4cdb3ce31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ cache: - $HOME/.m2 before_deploy: - ./travis/before-deploy.sh - - cp /travis/.m2.settings.xml $HOME/.m2/settings.xml + - cp ./travis/.m2.settings.xml $HOME/.m2/settings.xml deploy: provider: script skip_cleanup: true From 4f9e55f48fd5376c3d25f44ec435d72b229d6ea9 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Sun, 11 Feb 2018 07:16:01 +0100 Subject: [PATCH 09/11] Travis Fix ~ Update GPG --- .travis.yml | 13 +++++++----- pom.xml | 19 +++++++++++++++++ travis/before-deploy.sh | 8 +++++++- travis/codesigning.asc.enc | Bin 7808 -> 7808 bytes travis/install-gnupg22.sh | 41 +++++++++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+), 6 deletions(-) create mode 100755 travis/install-gnupg22.sh diff --git a/.travis.yml b/.travis.yml index 4cdb3ce31..b2957d409 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: required language: java jdk: - openjdk7 @@ -10,20 +11,22 @@ env: - # ^^SONATYPE_USERNAME - secure: Sa7tSlz29eOhOazmyGAfv7tFtaZjI1PMtgQJ3fFFZ2EVaAbxxGU/l+TVmcCOxOt7OdCf1MTgB9/dRGPZAuVdtelPIytoJEpB7U2qBci72K1at2zqKF6dq0pPswuwdbkqJeAf39M3J1nZcXKXwirU/J4OfwWyi5qwXpM8pO7W/qM= - # ^^SONATYPE_PASSWORD - - secure: hiAE0Gt7pcTmcQ/rjfK+KB+Mj1O3LaEM6wNgFleG04fuPbsUgTpF3U1HMTfEvU8nB0AEoIHgPZ2qWHIqGdJ23HfC7pTXtZXy8YSMOnPpTx8j9+qX0i7kJsqA6CNd+5i1CN0aM0uSd2CXRj7CFpwBa+5kfQmsml90oG3mev1MXcs= - - # ^^GPG_KEY_NAME - - secure: ECyldY3OJbgw5GzMXeBwH8LduVzFcKYhy9nMLzUdHT/pc+4+/z/kJNGuEFHlVaUwCYLGmdBhUx7HbJ+VOdFO75dwgX1zFQqnfH9TxPprHPXWpq2dAic8a+Lv4JuuU1jvrwZfRsvpNUKRLk5YjO5BaNA2haKvAtK3yMEwd0Sjnpw= + - GPG_KEY_NAME=C546418B + - secure: gvElUeWA6ArpETjlD8s75PljnmVOQLchuAsYhG8lbakRCOBvklooc8hB9lYbtblKLgaY7ZX6Uu2tApH0gJAqb0YijEK3Hvu1417wI4FRUc+wX79MI3Y9lTqP9ACFifnUa2mjp8NqGz+/KebiZvtiI3u4OxK8U/QPUtUDLgvAdH4= - # ^^GPG_PASSPHRASE cache: directories: - $HOME/.m2 +before_install: + - ./travis/install-gnupg22.sh + - hash -r before_deploy: - ./travis/before-deploy.sh - cp ./travis/.m2.settings.xml $HOME/.m2/settings.xml deploy: provider: script skip_cleanup: true - script: "mvn deploy -P release" + script: "mvn deploy -P release -DskipTests=true" on: repo: thelinmichael/spotify-web-api-java branch: @@ -33,4 +36,4 @@ deploy: notifications: email: on_success: never - on_failure: always + on_failure: change diff --git a/pom.xml b/pom.xml index 392dd0d63..05c0e959b 100644 --- a/pom.xml +++ b/pom.xml @@ -161,6 +161,25 @@ + + gpg + + --batch + --pinentry-mode + loopback + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + diff --git a/travis/before-deploy.sh b/travis/before-deploy.sh index 500437e3e..7c4163afa 100755 --- a/travis/before-deploy.sh +++ b/travis/before-deploy.sh @@ -1,3 +1,9 @@ #!/usr/bin/env bash openssl aes-256-cbc -K $encrypted_3e6b49107f67_key -iv $encrypted_3e6b49107f67_iv -in travis/codesigning.asc.enc -out travis/codesigning.asc -d -gpg --fast-import travis/codesigning.asc +echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf +echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf +echo "use-agent" >> ~/.gnupg/gpg.conf +cat ~/.gnupg/gpg.conf +gpg --list-secret-keys +gpg --batch --fast-import travis/codesigning.asc +gpg --list-secret-keys \ No newline at end of file diff --git a/travis/codesigning.asc.enc b/travis/codesigning.asc.enc index 728dfec4feba38fa60f247ad9e64308a4a685ae9..3b97603384e8129560f64da8779cd60980516541 100644 GIT binary patch literal 7808 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 Skjrh%=!<^|SvZqcbuwTo086+4 literal 7808 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 SAoCPG-TX}) /etc/ld.so.conf.d/gpg2.conf" && sudo ldconfig -v && \ +echo "Complete!!!" \ No newline at end of file From 0c68c570ecde7741c47463948aa039f1bbc70655 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Sun, 11 Feb 2018 08:08:50 +0100 Subject: [PATCH 10/11] 1.7.5 ~ Version update ~ Travis strap --- .travis.yml | 3 --- README.md | 4 ++-- pom.xml | 9 ++------- travis/before-deploy.sh | 8 +------- travis/install-gnupg22.sh | 41 --------------------------------------- 5 files changed, 5 insertions(+), 60 deletions(-) delete mode 100755 travis/install-gnupg22.sh diff --git a/.travis.yml b/.travis.yml index b2957d409..85cfbcb39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,6 @@ env: cache: directories: - $HOME/.m2 -before_install: - - ./travis/install-gnupg22.sh - - hash -r before_deploy: - ./travis/before-deploy.sh - cp ./travis/.m2.settings.xml $HOME/.m2/settings.xml diff --git a/README.md b/README.md index ef865d593..715e4b00b 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Get the latest version: se.michaelthelin.spotify spotify-web-api-java - 1.7.4 + 1.7.5 ``` @@ -66,7 +66,7 @@ Get the latest version: This project uses net.sf.json-lib for marshalling, which may cause your Android build to fail if you're using Android Studio 1.0 ([relevant Stack Overflow post](http://stackoverflow.com/questions/27458227/org-apache-commons-collections-arraystack-has-already-been-added-to-output-plea)). It may therefore necessary to make an exclusion of common-beanutils when setting up this library as a dependency. ```Gradle -compile('se.michaelthelin.spotify:spotify-web-api-java:1.7.4') { +compile('se.michaelthelin.spotify:spotify-web-api-java:1.7.5') { exclude group: "commons-beanutils", module: "commons-beanutils" } compile 'commons-beanutils:commons-beanutils:20030211.134440' diff --git a/pom.xml b/pom.xml index 05c0e959b..23e0119ef 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ se.michaelthelin.spotify spotify-web-api-java - 1.7.4 + 1.7.5 Spotify Web API Java Client A Java client for Spotify's Web API @@ -162,12 +162,7 @@ - gpg - - --batch - --pinentry-mode - loopback - + gpg2 diff --git a/travis/before-deploy.sh b/travis/before-deploy.sh index 7c4163afa..2ec59f8da 100755 --- a/travis/before-deploy.sh +++ b/travis/before-deploy.sh @@ -1,9 +1,3 @@ #!/usr/bin/env bash openssl aes-256-cbc -K $encrypted_3e6b49107f67_key -iv $encrypted_3e6b49107f67_iv -in travis/codesigning.asc.enc -out travis/codesigning.asc -d -echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf -echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf -echo "use-agent" >> ~/.gnupg/gpg.conf -cat ~/.gnupg/gpg.conf -gpg --list-secret-keys -gpg --batch --fast-import travis/codesigning.asc -gpg --list-secret-keys \ No newline at end of file +gpg --batch --fast-import travis/codesigning.asc \ No newline at end of file diff --git a/travis/install-gnupg22.sh b/travis/install-gnupg22.sh deleted file mode 100755 index f9a0816be..000000000 --- a/travis/install-gnupg22.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# --------- -# Script to build and install GnuPG 2.2.x - -apt-get update -apt-get -y install libgnutls-dev bzip2 make gettext texinfo gnutls-bin libgnutls28-dev build-essential libbz2-dev zlib1g-dev libncurses5-dev libsqlite3-dev libldap2-dev || apt-get -y install libgnutls28-dev bzip2 make gettext texinfo gnutls-bin build-essential libbz2-dev zlib1g-dev libncurses5-dev libsqlite3-dev libldap2-dev -mkdir -p /var/src/gnupg22 && cd /var/src/gnupg22 -gpg --list-keys -gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 249B39D24F25E3B6 04376F3EE0856959 2071B08A33BD3F06 8A861B1C7EFD60D9 - -wget -c https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.gz && \ -wget -c https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.gz.sig && \ -wget -c https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.2.tar.gz && \ -wget -c https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.2.tar.gz.sig && \ -wget -c https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2 && \ -wget -c https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2.sig && \ -wget -c https://www.gnupg.org/ftp/gcrypt/libksba/libksba-1.3.5.tar.bz2 && \ -wget -c https://www.gnupg.org/ftp/gcrypt/libksba/libksba-1.3.5.tar.bz2.sig && \ -wget -c https://www.gnupg.org/ftp/gcrypt/npth/npth-1.5.tar.bz2 && \ -wget -c https://www.gnupg.org/ftp/gcrypt/npth/npth-1.5.tar.bz2.sig && \ -wget -c https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.1.0.tar.bz2 && \ -wget -c https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.1.0.tar.bz2.sig && \ -wget -c https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2 && \ -wget -c https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2.sig && \ -gpg --verify libgpg-error-1.27.tar.gz.sig && tar -xzf libgpg-error-1.27.tar.gz && \ -gpg --verify libgcrypt-1.8.2.tar.gz.sig && tar -xzf libgcrypt-1.8.2.tar.gz && \ -gpg --verify libassuan-2.5.1.tar.bz2.sig && tar -xjf libassuan-2.5.1.tar.bz2 && \ -gpg --verify libksba-1.3.5.tar.bz2.sig && tar -xjf libksba-1.3.5.tar.bz2 && \ -gpg --verify npth-1.5.tar.bz2.sig && tar -xjf npth-1.5.tar.bz2 && \ -gpg --verify pinentry-1.1.0.tar.bz2.sig && tar -xjf pinentry-1.1.0.tar.bz2 && \ -gpg --verify gnupg-2.2.4.tar.bz2.sig && tar -xjf gnupg-2.2.4.tar.bz2 && \ -cd libgpg-error-1.27/ && sudo ./configure && sudo make && sudo make install && cd ../ && \ -cd libgcrypt-1.8.2 && sudo ./configure && sudo make && sudo make install && cd ../ && \ -cd libassuan-2.5.1 && sudo ./configure && sudo make && sudo make install && cd ../ && \ -cd libksba-1.3.5 && sudo ./configure && sudo make && sudo make install && cd ../ && \ -cd npth-1.5 && sudo ./configure && sudo make && sudo make install && cd ../ && \ -cd pinentry-1.1.0 && sudo ./configure --enable-pinentry-curses --disable-pinentry-qt4 && \ -sudo make && sudo make install && cd ../ && \ -cd gnupg-2.2.4 && sudo ./configure && sudo make && sudo make install && \ -sudo sh -c "echo '/usr/local/lib' > /etc/ld.so.conf.d/gpg2.conf" && sudo ldconfig -v && \ -echo "Complete!!!" \ No newline at end of file From 91a6a7050b257b947e48515b4d8589e1c422412a Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Sat, 17 Feb 2018 22:45:37 +0100 Subject: [PATCH 11/11] Conditional Deploy ~ Deploy only for Oracle Java 9 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 85cfbcb39..11937213a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_deploy: deploy: provider: script skip_cleanup: true - script: "mvn deploy -P release -DskipTests=true" + script: "if [ '${TRAVIS_JDK_VERSION}' = 'oraclejdk9' ]; then mvn deploy -P release -DskipTests=true ; fi" on: repo: thelinmichael/spotify-web-api-java branch: