You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2015/04/03 15:02:37 UTC
[04/10] incubator-calcite git commit: [CALCITE-658] Cleanup
dependency usage (Nick Dimiduk)
[CALCITE-658] Cleanup dependency usage (Nick Dimiduk)
Close apache/incubator-calcite#70
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/ba07b09a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/ba07b09a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/ba07b09a
Branch: refs/heads/master
Commit: ba07b09aae2c5e09acfeb3ad77a4a6e4ddfb3ac4
Parents: fa9bdc4
Author: Nick Dimiduk <nd...@gmail.com>
Authored: Tue Mar 31 17:25:53 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Apr 3 01:09:49 2015 -0700
----------------------------------------------------------------------
avatica-server/pom.xml | 23 +++++++++++++++++++++++
core/pom.xml | 41 +++++++++++++++++++++++++++++++++++++++++
example/csv/pom.xml | 16 ++++++++++++----
linq4j/pom.xml | 5 +++++
mongodb/pom.xml | 13 +++++++++----
plus/pom.xml | 9 +++++----
pom.xml | 22 ++++++++++++++++++++++
spark/pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++----
splunk/pom.xml | 9 +++++++++
ubenchmark/pom.xml | 26 ++++++++++++++++++++++----
10 files changed, 188 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/avatica-server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica-server/pom.xml b/avatica-server/pom.xml
index 2da32ec..f45366e 100644
--- a/avatica-server/pom.xml
+++ b/avatica-server/pom.xml
@@ -120,6 +120,29 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <!-- configurations do not cascade, so all of the definition from
+ ../pom.xml:build:plugin-management:plugins:plugin must be repeated in child poms -->
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ <!-- ignore "unused but declared" warnings -->
+ <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependency>net.hydromatic:scott-data-hsqldb</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>org.hsqldb:hsqldb</ignoredUnusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 5533984..9edb0dc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -57,6 +57,14 @@ limitations under the License.
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
@@ -64,6 +72,10 @@ limitations under the License.
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -116,6 +128,11 @@ limitations under the License.
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.pentaho</groupId>
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
</dependency>
@@ -200,6 +217,30 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <!-- configurations do not cascade, so all of the definition from
+ ../pom.xml:build:plugin-management:plugins:plugin must be repeated in child poms -->
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ <!-- ignore "unused but declared" warnings -->
+ <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependency>net.hydromatic:scott-data-hsqldb</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>net.hydromatic:foodmart-data-hsqldb</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>mysql:mysql-connector-java</ignoredUnusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index ed6a457..fa2995e 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -37,10 +37,6 @@ limitations under the License.
<dependencies>
<dependency>
<groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</dependency>
<dependency>
@@ -49,6 +45,18 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/linq4j/pom.xml
----------------------------------------------------------------------
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 528df06..67e7592 100644
--- a/linq4j/pom.xml
+++ b/linq4j/pom.xml
@@ -40,6 +40,11 @@ limitations under the License.
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 58ee276..bbed40d 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -38,10 +38,6 @@ limitations under the License.
in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<type>jar</type>
</dependency>
@@ -57,11 +53,20 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/plus/pom.xml
----------------------------------------------------------------------
diff --git a/plus/pom.xml b/plus/pom.xml
index f951be2..d5b4510 100644
--- a/plus/pom.xml
+++ b/plus/pom.xml
@@ -38,10 +38,6 @@ limitations under the License.
in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<type>jar</type>
</dependency>
@@ -77,6 +73,11 @@ limitations under the License.
<artifactId>tpcds</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cb7217e..be63e3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,6 +217,11 @@ limitations under the License.
<version>3.2</version>
</dependency>
<dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.10.3</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>2.7.6</version>
@@ -335,6 +340,23 @@ limitations under the License.
</executions>
</plugin>
<plugin>
+ <!-- override default version 2.8 for access to additional config settings -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<!-- Override apache parent POM's definition of release
plugin. If we don't specify gitexe version, git doesn't
commit during release process. -->
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index 88370ff..985f465 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -37,10 +37,6 @@ limitations under the License.
in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</dependency>
<dependency>
@@ -55,10 +51,27 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId>
<version>0.9.0-incubating</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
<!-- Use explicit xerces and xalan. Without them, Hadoop gives
"Failed to set setXIncludeAware(true)" error. -->
<dependency>
@@ -126,6 +139,29 @@ limitations under the License.
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <!-- configurations do not cascade, so all of the definition from
+ ../pom.xml:build:plugin-management:plugins:plugin must be repeated in child poms -->
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ <!-- ignore "unused but declared" warnings -->
+ <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependency>xerces:xercesImpl</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>xalan:xalan</ignoredUnusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index 5f6a805..4f331ca 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -56,6 +56,10 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -64,6 +68,11 @@ limitations under the License.
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ba07b09a/ubenchmark/pom.xml
----------------------------------------------------------------------
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index 3994425..fcd4deb 100644
--- a/ubenchmark/pom.xml
+++ b/ubenchmark/pom.xml
@@ -45,10 +45,6 @@ limitations under the License.
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-linq4j</artifactId>
- </dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
@@ -107,6 +103,28 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <!-- configurations do not cascade, so all of the definition from
+ ../pom.xml:build:plugin-management:plugins:plugin must be repeated in child poms -->
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ <!-- ignore "unused but declared" warnings -->
+ <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependency>org.openjdk.jmh:jmh-generator-annprocess</ignoredUnusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>