Commit c28192e1 authored by Jisi Liu's avatar Jisi Liu Committed by GitHub

Merge pull request #1873 from pherl/javalite

Fix Javalite Pom
parents 1f71f8bb ae895a57
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
<echo message="Running protoc ..."/> <echo message="Running protoc ..."/>
<mkdir dir="${generated.sources.lite.dir}"/> <mkdir dir="${generated.sources.lite.dir}"/>
<exec executable="${protoc}"> <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="--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/any.proto"/>
<arg value="${protobuf.source.dir}/google/protobuf/api.proto"/> <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
<arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/> <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.0.0-beta-3</version> <version>3.0.0</version>
</parent> </parent>
<artifactId>protobuf-lite</artifactId> <artifactId>protobuf-lite</artifactId>
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<properties> <properties>
<core.root>../core</core.root> <core.root>../core</core.root>
<test.proto.dir>${core.root}/src/test/proto</test.proto.dir> <test.proto.dir>${core.root}/src/test/proto</test.proto.dir>
<protoc-gen-javalite>${protobuf.source.dir}/protoc-gen-javalite</protoc-gen-javalite>
</properties> </properties>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.0.0-beta-3</version> <version>3.0.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name> <name>Protocol Buffers [Parent]</name>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment