diff options
| author | Jisi Liu <liujisi@google.com> | 2016-09-15 14:37:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 14:37:38 -0700 |
| commit | 9c4be5f654d8e7635a00dc3d65688d3203c99bb1 (patch) | |
| tree | dbf22050be56619ea3f25d7c61f41cdd497e8db6 /java | |
| parent | b4235ac79c0d3e932f2fb24d2dc8b81fbc0de45a (diff) | |
| parent | 58860c021f0bdd0c79e612e7092c6c3d692488c0 (diff) | |
| download | protobuf-9c4be5f654d8e7635a00dc3d65688d3203c99bb1.tar.gz protobuf-9c4be5f654d8e7635a00dc3d65688d3203c99bb1.tar.bz2 protobuf-9c4be5f654d8e7635a00dc3d65688d3203c99bb1.zip | |
Merge pull request #2112 from pherl/merge
Merge 3.0.x into master
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 39d67818..28bc99a0 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.0.0</version> + <version>3.0.2</version> </parent> <artifactId>protobuf-java</artifactId> diff --git a/java/pom.xml b/java/pom.xml index 3a91a0ba..ccfb229e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.0.0</version> + <version>3.0.2</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> diff --git a/java/util/pom.xml b/java/util/pom.xml index 0d5e8e37..58cc4b30 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.0.0</version> + <version>3.0.2</version> </parent> <artifactId>protobuf-java-util</artifactId> |