From 8afbb84c488ae28ae2714dbaa83abdc059bb0ee9 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Thu, 28 Jul 2016 13:21:41 -0700
Subject: update javalite versions.

---
 java/lite/pom.xml | 2 +-
 java/pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index c403dc09..9862cd94 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>
diff --git a/java/pom.xml b/java/pom.xml
index 7a1a91f8..4ef1b0d5 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>
-- 
cgit v1.2.3


From ae895a5783b0a69cfc6bd5e4ad4d9988c4886d0b Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Thu, 28 Jul 2016 13:30:58 -0700
Subject: Update maven to call the plugin to generate javalite code.

---
 java/lite/generate-sources-build.xml | 3 ++-
 java/lite/pom.xml                    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/lite/generate-sources-build.xml b/java/lite/generate-sources-build.xml
index 89c21c13..83e79e7b 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 9862cd94..eb98ec5f 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -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>
-- 
cgit v1.2.3