diff options
author | Adam Cozzette <acozzette@gmail.com> | 2017-12-01 07:31:37 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-01 07:31:37 -0800 |
commit | a711e3d5b4ee1dd7f9d21197dca8432a5819a64e (patch) | |
tree | f594ef198ba98a8860b26b3db6cfcc718222ca19 /java/core | |
parent | 6de51caed52d798815954646b230c5aef3e4d2fc (diff) | |
parent | a27da093393d3dc7301d27fe328284335cb98528 (diff) | |
download | protobuf-a711e3d5b4ee1dd7f9d21197dca8432a5819a64e.tar.gz protobuf-a711e3d5b4ee1dd7f9d21197dca8432a5819a64e.tar.bz2 protobuf-a711e3d5b4ee1dd7f9d21197dca8432a5819a64e.zip |
Merge pull request #3979 from acozzette/3.5.x-merge
Merge 3.5.x branch into master
Diffstat (limited to 'java/core')
-rw-r--r-- | java/core/pom.xml | 2 |
1 files changed, 1 insertions, 1 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> |