Merge pull request #1873 from pherl/javalite
Fix Javalite Pom
diff --git a/java/lite/generate-sources-build.xml b/java/lite/generate-sources-build.xml
index 89c21c1..83e79e7 100644
--- a/java/lite/generate-sources-build.xml
+++ b/java/lite/generate-sources-build.xml
@@ -2,8 +2,9 @@
<echo message="Running protoc ..."/>
<mkdir dir="${generated.sources.lite.dir}"/>
<exec executable="${protoc}">
- <arg value="--java_out=lite:${generated.sources.lite.dir}"/>
+ <arg value="--javalite_out=${generated.sources.lite.dir}"/>
<arg value="--proto_path=${protobuf.source.dir}"/>
+ <arg value="--plugin=protoc-gen-javalite=${protoc-gen-javalite}"/>
<arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
<arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
<arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index c403dc0..eb98ec5 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.0.0-beta-3</version>
+ <version>3.0.0</version>
</parent>
<artifactId>protobuf-lite</artifactId>
@@ -33,6 +33,7 @@
<properties>
<core.root>../core</core.root>
<test.proto.dir>${core.root}/src/test/proto</test.proto.dir>
+ <protoc-gen-javalite>${protobuf.source.dir}/protoc-gen-javalite</protoc-gen-javalite>
</properties>
<build>
diff --git a/java/pom.xml b/java/pom.xml
index 7a1a91f..4ef1b0d 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-beta-3</version>
+ <version>3.0.0</version>
<packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name>
