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 2014/08/07 00:14:20 UTC
git commit: [OPTIQ-363] Use dependencyManagement and pluginManagement
in POM files
Repository: incubator-optiq
Updated Branches:
refs/heads/master c33e602fa -> 19deba212
[OPTIQ-363] Use dependencyManagement and pluginManagement in POM files
Project: http://git-wip-us.apache.org/repos/asf/incubator-optiq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-optiq/commit/19deba21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-optiq/tree/19deba21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-optiq/diff/19deba21
Branch: refs/heads/master
Commit: 19deba212732d09f4a1f6a58557cf53ac51ad57c
Parents: c33e602
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Aug 6 14:45:05 2014 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Wed Aug 6 14:45:05 2014 -0700
----------------------------------------------------------------------
avatica/pom.xml | 2 -
core/pom.xml | 9 +--
mongodb/pom.xml | 78 ++++++++++-----------
plus/pom.xml | 42 +++++------
pom.xml | 180 +++++++++++++++++++++++++++++++++++++-----------
spark/pom.xml | 74 +++++++++-----------
splunk/pom.xml | 27 ++++----
ubenchmark/pom.xml | 13 ++--
8 files changed, 250 insertions(+), 175 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/19deba21/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index e3725a7..5545954 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -38,7 +38,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
<configuration>
<excludes>
<exclude>net/hydromatic/**/AvaticaTest.java</exclude>
@@ -53,7 +52,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/19deba21/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3309690..f644e9d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,10 +35,11 @@ limitations under the License.
</properties>
<dependencies>
+ <!-- Sorted by groupId, artifactId; optiq dependencies first. Put versions
+ in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-avatica</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -47,7 +48,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
<configuration>
<includes>
<include>net/hydromatic/optiq/test/OptiqSuite.java</include>
@@ -61,7 +61,6 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>javacc</id>
@@ -82,7 +81,6 @@ limitations under the License.
<plugin>
<groupId>net.hydromatic</groupId>
<artifactId>hydromatic-resource-maven-plugin</artifactId>
- <version>0.2</version>
<executions>
<execution>
<goals>
@@ -97,7 +95,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<goals>
@@ -114,7 +111,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -129,7 +125,6 @@ limitations under the License.
<plugin>
<groupId>com.googlecode.fmpp-maven-plugin</groupId>
<artifactId>fmpp-maven-plugin</artifactId>
- <version>1.0</version>
<configuration>
<cfgFile>src/main/codegen/config.fmpp</cfgFile>
<templateDirectory>src/main/codegen/templates</templateDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/19deba21/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 7f86a91..2d6bb34 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -34,31 +34,33 @@ limitations under the License.
</properties>
<dependencies>
+ <!-- Sorted by groupId, artifactId; optiq dependencies first. Put versions
+ in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-core</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-core</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.11.1</version>
</dependency>
</dependencies>
<build>
<plugins>
+ <!-- Sorted by groupId, artifactId. Put versions in
+ pluginManagement in the root POM, not here. -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -66,41 +68,7 @@ limitations under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <includes>
- <include>net/hydromatic/optiq/test/MongoAdapterTest.java</include>
- </includes>
- <threadCount>6</threadCount>
- <parallel>both</parallel>
- <argLine>-Xmx1024m</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>javacc</id>
- <goals>
- <goal>javacc</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/CombinedParser.jj</include>
- </includes>
- <lookAhead>2</lookAhead>
- <isStatic>false</isStatic>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<goals>
@@ -112,9 +80,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.4.1</version>
</plugin>
-
<!-- Parent module has the same plugin and does the work of
generating -sources.jar for each project. But without the
plugin declared here, IDEs don't know the sources are
@@ -122,7 +88,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -134,6 +99,37 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>net/hydromatic/optiq/test/MongoAdapterTest.java</include>
+ </includes>
+ <threadCount>6</threadCount>
+ <parallel>both</parallel>
+ <argLine>-Xmx1024m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javacc</id>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/CombinedParser.jj</include>
+ </includes>
+ <lookAhead>2</lookAhead>
+ <isStatic>false</isStatic>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/19deba21/plus/pom.xml
----------------------------------------------------------------------
diff --git a/plus/pom.xml b/plus/pom.xml
index b1a8bed..11476f9 100644
--- a/plus/pom.xml
+++ b/plus/pom.xml
@@ -34,38 +34,39 @@ limitations under the License.
</properties>
<dependencies>
+ <!-- Sorted by groupId, artifactId; optiq dependencies first. Put versions
+ in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-core</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-core</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>io.airlift.tpch</groupId>
<artifactId>tpch</artifactId>
- <version>0.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.hydromatic</groupId>
<artifactId>tpcds</artifactId>
- <version>0.1</version>
<type>jar</type>
</dependency>
</dependencies>
<build>
<plugins>
+ <!-- Sorted by groupId, artifactId. Put versions in
+ pluginManagement in the root POM, not here. -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -73,22 +74,7 @@ limitations under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <includes>
- <include>net/hydromatic/optiq/test/PlusSuite.java</include>
- </includes>
- <threadCount>1</threadCount>
- <perCoreThreadCount>true</perCoreThreadCount>
- <parallel>both</parallel>
- <argLine>-Xmx2g</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<goals>
@@ -100,9 +86,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.4.1</version>
</plugin>
-
<!-- Parent module has the same plugin and does the work of
generating -sources.jar for each project. But without the
plugin declared here, IDEs don't know the sources are
@@ -110,7 +94,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -122,6 +105,19 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>net/hydromatic/optiq/test/PlusSuite.java</include>
+ </includes>
+ <threadCount>1</threadCount>
+ <perCoreThreadCount>true</perCoreThreadCount>
+ <parallel>both</parallel>
+ <argLine>-Xmx2g</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/19deba21/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb6f56c..bdc10ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,11 +74,25 @@ limitations under the License.
<!-- Dependencies. -->
<dependencies>
+ <!-- Sorted by groupId, artifactId. -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+<!--
<scope>test</scope>
+-->
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <!-- Version 11.0.2 is possible (Hadoop uses it); 16.0 is preferred. -->
+ <version>[11.0.2,]</version>
</dependency>
<dependency>
<groupId>eigenbase</groupId>
@@ -86,20 +100,21 @@ limitations under the License.
<version>1.1.4</version>
</dependency>
<dependency>
- <groupId>net.hydromatic</groupId>
- <artifactId>linq4j</artifactId>
- <version>0.4</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <!-- Version 11.0.2 is possible (Hadoop uses it); 16.0 is preferred. -->
- <version>[11.0.2,]</version>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.20</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.1.1</version>
+ <groupId>net.hydromatic</groupId>
+ <artifactId>linq4j</artifactId>
+ <version>0.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
@@ -112,35 +127,21 @@ limitations under the License.
<version>2.7.3</version>
</dependency>
<dependency>
- <groupId>org.incava</groupId>
- <artifactId>java-diff</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
-<!--
- <scope>test</scope>
--->
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.20</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>sqlline</groupId>
- <artifactId>sqlline</artifactId>
- <version>1.1.7</version>
+ <groupId>org.incava</groupId>
+ <artifactId>java-diff</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>pentaho</groupId>
+ <artifactId>mondrian-data-foodmart-hsqldb</artifactId>
+ <version>0.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -150,15 +151,16 @@ limitations under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>pentaho</groupId>
- <artifactId>mondrian-data-foodmart-hsqldb</artifactId>
- <version>0.2</version>
+ <groupId>sqlline</groupId>
+ <artifactId>sqlline</artifactId>
+ <version>1.1.7</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
+ <!-- Sorted by groupId, artifactId; optiq dependencies first. -->
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-avatica</artifactId>
@@ -169,6 +171,65 @@ limitations under the License.
<artifactId>optiq-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.optiq</groupId>
+ <artifactId>optiq-core</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Now third-party dependencies. -->
+ <dependency>
+ <groupId>io.airlift.tpch</groupId>
+ <artifactId>tpch</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.hydromatic</groupId>
+ <artifactId>tpcds</artifactId>
+ <version>0.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>2.3</version>
+ </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-server</artifactId>
+ <version>7.6.8.v20121106</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongo-java-driver</artifactId>
+ <version>2.11.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-core</artifactId>
+ <version>0.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-generator-annprocess</artifactId>
+ <version>0.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -235,11 +296,52 @@ limitations under the License.
<pluginManagement>
<plugins>
+ <!-- Sorted by groupId, artifactId. -->
+ <plugin>
+ <groupId>com.googlecode.fmpp-maven-plugin</groupId>
+ <artifactId>fmpp-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>net.hydromatic</groupId>
+ <artifactId>hydromatic-resource-maven-plugin</artifactId>
+ <version>0.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.16</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/19deba21/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index c88cdbc..c354710 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -33,18 +33,19 @@ limitations under the License.
</properties>
<dependencies>
+ <!-- Sorted by groupId, artifactId; optiq dependencies first. Put versions
+ in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-core</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-core</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId>
@@ -55,18 +56,14 @@ limitations under the License.
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <!--<version>9.0.5.v20130815</version>-->
- <version>7.6.8.v20121106</version>
</dependency>
</dependencies>
@@ -74,7 +71,6 @@ limitations under the License.
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -82,39 +78,7 @@ limitations under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
- <configuration>
- <excludes>
- <exclude>net/hydromatic/**/*.java</exclude>
- <exclude>org/eigenbase/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>javacc</id>
- <goals>
- <goal>javacc</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/CombinedParser.jj</include>
- </includes>
- <lookAhead>2</lookAhead>
- <isStatic>false</isStatic>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<goals>
@@ -126,9 +90,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.4.1</version>
</plugin>
-
<!-- Parent module has the same plugin and does the work of
generating -sources.jar for each project. But without the
plugin declared here, IDEs don't know the sources are
@@ -136,7 +98,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -148,6 +109,35 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>net/hydromatic/**/*.java</exclude>
+ <exclude>org/eigenbase/**/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javacc</id>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/CombinedParser.jj</include>
+ </includes>
+ <lookAhead>2</lookAhead>
+ <isStatic>false</isStatic>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/19deba21/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index d0f48d2..a71c932 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -34,38 +34,27 @@ limitations under the License.
</properties>
<dependencies>
+ <!-- Sorted by groupId, artifactId; optiq dependencies first. Put versions
+ in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-core</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.optiq</groupId>
<artifactId>optiq-core</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
- <version>2.3</version>
</dependency>
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
- <configuration>
- <includes>
- <include>net/hydromatic/optiq/test/SplunkAdapterTest.java</include>
- </includes>
- </configuration>
- </plugin>
-
<!-- Parent module has the same plugin and does the work of
generating -sources.jar for each project. But without the
plugin declared here, IDEs don't know the sources are
@@ -73,7 +62,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -85,6 +73,15 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>net/hydromatic/optiq/test/SplunkAdapterTest.java</include>
+ </includes>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/19deba21/ubenchmark/pom.xml
----------------------------------------------------------------------
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index c9c69da..bbca33d 100644
--- a/ubenchmark/pom.xml
+++ b/ubenchmark/pom.xml
@@ -39,21 +39,22 @@ limitations under the License.
</repositories>
<dependencies>
+ <!-- Sorted by groupId, artifactId; optiq dependencies first. Put versions
+ in dependencyManagement in the root POM, not here. -->
+ <dependency>
+ <groupId>org.apache.optiq</groupId>
+ <artifactId>optiq-core</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>0.7.1</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
- <version>0.7.1</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.optiq</groupId>
- <artifactId>optiq-core</artifactId>
- </dependency>
</dependencies>
<build>