aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xiaofeng@google.com>2015-11-05 16:35:34 -0800
committerFeng Xiao <xiaofeng@google.com>2015-11-05 16:35:34 -0800
commit1470ced7ce6f8f5b42e0747ebbea1754db4a3310 (patch)
treeaed8a745850035647897d44cd7ed89536357d190
parent3a72a1eeafa4cd6747d0039a527caa49924aa265 (diff)
parent37b262bfb467533d10ca29b9fc55310dd15a3aea (diff)
downloadprotobuf-1470ced7ce6f8f5b42e0747ebbea1754db4a3310.tar.gz
protobuf-1470ced7ce6f8f5b42e0747ebbea1754db4a3310.tar.bz2
protobuf-1470ced7ce6f8f5b42e0747ebbea1754db4a3310.zip
Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtime
include plugin.proto and generated code in protobuf-java
-rw-r--r--java/pom.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/pom.xml b/java/pom.xml
index 8b81b645..7b99c035 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -92,6 +92,7 @@
<arg value="../src/google/protobuf/timestamp.proto" />
<arg value="../src/google/protobuf/type.proto" />
<arg value="../src/google/protobuf/wrappers.proto" />
+ <arg value="../src/google/protobuf/compiler/plugin.proto" />
</exec>
</tasks>
<sourceRoot>target/generated-sources</sourceRoot>
@@ -186,6 +187,7 @@
<include>google/protobuf/timestamp.proto</include>
<include>google/protobuf/type.proto</include>
<include>google/protobuf/wrappers.proto</include>
+ <include>google/protobuf/compiler/plugin.proto</include>
</includes>
</resource>
</resources>