diff options
| author | Jisi Liu <liujisi@google.com> | 2016-07-28 13:43:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-28 13:43:51 -0700 |
| commit | c28192e1a3c2deea8514b9252f70b48f65bace78 (patch) | |
| tree | 79e5a4d384dcf44601ef3f07d6f35f5a084011f4 | |
| parent | 1f71f8bbf86d85fd5882fbf3f326fdb2f622cc8a (diff) | |
| parent | ae895a5783b0a69cfc6bd5e4ad4d9988c4886d0b (diff) | |
| download | protobuf-javalite-c28192e1a3c2deea8514b9252f70b48f65bace78.tar.gz | |
Merge pull request #1873 from pherl/javalite
Fix Javalite Pom
| -rw-r--r-- | java/lite/generate-sources-build.xml | 3 | ||||
| -rw-r--r-- | java/lite/pom.xml | 3 | ||||
| -rw-r--r-- | java/pom.xml | 2 |
3 files changed, 5 insertions, 3 deletions
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 c403dc09..eb98ec5f 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 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> |