diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-10 20:56:13 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-10 20:56:13 -0800 |
commit | 52909485d15a9ac617bc8948c02dafd1ab4233bd (patch) | |
tree | b0d60d94523b828c077bfe47f30ce0e70c01f267 /java/pom.xml | |
parent | 261fe97a63316a4a4918afcaa6c8c0f4b0da45fc (diff) | |
parent | 8d5d7cc6d03b00fcb7162525100fbd4cc0d1929d (diff) | |
download | protobuf-52909485d15a9ac617bc8948c02dafd1ab4233bd.tar.gz protobuf-52909485d15a9ac617bc8948c02dafd1ab4233bd.tar.bz2 protobuf-52909485d15a9ac617bc8948c02dafd1ab4233bd.zip |
Merge branch v3.0.0-alpha-1 into master.
Conflicts:
configure.ac
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 4ec6d776..bc339f66 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,7 +10,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>2.6.2-pre</version> + <version>3.0.0-alpha-1</version> <packaging>bundle</packaging> <name>Protocol Buffer Java API</name> <description> @@ -152,7 +152,7 @@ <instructions> <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.2-pre</Export-Package> + <Export-Package>com.google.protobuf;version=3.0.0-alpha-1</Export-Package> </instructions> </configuration> </plugin> |