Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from Proto1 to Proto2 #305

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge main to proto2 (#290)
* Copybara import of the project:

--
bbad663 by Mend Renovate <bot@renovateapp.com>:

Update all non-major dependencies

COPYBARA_INTEGRATE_REVIEW=#285 from renovate-bot:renovate/all-minor-patch bbad663
PiperOrigin-RevId: 684477251
Change-Id: If7dfb2beb25d1378618a884350ec5d8d4bd3dd46

* Copybara import of the project:

--
af7d544 by Mend Renovate <bot@renovateapp.com>:

Update all non-major dependencies

COPYBARA_INTEGRATE_REVIEW=#286 from renovate-bot:renovate/all-minor-patch af7d544
PiperOrigin-RevId: 685680510
Change-Id: I96df12dbd2fb7c6eb6cfaae3489626a14766bef9

* Upgrade GAE Java version from 2.0.30 to 2.0.31 and prepare next version 2.0.32-SNAPSHOT

PiperOrigin-RevId: 686867662
Change-Id: Id02da08eb160552da419cace43b86c3558e08b0d

* Update all non-major dependencies

---------

Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: Srinjoy Ray <srinjoyray@google.com>
Co-authored-by: GAE Java Team <gae-java-bot@google.com>
4 people authored Oct 21, 2024
commit 12682e4bb519a21dc1496e6851d1a57f5245b619
3 changes: 2 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.1
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>2.0.30</version><!-- or later-->
<version>2.0.31</version><!-- or later-->
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -89,7 +89,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>2.0.30</version><!-- or later-->
<version>2.0.31</version><!-- or later-->
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -188,7 +188,7 @@ Source code for remote APIs for App Engine.
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-remote-api</artifactId>
<version>2.0.30</version><!-- Or later-->
<version>2.0.31</version><!-- Or later-->
</dependency>
```

@@ -211,7 +211,7 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-legacy.jar/artifactId>
<version>2.0.30</version><!-- Or later-->
<version>2.0.31</version><!-- Or later-->
</dependency>
```

@@ -226,19 +226,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>2.0.30</version><!-- Or later-->
<version>2.0.31</version><!-- Or later-->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>2.0.30</version><!-- Or later-->
<version>2.0.31</version><!-- Or later-->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>2.0.30</version><!-- Or later-->
<version>2.0.31</version><!-- Or later-->
<scope>test</scope>
</dependency>
```
4 changes: 2 additions & 2 deletions TRYLATESTBITSINPROD.md
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ top of your web application and change the entrypoint to boot with these jars in
./mvnw clean install
```

Let's assume the current build version is `2.0.31-SNAPSHOT`.
Let's assume the current build version is `2.0.32-SNAPSHOT`.

See the output of the runtime deployment module which contains all the jars needed by the runtime:

@@ -66,7 +66,7 @@ Add the dependency for the GAE runtime jars in your application pom.xml file:

```
<properties>
<appengine.runtime.version>2.0.31-SNAPSHOT</appengine.runtime.version>
<appengine.runtime.version>2.0.32-SNAPSHOT</appengine.runtime.version>
<appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
<properties>
...
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
2 changes: 1 addition & 1 deletion api_dev/pom.xml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion api_legacy/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion appengine-api-1.0-sdk/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>AppEngine :: appengine-api-1.0-sdk</name>
2 changes: 1 addition & 1 deletion appengine-api-stubs/pom.xml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion appengine_init/pom.xml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion appengine_jsr107/pom.xml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<dependencies>
2 changes: 1 addition & 1 deletion appengine_resources/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>AppEngine :: appengine-resources</name>
2 changes: 1 addition & 1 deletion appengine_setup/apiserver_local/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>appengine_setup</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion appengine_setup/pom.xml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<modules>
<module>apiserver_local</module>
2 changes: 1 addition & 1 deletion appengine_setup/test/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>appengine_setup</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine</groupId>
Original file line number Diff line number Diff line change
@@ -26,6 +26,6 @@ protected String appName() {
@Override
protected String relativePathForUserApplicationJar() {
return "../testapps/jetty12_testapp/target/"
+ "jetty12_testapp-2.0.31-SNAPSHOT-jar-with-dependencies.jar";
+ "jetty12_testapp-2.0.32-SNAPSHOT-jar-with-dependencies.jar";
}
}
Original file line number Diff line number Diff line change
@@ -25,6 +25,6 @@ protected String appName() {

@Override
protected String relativePathForUserApplicationJar() {
return "../testapps/springboot_testapp/target/" + "springboot_testapp-2.0.31-SNAPSHOT.jar";
return "../testapps/springboot_testapp/target/" + "springboot_testapp-2.0.32-SNAPSHOT.jar";
}
}
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ public static HttpClient initializeHttpClient(int timeoutMillis) {
@SneakyThrows
public static Process initializeHttpApiServer() {
String apiServerRelativeJarPath =
"../apiserver_local/target/" + "apiserver_local-2.0.31-SNAPSHOT-jar-with-dependencies.jar";
"../apiserver_local/target/" + "apiserver_local-2.0.32-SNAPSHOT-jar-with-dependencies.jar";
File currentDirectory = new File("").getAbsoluteFile();
File apiServerJar = new File(currentDirectory, apiServerRelativeJarPath);
ImmutableList<String> processArgs = ImmutableList.<String>builder()
6 changes: 3 additions & 3 deletions appengine_setup/testapps/jetty12_testapp/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>testapps</artifactId>
<groupId>com.google.appengine</groupId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine.setup.testapps</groupId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>com.google.appengine.setup.testapps</groupId>
<artifactId>testapps_common</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -106,7 +106,7 @@
<projectId>srirammahavadi-dev</projectId>
<version>GCLOUD_CONFIG</version>
<automaticRestart>true</automaticRestart>
<artifact>${project.build.directory}/jetty11_testapp-2.0.31-SNAPSHOT-jar-with-dependencies.jar</artifact>
<artifact>${project.build.directory}/jetty11_testapp-2.0.32-SNAPSHOT-jar-with-dependencies.jar</artifact>
</configuration>
</plugin>

2 changes: 1 addition & 1 deletion appengine_setup/testapps/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>appengine_setup</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine</groupId>
6 changes: 3 additions & 3 deletions appengine_setup/testapps/springboot_testapp/pom.xml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
</parent>
<groupId>com.google.appengine.setup.testapps</groupId>
<artifactId>springboot_testapp</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
<name>springboot_testapp</name>
<description>Demo project for Spring Boot</description>
<properties>
@@ -44,12 +44,12 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.appengine.setup.testapps</groupId>
<artifactId>testapps_common</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
2 changes: 1 addition & 1 deletion appengine_setup/testapps/testapps_common/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>testapps</artifactId>
<groupId>com.google.appengine</groupId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine.setup.testapps</groupId>
2 changes: 1 addition & 1 deletion appengine_testing/pom.xml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion appengine_testing_tests/pom.xml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion applications/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<properties>
12 changes: 6 additions & 6 deletions applications/proberapp/pom.xml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<properties>
@@ -58,7 +58,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
<version>6.77.0</version>
<version>6.79.0</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
@@ -86,7 +86,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>2.43.0</version>
<version>2.43.1</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
@@ -96,17 +96,17 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>2.22.0</version>
<version>2.23.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging</artifactId>
<version>3.20.3</version>
<version>3.20.4</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.43.1</version>
<version>2.43.2</version>
</dependency>
<dependency>
<groupId>com.google.cloud.sql</groupId>
2 changes: 1 addition & 1 deletion applications/springboot/pom.xml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

2 changes: 1 addition & 1 deletion e2etests/devappservertests/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>e2etests</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion e2etests/pom.xml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<name>AppEngine :: e2e tests</name>
<packaging>pom</packaging>
2 changes: 1 addition & 1 deletion e2etests/stagingtests/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>e2etests</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/allinone/pom.xml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.31-SNAPSHOT</version>
<version>2.0.32-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Loading