Skip to content

Commit be9fa47

Browse files
author
Frank Natividad
committed
Merge branch 'master' into discovery-endpoints-migration
2 parents a74aa1f + 9cebf6c commit be9fa47

File tree

88 files changed

+773
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+773
-260
lines changed

‎appengine/analytics/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>org.apache.httpcomponents</groupId>
4343
<artifactId>httpclient</artifactId>
44-
<version>4.5.2</version>
44+
<version>4.5.3</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>javax.servlet</groupId>

‎appengine/appidentity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<dependency>
9090
<groupId>com.google.truth</groupId>
9191
<artifactId>truth</artifactId>
92-
<version>0.31</version>
92+
<version>0.32</version>
9393
<scope>test</scope>
9494
</dependency>
9595
</dependencies>

‎appengine/channel/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<relativePath>..</relativePath>
2727
</parent>
2828
<properties>
29-
<objectify.version>5.1.14</objectify.version>
29+
<objectify.version>5.1.15</objectify.version>
3030
</properties>
3131
<!-- [START set_versions] -->
3232
<prerequisites>
@@ -91,7 +91,7 @@
9191
<dependency>
9292
<groupId>com.google.truth</groupId>
9393
<artifactId>truth</artifactId>
94-
<version>0.31</version>
94+
<version>0.32</version>
9595
<scope>test</scope>
9696
</dependency>
9797
</dependencies>

‎appengine/datastore/indexes-exploding/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>com.google.truth</groupId>
7676
<artifactId>truth</artifactId>
77-
<version>0.31</version>
77+
<version>0.32</version>
7878
<scope>test</scope>
7979
</dependency>
8080
</dependencies>

‎appengine/datastore/indexes-perfect/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>com.google.truth</groupId>
7676
<artifactId>truth</artifactId>
77-
<version>0.31</version>
77+
<version>0.32</version>
7878
<scope>test</scope>
7979
</dependency>
8080
</dependencies>

‎appengine/datastore/indexes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>com.google.truth</groupId>
7676
<artifactId>truth</artifactId>
77-
<version>0.31</version>
77+
<version>0.32</version>
7878
<scope>test</scope>
7979
</dependency>
8080
</dependencies>

‎appengine/datastore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>com.google.truth</groupId>
101101
<artifactId>truth</artifactId>
102-
<version>0.31</version>
102+
<version>0.32</version>
103103
<scope>test</scope>
104104
</dependency>
105105
</dependencies>

‎appengine/endpoints-frameworks-v2/backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333

34-
<endpoints.framework.version>2.0.3</endpoints.framework.version>
34+
<endpoints.framework.version>2.0.4</endpoints.framework.version>
3535
<endpoints.management.version>1.0.2</endpoints.management.version>
3636

3737
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>

‎appengine/endpoints-frameworks-v2/migration-example/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,13 @@ dependencies {
4848
}
4949

5050
appengine { // App Engine tasks configuration
51-
run { // local (dev_appserver) configuration (standard environments only)
52-
53-
}
54-
5551
deploy { // deploy configuration
52+
version = findProperty("appengine.deploy.version")
5653

54+
def promoteProp = findProperty("appengine.deploy.promote")
55+
if (promoteProp != null) {
56+
promote = new Boolean(promoteProp)
57+
}
5758
}
5859
}
5960

‎appengine/endpoints-frameworks-v2/migration-example/jenkins.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Copyright 2017 Google Inc.
44
#
@@ -48,7 +48,8 @@ sed -i'.bak' -e "s/hello world!/hello version-${GOOGLE_VERSION_ID}!/g" src/main/
4848

4949
# Test with Maven
5050
mvn clean appengine:deploy \
51-
-Dapp.deploy.version="${GOOGLE_VERSION_ID}"
51+
-Dapp.deploy.version="${GOOGLE_VERSION_ID}" \
52+
-Dapp.deploy.promote=false
5253

5354
# End-2-End tests
5455
TestEndpoints "${GOOGLE_PROJECT_ID}" "${GOOGLE_VERSION_ID}"
@@ -57,17 +58,16 @@ TestEndpoints "${GOOGLE_PROJECT_ID}" "${GOOGLE_VERSION_ID}"
5758
mvn clean
5859

5960
# Test with Gradle
60-
# Update build.gradle
61-
sed -i'.bak' -e "s/deploy {/deploy {\n version='${GOOGLE_VERSION_ID}'/g" build.gradle
62-
6361
# Modify Greetings.java for Gradle
64-
sed -i'.bak' -e "s/hello version-${GOOGLE_VERSION_ID}!/hello version-gradle-${GOOGLE_VERSION_ID}!/g" src/main/java/com/example/helloendpoints/Greetings.java
62+
sed -i'.bak' -e "s/hello version-${GOOGLE_VERSION_ID}!/hello version-${GOOGLE_VERSION_ID}!/g" src/main/java/com/example/helloendpoints/Greetings.java
6563

6664
# Deploy Gradle
67-
gradle appengineDeploy
65+
gradle -Pappengine.deploy.promote=false \
66+
-Pappengine.deploy.version="${GOOGLE_VERSION_ID}" \
67+
appengineDeploy
6868

6969
# End-2-End tests
70-
TestEndpoints "${GOOGLE_PROJECT_ID}" "gradle-${GOOGLE_VERSION_ID}"
70+
TestEndpoints "${GOOGLE_PROJECT_ID}" "${GOOGLE_VERSION_ID}"
7171

7272
# Clean
7373
gradle clean

0 commit comments

Comments
 (0)