diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-11-30 13:34:51 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-11-30 13:34:51 -0800 |
| commit | a27da093393d3dc7301d27fe328284335cb98528 (patch) | |
| tree | f594ef198ba98a8860b26b3db6cfcc718222ca19 /java | |
| parent | 6de51caed52d798815954646b230c5aef3e4d2fc (diff) | |
| parent | 94bb1eed17209cacfdf2571be5a1ae91b3964cff (diff) | |
Merge branch '3.5.x' into 3.5.x-merge
Diffstat (limited to 'java')
| -rw-r--r-- | java/core/pom.xml | 2 | ||||
| -rw-r--r-- | java/pom.xml | 2 | ||||
| -rw-r--r-- | java/util/pom.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/java/core/pom.xml b/java/core/pom.xml index b0925f74..95f6f7ff 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.4.1</version> + <version>3.5.0</version> </parent> <artifactId>protobuf-java</artifactId> diff --git a/java/pom.xml b/java/pom.xml index bc8e89b5..fa0d0e13 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.4.1</version> + <version>3.5.0</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> diff --git a/java/util/pom.xml b/java/util/pom.xml index 35afb844..c3f2a69a 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.4.1</version> + <version>3.5.0</version> </parent> <artifactId>protobuf-java-util</artifactId> |