You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2017/01/14 22:42:50 UTC

[4/4] calcite git commit: [CALCITE-1576] Use the protobuf-maven-plugin

[CALCITE-1576] Use the protobuf-maven-plugin

* Remove the old script to generate protobuf
* Update the rat check
* Commit the new generated files


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d06e5000
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d06e5000
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d06e5000

Branch: refs/heads/master
Commit: d06e5000eba40d7ac4b6cfad739e41a5d8f22047
Parents: b656c0c
Author: Josh Elser <el...@apache.org>
Authored: Sat Jan 14 17:40:46 2017 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sat Jan 14 17:42:04 2017 -0500

----------------------------------------------------------------------
 avatica/core/pom.xml                            |  23 +
 .../apache/calcite/avatica/proto/Common.java    | 604 +++++++++----------
 .../apache/calcite/avatica/proto/Requests.java  | 564 +++++++++--------
 .../apache/calcite/avatica/proto/Responses.java | 292 +++++----
 .../core/src/main/scripts/generate-protobuf.sh  |  99 ---
 avatica/metrics-dropwizardmetrics3/pom.xml      |   9 +
 avatica/noop-driver/pom.xml                     |   9 +
 avatica/pom.xml                                 |  27 +-
 avatica/standalone-server/pom.xml               |   9 +
 9 files changed, 775 insertions(+), 861 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/core/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/core/pom.xml b/avatica/core/pom.xml
index c5f60de..7ed2816 100644
--- a/avatica/core/pom.xml
+++ b/avatica/core/pom.xml
@@ -209,6 +209,29 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.xolstice.maven.plugins</groupId>
+        <artifactId>protobuf-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>compile-protoc</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>src/main/java/org/apache/calcite/avatica/proto/*.java</exclude>
+            <exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>