diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-08-01 14:56:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 14:56:08 -0700 |
| commit | 21fc01b63c7f60bae4e230c817a82bd8571a4a70 (patch) | |
| tree | 20730e597f914fd2430c66b9bebe633e017a4fe0 /java/pom.xml | |
| parent | 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff) | |
| parent | 94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (diff) | |
| download | protobuf-21fc01b63c7f60bae4e230c817a82bd8571a4a70.tar.gz protobuf-21fc01b63c7f60bae4e230c817a82bd8571a4a70.tar.bz2 protobuf-21fc01b63c7f60bae4e230c817a82bd8571a4a70.zip | |
Merge pull request #4991 from acozzette/merge-3-6-x
Merge 3.6.x branch into master
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/pom.xml b/java/pom.xml index 35d653b4..6526b650 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.6.0</version> + <version>3.6.1</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> @@ -92,7 +92,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.0</version> + <version>3.6.1</version> <configuration> <source>1.7</source> <target>1.7</target> |