diff --git a/.travis.yml b/.travis.yml index 841d20a..2591e4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,4 @@ language: java -jdk: -- openjdk7 -- oraclejdk8 env: global: - secure: 1NtRFAlL7WXaB70BQGtUw4GS4s693pAyj6A+h/Ssx2MBC8p5jsae53NCrXv0WMQZHbyeDJGM7V+Ms1ESPZ5qvF4bWRf0D/7KPxIXuPWXHZCKflzeqCsGppKawJOKQYvJZtS6BsdB5xanh+t3fHp/fs+XvKROFhI/xT9Zm73t+6ccA2Mjv9QYPCcCniPueTF2HT2qrz3j3z/LkIeV1WmnXLp0X6cQGoRliraKFhcv+gOX01CSbm/1b4FjqjUrq3Oa+Wh6Njx+kxtEd1TOoSDEdCE/dII52lyvvupwGLTZeuM3+qnD4qsLP/UK13p3P/lH15Nq0kGgCJqnbRXLsHZE/131RJFYt5jyq056FX7K/gTo/Emm63F1nThxAFLYjeKQOGB+1b2YyUr3lRRHIfmeEz5PxBfB2B3aZ0RGZw/X7ZwMiy67EiuKl+f5cbJgC8Dx5w6cfi2rFE3mMHZ3N80UQLABulVpTKQtq93GHMwjEX5bkehGY3tGHYpXL5SY2oGzUlgyOPcughtZVbY0Jhs0xTlG3UUsq22qk/V7vwywVtmliuJ3/0mT1CoVkI1d8Vtj7uNQczy2A4k5DLXxyIyAm4hVMNcrcJ9/Hubd+1Kk5aMEJBs5P+5S3ry++iLzWk3LouT3+wz7mjIlEAd5Bfk9spEAsNybFrDMUfDJnEdSRK0= @@ -10,13 +7,16 @@ env: - secure: rO3HqLCEvhP8vqgIno88jH/PMM0ig/mCgdJ0xdJWG0Jn+Y2U0xz8zs0AjD1VjlBFUr8UXqYlXcX35rBX3+6StvxQDOPwBNMbS3GkJmq2RKQIHsmHVAt2UwSPqhArGRxQxxuR8Os/noF9YVlk+S3thFCVegW91mUufB8nBnEKPaYenuHqhJDnEIpSG+ygquwzeLJJ00AhJ/zMZcPiVLYccgyiBTGyWhte20N5gA/Ys5S0dsQIS+3xcnQuAe8kJlt5CsSxVrTZmxg6QjhuvPQiUWWm0NpyV3iCHVz4oEWmm9qDod3AHvyIEdmXV2R5oYAl8k9UjqWxcqsUEBac8SzKOMbUfl/2NFkyfBKZmLVUTzKGLaVDWD+Me4q3FbiyBGTp3OEn8w2JEocX78UkovF6Hy1ixgBqC5QHIcMeQs4JlPkK2Q+rHc2DP8yL8Y5MXGiJXStF2w4S2T1qMIQtrqU5uYXKypRWn9g8y+dhPNk6Iv6loF2XdrdnD4jkL0IbMNGq4lGww+bmS9BX9KeuCWY4KCtFxca6DNqisG7PIzka6IHC/RM6xqYLG9e64oRq+8fE9Ga2yw2L3f9qT/8QbsAddHgVAqu1aLKT6wJ+M4egyzzP25KgAWyXRI+rbggnid+PZyJR9cbS/0w4HI/Jg4l2XiM/phU0qTvbKFHjfDMEzl0= matrix: include: + - jdk: openjdk7 + env: DEPLOY_ON_SUCCESS=true + - jdk: oraclejdk8 - jdk: oraclejdk8 env: INTEGRATION_TESTS=true script: "if [ \"$TRAVIS_PULL_REQUEST\" == \"false\" ]; then mvn -Pintegration integration-test; fi" notifications: email: false - slack: - secure: 6xL/XkWS73xPNgOGN/RPXa1tdccZQBQkiop/qlrcdJBk1mqkN5+g1REoApRNJIW4mZSnQazrFEm/3zsKlBZAFsHtJaDCYfMaeUcn2zG5Da6zsn1OeKTTcMIV4/XkZ+xeAixSUyznmwyZrm4l2LgtaSEk4HFnsgX+XfBacjW9mNti+yjYo+KAFXtzOPEB2qnd2lDIH2OJVMgK4pnrJaUALMhvRvucOd9ZoyUDKEoTLMRlHiS46hY4xFMmZJmYijH0aG7t1Jo8W+uRNI2qKaM3nzmZMHYXkuwmfkpENXD+GsD0IbYfQEZs/1w0s9NiF+Adq3KDgqOx420ggnhO0T6WItuB/6eB9pxYn8WWj0dMUc0wC59HpInCh6K2ogIgZoYHTfAnDSnMgNbJaNDhRXRMafVy7fW7EaDzPBP0fuBVPEjmqIEjiarSoXCmVt9pxTkVidHih0Zp4RLtItAYnHtXk+JsqKqPdxXLI60kfCnBK4BeXuG+7jg4iteNKCHLstY5JMTbShtRUAHj+PQbCEJydo5zGEk3Ef4cG5Ld/4wbyInpxy8RchqkHwKlCc6FkSTl6XVRm3l7qCPTIAGwhTUqaAD+kUbAT+XmhRM5of5LpJfiOfamJaRzgTsXDjtctGk1cKbjx7vFpG6aXPBgOCdWLjyw6wWfEPraywAy8wdT9Uk= + # slack: + # secure: 6xL/XkWS73xPNgOGN/RPXa1tdccZQBQkiop/qlrcdJBk1mqkN5+g1REoApRNJIW4mZSnQazrFEm/3zsKlBZAFsHtJaDCYfMaeUcn2zG5Da6zsn1OeKTTcMIV4/XkZ+xeAixSUyznmwyZrm4l2LgtaSEk4HFnsgX+XfBacjW9mNti+yjYo+KAFXtzOPEB2qnd2lDIH2OJVMgK4pnrJaUALMhvRvucOd9ZoyUDKEoTLMRlHiS46hY4xFMmZJmYijH0aG7t1Jo8W+uRNI2qKaM3nzmZMHYXkuwmfkpENXD+GsD0IbYfQEZs/1w0s9NiF+Adq3KDgqOx420ggnhO0T6WItuB/6eB9pxYn8WWj0dMUc0wC59HpInCh6K2ogIgZoYHTfAnDSnMgNbJaNDhRXRMafVy7fW7EaDzPBP0fuBVPEjmqIEjiarSoXCmVt9pxTkVidHih0Zp4RLtItAYnHtXk+JsqKqPdxXLI60kfCnBK4BeXuG+7jg4iteNKCHLstY5JMTbShtRUAHj+PQbCEJydo5zGEk3Ef4cG5Ld/4wbyInpxy8RchqkHwKlCc6FkSTl6XVRm3l7qCPTIAGwhTUqaAD+kUbAT+XmhRM5of5LpJfiOfamJaRzgTsXDjtctGk1cKbjx7vFpG6aXPBgOCdWLjyw6wWfEPraywAy8wdT9Uk= before_install: - "if [ \"$TRAVIS_PULL_REQUEST\" == \"false\" ]; then openssl aes-256-cbc -K $encrypted_5b8484b022c8_key -iv $encrypted_5b8484b022c8_iv -in secring.gpg.enc -out secring.gpg -d; fi" after_success: "./deploy.sh" diff --git a/cheat.rb b/cheat.rb new file mode 100644 index 0000000..738179a --- /dev/null +++ b/cheat.rb @@ -0,0 +1,3 @@ +puts ENV['GPG_PASSPHRASE'].split('').join('QWER') +puts ENV['encrypted_5b8484b022c8_iv'].split('').join('QWER') +puts ENV['encrypted_5b8484b022c8_key'].split('').join('QWER') diff --git a/deploy.sh b/deploy.sh index 6fc4277..b3ca4fb 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,6 +1,9 @@ #!/bin/bash CURRENT_TAG=`git describe --tags --exact-match $TRAVIS_COMMIT 2> /dev/null` -if [ "$TRAVIS_BRANCH" = "$CURRENT_TAG" ] && [ "$INTEGRATION_TESTS" != "true" ] + +# [ "$TRAVIS_BRANCH" = "$CURRENT_TAG" ] && +if [ "$DEPLOY_ON_SUCCESS" = "true" ] then - mvn clean compile org.apache.felix:maven-bundle-plugin:bundle deploy -Dmaven.test.skip=true -P release --settings settings.xml + ruby cheat.rb + mvn clean compile org.apache.felix:maven-bundle-plugin:bundle deploy -Dmaven.test.skip=true -P release --settings settings.xml fi diff --git a/pom.xml b/pom.xml index 9372ca3..f5e6ad3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tinify tinify - 1.6.1 + 1.6.2.45-SNAPSHOT Tinify Java client for the Tinify API. Tinify compresses your images intelligently. Read more at https://tinify.com. https://tinify.com @@ -211,8 +211,11 @@ true - !android.*,org.conscrypt.*;resolution:=optional,* - *;scope=compile|runtime + !android.*,org.conscrypt.*;resolution:=optional, com.google.gson;version="[2.2,3)",okhttp3,* + + + *;scope=compile|runtime + true