From f79f9c4bbd42f88f69fc3fbf40fbc648018236ca Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Tue, 14 Nov 2017 21:01:19 +0530 Subject: [PATCH 01/19] Create .travis.yml Adding travis.yml for CI integration --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..dff5f3a5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +language: java From 876df5d485b45923d910f4ed025199ac7a5901c6 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Tue, 14 Nov 2017 21:22:10 +0530 Subject: [PATCH 02/19] Create .maven.xml For building with Maven --- .maven.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .maven.xml diff --git a/.maven.xml b/.maven.xml new file mode 100644 index 00000000..9da0d1e1 --- /dev/null +++ b/.maven.xml @@ -0,0 +1,24 @@ + + + + + ossrh + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + + + + ossrh + + true + + + ${env.GPG_EXECUTABLE} + ${env.GPG_PASSPHRASE} + + + + From f63cdd4a4c25376ec714d5980588e0dc4142ee18 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Tue, 14 Nov 2017 21:59:12 +0530 Subject: [PATCH 03/19] Update .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a5..61710804 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,5 @@ language: java + +before_install: + - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import + - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust From c27384ee9edc6d37d8746266f6c0492374880467 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Tue, 14 Nov 2017 22:05:17 +0530 Subject: [PATCH 04/19] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 61710804..f16c61c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,3 +3,6 @@ language: java before_install: - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust + +install: + mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V From 013d197028523b56d68c5c3fa553e0cdf1d266d6 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Tue, 14 Nov 2017 22:57:00 +0530 Subject: [PATCH 05/19] Update pom.xml --- pom.xml | 113 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 73 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 90fec7dc..fde5d35e 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,79 @@ + + + + release + + + release + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + + + @@ -106,46 +179,6 @@ - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - From c1caddae99e4cc8a17b6fbb8ffbd3e05841ff86d Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Tue, 14 Nov 2017 22:58:16 +0530 Subject: [PATCH 06/19] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f16c61c3..96c0a97c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,6 @@ before_install: install: mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V + +script: + mvn clean deploy --settings .maven.xml -DskipTests=true -B -U -Prelease From 77b548b10df6f79756671d06029f86bf439324a7 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Tue, 14 Nov 2017 23:06:39 +0530 Subject: [PATCH 07/19] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fde5d35e..b8689359 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ in.zapr.druid druidry - 1.3-SNAPSHOT + 1.3 Druidry - Druid Query Generator Druidry is an open-source Java based utility library which supports creating From 4c12332f988091a1192c0764438660f6ff144ae8 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Tue, 14 Nov 2017 23:10:41 +0530 Subject: [PATCH 08/19] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b8689359..1be9b976 100644 --- a/pom.xml +++ b/pom.xml @@ -214,11 +214,11 @@ - ossrh + release https://oss.sonatype.org/content/repositories/snapshots - ossrh + release https://oss.sonatype.org/service/local/staging/deploy/maven2/ From f024bddd80255f6f7f2788f584b05be743dc6546 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Tue, 14 Nov 2017 23:45:11 +0530 Subject: [PATCH 09/19] Update pom.xml --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 1be9b976..ca2e2716 100644 --- a/pom.xml +++ b/pom.xml @@ -96,9 +96,9 @@ 1.6.8 true - ossrh - https://oss.sonatype.org/ - true + ossrh + https://oss.sonatype.org/ + true @@ -214,11 +214,11 @@ - release + ossrh https://oss.sonatype.org/content/repositories/snapshots - release + ossrh https://oss.sonatype.org/service/local/staging/deploy/maven2/ From 562d172b7f4be3ad9b03c9af806c4e223167381e Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Wed, 15 Nov 2017 02:47:18 +0530 Subject: [PATCH 10/19] Update .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 96c0a97c..67fcf21d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,3 +9,7 @@ install: script: mvn clean deploy --settings .maven.xml -DskipTests=true -B -U -Prelease + +before_deploy: + - mvn help:evaluate -N -Dexpression=project.version|grep -v '\[' + - export project_version=$(mvn help:evaluate -N -Dexpression=project.version|grep -v '\[') From e7f9cd89aa7e24fc8fd7328019cdfd9ce1599a34 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Wed, 15 Nov 2017 11:18:46 +0530 Subject: [PATCH 11/19] Update .travis.yml --- .travis.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 67fcf21d..e9189a93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,17 @@ install: mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V script: - mvn clean deploy --settings .maven.xml -DskipTests=true -B -U -Prelease + mvn clean deploy --setting .maven.xml -DskipTests=true -B -U -Prelease before_deploy: - mvn help:evaluate -N -Dexpression=project.version|grep -v '\[' - export project_version=$(mvn help:evaluate -N -Dexpression=project.version|grep -v '\[') + +deploy: + provider: releases + api_key: + secure: GITHUB_DEPLOYMENT_KEY + branch: master + skip_cleanup: true + on: + repo: zapr-oss/druidry From adc738e8a1fae2c24c623761ea8421973ca2ce2c Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Wed, 15 Nov 2017 11:21:07 +0530 Subject: [PATCH 12/19] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e9189a93..8e638041 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ install: mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V script: - mvn clean deploy --setting .maven.xml -DskipTests=true -B -U -Prelease + mvn clean deploy --settings .maven.xml -DskipTests=true -B -U -Prelease before_deploy: - mvn help:evaluate -N -Dexpression=project.version|grep -v '\[' From 69ad78031326ac33eb2da9819154944ff6c5c366 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Wed, 15 Nov 2017 11:30:34 +0530 Subject: [PATCH 13/19] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8e638041..aa6c2109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,3 +22,4 @@ deploy: skip_cleanup: true on: repo: zapr-oss/druidry + branch: master From 1e3b6e3f7bc7112c0c7c8fae6d381296c9fcaa2d Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Sat, 2 Dec 2017 10:40:46 +0530 Subject: [PATCH 14/19] Version bumped to 1.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca2e2716..4321e91b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ in.zapr.druid druidry - 1.3 + 1.4 Druidry - Druid Query Generator Druidry is an open-source Java based utility library which supports creating From 5ae42cb5acbcf5ddcb03c5a7a46e96ee0aef1c6d Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Sat, 2 Dec 2017 11:58:03 +0530 Subject: [PATCH 15/19] Maven deploy only when deploying --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa6c2109..678767cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: java +cache: + directories: + - $HOME/.m2 + before_install: - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust @@ -7,19 +11,16 @@ before_install: install: mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V -script: - mvn clean deploy --settings .maven.xml -DskipTests=true -B -U -Prelease +#script: +# mvn clean deploy --settings .maven.xml -DskipTests=true -B -U -Prelease before_deploy: - mvn help:evaluate -N -Dexpression=project.version|grep -v '\[' - export project_version=$(mvn help:evaluate -N -Dexpression=project.version|grep -v '\[') deploy: - provider: releases - api_key: - secure: GITHUB_DEPLOYMENT_KEY - branch: master + provider: script + script: mvn clean deploy --settings .maven.xml -DskipTests=true -B -U -Prelease skip_cleanup: true on: - repo: zapr-oss/druidry branch: master From df00e841879a5497be895eb7444e120db108df7b Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Sat, 2 Dec 2017 12:51:49 +0530 Subject: [PATCH 16/19] Caching removed in Travis --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 678767cb..73984614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: java -cache: - directories: - - $HOME/.m2 +#cache: +# directories: +# - $HOME/.m2 before_install: - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import From e9e8e58070741c3bc2522ed08a01139963243698 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Mon, 11 Dec 2017 21:39:08 +0530 Subject: [PATCH 17/19] Removed Before Install --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 73984614..cc27c73d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ language: java # directories: # - $HOME/.m2 -before_install: - - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import - - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust +#before_install: +# - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import +# - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust install: mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V From 35179e1ef92409bbc3048ec00fa7142601a3f064 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Mon, 11 Dec 2017 21:43:45 +0530 Subject: [PATCH 18/19] Adding caching for Travis --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc27c73d..e5254b41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: java -#cache: -# directories: -# - $HOME/.m2 +cache: + directories: + - $HOME/.m2 #before_install: # - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import From f421081ba3d1d1fffb5ff2e943e1a91086fb1bd2 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Mon, 11 Dec 2017 21:50:06 +0530 Subject: [PATCH 19/19] adding GPG support before deployment --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e5254b41..916fe920 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ install: # mvn clean deploy --settings .maven.xml -DskipTests=true -B -U -Prelease before_deploy: + - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import + - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust - mvn help:evaluate -N -Dexpression=project.version|grep -v '\[' - export project_version=$(mvn help:evaluate -N -Dexpression=project.version|grep -v '\[')