소스 검색

Merge pull request #1873 from pherl/javalite

Fix Javalite Pom
Jisi Liu 9 년 전
부모
커밋
c28192e1a3
3개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 1
      java/lite/generate-sources-build.xml
  2. 2 1
      java/lite/pom.xml
  3. 1 1
      java/pom.xml

+ 2 - 1
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"/>

+ 2 - 1
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>

+ 1 - 1
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>