diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-20 13:02:58 -0800 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-01-20 13:12:29 -0800 |
| commit | afb4b72037e3f13db208590fc782c4bc8e27f862 (patch) | |
| tree | 204041a6b0ac0941d14faa2afe222d1b4b627db9 /java/pom.xml | |
| parent | 80aff29bb2d37977a02c0a677721522d3467a4d9 (diff) | |
| download | external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.zip external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.tar.gz external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.tar.bz2 | |
Upgrade protobuf library to v2.6.1.
The previous commit was actually between v2.6.0 and v2.6.1. This CL
was created by generating a patch with:
git format-patch edc5994525c79cd1919859a370837a6ff7c8e308..v2.6.1
and applying this patch to the tree. The patch was clean except for
pom.xml, where the packaging type should have previously been changed
from "jar" to "bundle".
Reran ./configure && make -j12 check to regenerate configure script
and makefiles.
Change-Id: I817ff426c9a512cbda0246df5aee38f97e762dea
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/pom.xml b/java/pom.xml index b7b690f..f73e874 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,15 +10,15 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>2.6.0</version> - <packaging>jar</packaging> + <version>2.6.1</version> + <packaging>bundle</packaging> <name>Protocol Buffer Java API</name> <description> Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. </description> <inceptionYear>2008</inceptionYear> - <url>http://code.google.com/p/protobuf</url> + <url>https://developers.google.com/protocol-buffers/</url> <licenses> <license> <name>New BSD license</name> @@ -27,9 +27,9 @@ </license> </licenses> <scm> - <url>http://code.google.com/p/protobuf/source/browse</url> + <url>https://github.com/google/protobuf</url> <connection> - scm:svn:http://protobuf.googlecode.com/svn/trunk/ + scm:git:https://github.com/google/protobuf.git </connection> </scm> <dependencies> @@ -246,9 +246,9 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-DocURL>http://code.google.com/p/protobuf</Bundle-DocURL> + <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL> <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName> - <Export-Package>com.google.protobuf;version=2.6.0</Export-Package> + <Export-Package>com.google.protobuf;version=2.6.1</Export-Package> </instructions> </configuration> </plugin> |