fixing endpoints-migration sample in java8

Frank Natividad · Frank Natividad · commit 83658a5a675f · 2017-06-14T12:29:20.000-07:00
diff --git a/appengine-java8/endpoints-v2-migration/jenkins.sh b/appengine-java8/endpoints-v2-migration/jenkins.sh
@@ -23,7 +23,7 @@ function TestEndpoints () {
   curl -X GET \
     "https://${2}-dot-${1}.appspot.com/_ah/api/helloworld/v1/hellogreeting/0" | \
     tee "$ERROR_OUTPUT_DIR/response.json" | \
-    grep "hello version-${2}"
+    grep "hello ${3} version-${2}"
 
   # Test getGreeting Endpoint (goodbye world!)
   curl -X GET \
@@ -48,30 +48,36 @@ function TestEndpoints () {
 
 # Jenkins provides values for GOOGLE_PROJECT_ID and GOOGLE_VERSION_ID
 # Update Greetings.java
-sed -i'.bak' -e "s/hello world!/hello version-${GOOGLE_VERSION_ID}!/g" src/main/java/com/example/helloendpoints/Greetings.java
+UNIQUE_MAVEN_STRING="maven"
+sed -i'.bak' \
+  -e "s/hello world!/hello ${UNIQUE_MAVEN_STRING} version-${GOOGLE_VERSION_ID}!/g" \
+  src/main/java/com/example/helloendpoints/Greetings.java
 
 # Test with Maven
 mvn clean appengine:deploy \
     -Dapp.deploy.version="${GOOGLE_VERSION_ID}" \
     -Dapp.deploy.promote=false
 
 # End-2-End tests
-TestEndpoints "${GOOGLE_PROJECT_ID}" "${GOOGLE_VERSION_ID}"
+TestEndpoints "${GOOGLE_PROJECT_ID}" "${GOOGLE_VERSION_ID}" "${UNIQUE_MAVEN_STRING}"
 
 # Clean
 mvn clean
 
 # Test with Gradle
 # Modify Greetings.java for Gradle
-sed -i'.bak' -e "s/hello version-${GOOGLE_VERSION_ID}!/hello version-${GOOGLE_VERSION_ID}!/g" src/main/java/com/example/helloendpoints/Greetings.java
+UNIQUE_GRADLE_STRING="gradle"
+sed -i'.bak' \
+  -e "s/hello ${UNIQUE_MAVEN_STRING} version-${GOOGLE_VERSION_ID}!/hello ${UNIQUE_GRADLE_STRING} version-${GOOGLE_VERSION_ID}!/g" \
+  src/main/java/com/example/helloendpoints/Greetings.java
 
 # Deploy Gradle
 gradle -Pappengine.deploy.promote=false \
   -Pappengine.deploy.version="${GOOGLE_VERSION_ID}" \
   appengineDeploy
 
 # End-2-End tests
-TestEndpoints "${GOOGLE_PROJECT_ID}" "${GOOGLE_VERSION_ID}"
+TestEndpoints "${GOOGLE_PROJECT_ID}" "${GOOGLE_VERSION_ID}" "${UNIQUE_GRADLE_STRING}"
 
 # Clean
 gradle clean
diff --git a/appengine-java8/endpoints-v2-migration/pom.xml b/appengine-java8/endpoints-v2-migration/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
       <artifactId>appengine-java8-samples</artifactId>
       <groupId>com.google.cloud</groupId>
       <version>1.0.0</version>
-      <relativePath>../..</relativePath>
+      <relativePath>..</relativePath>
   </parent>
 
   <properties>
