From 65625b307d4312d99c1a61732a0cdad570b97df6 Mon Sep 17 00:00:00 2001 From: smyrick Date: Wed, 18 Sep 2019 13:09:39 -0700 Subject: [PATCH 1/2] Fix travis script to update versions Also update to the correct versions that was not done here https://github.com/ExpediaGroup/graphql-kotlin/pull/350 --- .travis/update-version.sh | 4 ++-- examples/federation/base-app/pom.xml | 2 +- examples/federation/extend-app/pom.xml | 2 +- examples/federation/pom.xml | 6 ++---- examples/pom.xml | 6 ++---- examples/spring/pom.xml | 2 +- graphql-kotlin-federation/pom.xml | 2 +- graphql-kotlin-schema-generator/pom.xml | 2 +- graphql-kotlin-spring-server/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.travis/update-version.sh b/.travis/update-version.sh index bf3211137..7f8e006e7 100755 --- a/.travis/update-version.sh +++ b/.travis/update-version.sh @@ -13,7 +13,7 @@ update_version() { mvn --settings .travis/settings.xml org.codehaus.mojo:versions-maven-plugin:2.7:set -DnewVersion="${TRAVIS_TAG}-SNAPSHOT" # Increment the patch version - mvn --settings .travis/settings.xml release:update-versions -B + mvn --settings .travis/settings.xml release:update-versions -B -PdefaultBuild # Pull the new value from the pom NEW_VERSION=$(mvn --settings .travis/settings.xml help:evaluate -Dexpression=project.version -q -DforceStdout) @@ -26,7 +26,7 @@ commit_files() { git checkout -b ${NEW_VERSION} # Stage the modified files - git add ./pom.xml ./*/pom.xml + git add ./pom.xml ./**/*/pom.xml # Print the current files we are going to commit git status diff --git a/examples/federation/base-app/pom.xml b/examples/federation/base-app/pom.xml index b903392ab..71a5526c8 100644 --- a/examples/federation/base-app/pom.xml +++ b/examples/federation/base-app/pom.xml @@ -4,7 +4,7 @@ com.expediagroup graphql-kotlin - 1.0.0-RC7-SNAPSHOT + 1.0.0-RC8-SNAPSHOT ../../.. diff --git a/examples/federation/extend-app/pom.xml b/examples/federation/extend-app/pom.xml index 535ec47ae..6bfd37b84 100644 --- a/examples/federation/extend-app/pom.xml +++ b/examples/federation/extend-app/pom.xml @@ -4,7 +4,7 @@ com.expediagroup graphql-kotlin - 1.0.0-RC7-SNAPSHOT + 1.0.0-RC8-SNAPSHOT ../../.. diff --git a/examples/federation/pom.xml b/examples/federation/pom.xml index 68aeeb129..a4f23e47a 100644 --- a/examples/federation/pom.xml +++ b/examples/federation/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 graphql-kotlin com.expediagroup - 1.0.0-RC7-SNAPSHOT + 1.0.0-RC8-SNAPSHOT ../.. diff --git a/examples/pom.xml b/examples/pom.xml index 0f5756bf6..60998cf60 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 graphql-kotlin com.expediagroup - 1.0.0-RC7-SNAPSHOT + 1.0.0-RC8-SNAPSHOT .. diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml index 6911959e6..8da010d8f 100644 --- a/examples/spring/pom.xml +++ b/examples/spring/pom.xml @@ -4,7 +4,7 @@ com.expediagroup graphql-kotlin - 1.0.0-RC7-SNAPSHOT + 1.0.0-RC8-SNAPSHOT ../.. diff --git a/graphql-kotlin-federation/pom.xml b/graphql-kotlin-federation/pom.xml index 89ab31867..a83d2697a 100644 --- a/graphql-kotlin-federation/pom.xml +++ b/graphql-kotlin-federation/pom.xml @@ -5,7 +5,7 @@ com.expediagroup graphql-kotlin - 1.0.0-RC7-SNAPSHOT + 1.0.0-RC8-SNAPSHOT .. diff --git a/graphql-kotlin-schema-generator/pom.xml b/graphql-kotlin-schema-generator/pom.xml index 79c81fc19..dbcdf32f9 100644 --- a/graphql-kotlin-schema-generator/pom.xml +++ b/graphql-kotlin-schema-generator/pom.xml @@ -5,7 +5,7 @@ com.expediagroup graphql-kotlin - 1.0.0-RC7-SNAPSHOT + 1.0.0-RC8-SNAPSHOT .. diff --git a/graphql-kotlin-spring-server/pom.xml b/graphql-kotlin-spring-server/pom.xml index faba77c22..11888ab30 100644 --- a/graphql-kotlin-spring-server/pom.xml +++ b/graphql-kotlin-spring-server/pom.xml @@ -4,7 +4,7 @@ com.expediagroup graphql-kotlin - 1.0.0-RC7-SNAPSHOT + 1.0.0-RC8-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 596c2e531..8ce5af772 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.expediagroup graphql-kotlin - 1.0.0-RC7-SNAPSHOT + 1.0.0-RC8-SNAPSHOT graphql-kotlin Code-only GraphQL schema generation for Kotlin https://github.com/ExpediaGroup/graphql-kotlin From a59c8d551928ca35cee8b46b8d966693189762ae Mon Sep 17 00:00:00 2001 From: smyrick Date: Wed, 18 Sep 2019 13:14:33 -0700 Subject: [PATCH 2/2] Update profile for versions-maven-plugin --- .travis/update-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/update-version.sh b/.travis/update-version.sh index 7f8e006e7..ee135a933 100755 --- a/.travis/update-version.sh +++ b/.travis/update-version.sh @@ -10,7 +10,7 @@ update_version() { echo "Updating the version in the POMs" # Push the tag with `-SNAPSHOT` as the current version - mvn --settings .travis/settings.xml org.codehaus.mojo:versions-maven-plugin:2.7:set -DnewVersion="${TRAVIS_TAG}-SNAPSHOT" + mvn --settings .travis/settings.xml org.codehaus.mojo:versions-maven-plugin:2.7:set -PdefaultBuild -DnewVersion="${TRAVIS_TAG}-SNAPSHOT" # Increment the patch version mvn --settings .travis/settings.xml release:update-versions -B -PdefaultBuild