summaryrefslogtreecommitdiffstats
path: root/java/pom.xml
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2015-01-22 00:13:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-22 00:13:03 +0000
commit0fba86c685b6fd8b82055541012c1ab1efc370cd (patch)
tree204041a6b0ac0941d14faa2afe222d1b4b627db9 /java/pom.xml
parent2429788d4e969267e28ba708130e1f6f0d737a48 (diff)
parente6ae5ecfc360e1ad261b561c8e5e16b6554d5347 (diff)
downloadexternal_protobuf-0fba86c685b6fd8b82055541012c1ab1efc370cd.zip
external_protobuf-0fba86c685b6fd8b82055541012c1ab1efc370cd.tar.gz
external_protobuf-0fba86c685b6fd8b82055541012c1ab1efc370cd.tar.bz2
am e6ae5ecf: Merge "Upgrade protobuf library to v2.6.1."
* commit 'e6ae5ecfc360e1ad261b561c8e5e16b6554d5347': Upgrade protobuf library to v2.6.1.
Diffstat (limited to 'java/pom.xml')
-rw-r--r--java/pom.xml14
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>