diff options
| author |  Adam Cozzette <acozzette@google.com> | 2018-06-25 13:22:10 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-06-25 13:22:10 -0700 |
| commit | 82d3d7d250645322f8a7343188e5ae6246a76414 (patch) | |
| tree | 34b7acb87b15c3b8395df3d311f2e795a1285d60 /java | |
| parent | 35567c166842cca3ff6af3226ff526f25c79507f (diff) | |
| parent | f7ada1280fac4af717d478e6a9765d3f02b418b3 (diff) | |
Merge branch '3.6.x' into merge-3-6-x
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 5b0b9520..a7d4ea37 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.5.2</version> + <version>3.6.0</version> </parent> <artifactId>protobuf-java</artifactId> diff --git a/java/pom.xml b/java/pom.xml index f2284918..35d653b4 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.5.2</version> + <version>3.6.0</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> diff --git a/java/util/pom.xml b/java/util/pom.xml index 4e55df0d..8ea4a40d 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.5.2</version> + <version>3.6.0</version> </parent> <artifactId>protobuf-java-util</artifactId> |