You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by vl...@apache.org on 2015/01/06 14:09:13 UTC
[1/6] incubator-calcite git commit: [CALCITE-537] Skip overwrite of
NOTICE, DEPENDENCIES, and LICENSE files
Repository: incubator-calcite
Updated Branches:
refs/heads/master 46b569186 -> dd05f6cd9
[CALCITE-537] Skip overwrite of NOTICE, DEPENDENCIES, and LICENSE files
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/e16aee7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/e16aee7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/e16aee7c
Branch: refs/heads/master
Commit: e16aee7c4a27501a8400e18b088bb929ee694402
Parents: a311cce
Author: Vladimir Sitnikov <si...@gmail.com>
Authored: Wed Dec 17 23:24:02 2014 +0300
Committer: Vladimir Sitnikov <si...@gmail.com>
Committed: Tue Jan 6 15:01:13 2015 +0300
----------------------------------------------------------------------
pom.xml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/e16aee7c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a1e8474..80f4f16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -535,6 +535,29 @@ limitations under the License.
</build>
</profile>
<profile>
+ <!-- CALCITE-537: workaround for MRRESOURCES-91
+ Avoid overwrite of the destination file if the produced
+ contents is the same.
+ Apache pom overwrites NOTICE, DEPENDENCIES, and LICENSE files, however
+ we do not want recompile the module every time. -->
+ <id>skip-apache-licenses</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <file><exists>target/maven-shared-archive-resources/META-INF/LICENSE</exists></file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<!-- Generate git.properties on first build -->
<id>generate-git-id</id>
<activation>
[3/6] incubator-calcite git commit: [CALCITE-536] Add @PackageMarker
to package-info.java so maven-compiler skips compilation when the sources are
unchanged
Posted by vl...@apache.org.
[CALCITE-536] Add @PackageMarker to package-info.java so maven-compiler skips compilation when the sources are unchanged
This is a temporary workaround for https://jira.codehaus.org/browse/MCOMPILER-205.
The proper fix is to generate empty package-info.class in maven-compiler-plugin when package-info.java is "empty"
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/957dea10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/957dea10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/957dea10
Branch: refs/heads/master
Commit: 957dea1042fcc7a4a26a93f845c5d17cadd5ba1f
Parents: 46b5691
Author: Vladimir Sitnikov <si...@gmail.com>
Authored: Wed Dec 17 23:31:37 2014 +0300
Committer: Vladimir Sitnikov <si...@gmail.com>
Committed: Tue Jan 6 15:01:13 2015 +0300
----------------------------------------------------------------------
.../calcite/avatica/server/package-info.java | 3 ++
.../apache/calcite/avatica/package-info.java | 3 ++
.../calcite/avatica/remote/package-info.java | 3 ++
.../calcite/avatica/util/PackageMarker.java | 37 ++++++++++++++++++++
.../calcite/avatica/util/package-info.java | 1 +
.../calcite/avatica/test/package-info.java | 3 ++
.../calcite/adapter/clone/package-info.java | 3 ++
.../adapter/enumerable/impl/package-info.java | 3 ++
.../adapter/enumerable/package-info.java | 3 ++
.../calcite/adapter/java/package-info.java | 3 ++
.../calcite/adapter/jdbc/package-info.java | 3 ++
.../apache/calcite/adapter/package-info.java | 3 ++
.../org/apache/calcite/config/package-info.java | 3 ++
.../calcite/interpreter/package-info.java | 3 ++
.../org/apache/calcite/jdbc/package-info.java | 3 ++
.../calcite/materialize/package-info.java | 3 ++
.../org/apache/calcite/model/package-info.java | 3 ++
.../java/org/apache/calcite/package-info.java | 3 ++
.../apache/calcite/plan/hep/package-info.java | 3 ++
.../org/apache/calcite/plan/package-info.java | 3 ++
.../calcite/plan/volcano/package-info.java | 3 ++
.../apache/calcite/prepare/package-info.java | 3 ++
.../calcite/rel/convert/package-info.java | 3 ++
.../apache/calcite/rel/core/package-info.java | 3 ++
.../calcite/rel/externalize/package-info.java | 3 ++
.../apache/calcite/rel/jdbc/package-info.java | 3 ++
.../calcite/rel/logical/package-info.java | 3 ++
.../calcite/rel/metadata/package-info.java | 3 ++
.../org/apache/calcite/rel/package-info.java | 3 ++
.../apache/calcite/rel/rules/package-info.java | 3 ++
.../apache/calcite/rel/type/package-info.java | 3 ++
.../org/apache/calcite/rex/package-info.java | 3 ++
.../apache/calcite/runtime/package-info.java | 3 ++
.../calcite/schema/impl/package-info.java | 3 ++
.../org/apache/calcite/schema/package-info.java | 3 ++
.../org/apache/calcite/server/package-info.java | 3 ++
.../apache/calcite/sql/advise/package-info.java | 3 ++
.../apache/calcite/sql/fun/package-info.java | 3 ++
.../org/apache/calcite/sql/package-info.java | 3 ++
.../calcite/sql/parser/impl/package-info.java | 3 ++
.../apache/calcite/sql/parser/package-info.java | 3 ++
.../apache/calcite/sql/pretty/package-info.java | 3 ++
.../apache/calcite/sql/type/package-info.java | 3 ++
.../apache/calcite/sql/util/package-info.java | 3 ++
.../calcite/sql/validate/package-info.java | 3 ++
.../apache/calcite/sql2rel/package-info.java | 3 ++
.../org/apache/calcite/tools/package-info.java | 3 ++
.../apache/calcite/util/graph/package-info.java | 3 ++
.../apache/calcite/util/javac/package-info.java | 3 ++
.../calcite/util/mapping/package-info.java | 3 ++
.../org/apache/calcite/util/package-info.java | 3 ++
.../apache/calcite/util/trace/package-info.java | 3 ++
.../apache/calcite/sql/test/package-info.java | 3 ++
.../calcite/test/concurrent/package-info.java | 3 ++
.../calcite/test/enumerable/package-info.java | 3 ++
.../org/apache/calcite/test/package-info.java | 3 ++
.../calcite/adapter/csv/package-info.java | 3 ++
.../apache/calcite/linq4j/PackageMarker.java | 37 ++++++++++++++++++++
.../calcite/linq4j/function/package-info.java | 3 ++
.../org/apache/calcite/linq4j/package-info.java | 1 +
.../calcite/linq4j/tree/package-info.java | 3 ++
.../src/test/java/com/example/package-info.java | 3 ++
.../calcite/linq4j/function/package-info.java | 3 ++
.../calcite/linq4j/test/package-info.java | 3 ++
.../calcite/linq4j/tree/package-info.java | 3 ++
.../calcite/adapter/mongodb/package-info.java | 3 ++
.../calcite/adapter/tpcds/package-info.java | 3 ++
.../calcite/adapter/tpch/package-info.java | 3 ++
.../calcite/adapter/spark/package-info.java | 3 ++
.../calcite/adapter/splunk/package-info.java | 3 ++
.../adapter/splunk/search/package-info.java | 3 ++
.../adapter/splunk/util/package-info.java | 3 ++
72 files changed, 280 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/avatica-server/src/main/java/org/apache/calcite/avatica/server/package-info.java
----------------------------------------------------------------------
diff --git a/avatica-server/src/main/java/org/apache/calcite/avatica/server/package-info.java b/avatica-server/src/main/java/org/apache/calcite/avatica/server/package-info.java
index 4b267bb..f2b8728 100644
--- a/avatica-server/src/main/java/org/apache/calcite/avatica/server/package-info.java
+++ b/avatica-server/src/main/java/org/apache/calcite/avatica/server/package-info.java
@@ -18,6 +18,9 @@
/**
* Avatica server that listens for HTTP requests.
*/
+@PackageMarker
package org.apache.calcite.avatica.server;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/avatica/src/main/java/org/apache/calcite/avatica/package-info.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/package-info.java b/avatica/src/main/java/org/apache/calcite/avatica/package-info.java
index 7aad356..89a9fbb 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/package-info.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/package-info.java
@@ -18,6 +18,9 @@
/**
* Avatica JDBC framework.
*/
+@PackageMarker
package org.apache.calcite.avatica;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/avatica/src/main/java/org/apache/calcite/avatica/remote/package-info.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/remote/package-info.java b/avatica/src/main/java/org/apache/calcite/avatica/remote/package-info.java
index 280dfb3..1cf3e14 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/remote/package-info.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/remote/package-info.java
@@ -18,6 +18,9 @@
/**
* JDBC driver that uses remote procedure calls.
*/
+@PackageMarker
package org.apache.calcite.avatica.remote;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/avatica/src/main/java/org/apache/calcite/avatica/util/PackageMarker.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/util/PackageMarker.java b/avatica/src/main/java/org/apache/calcite/avatica/util/PackageMarker.java
new file mode 100644
index 0000000..3a6a9c6
--- /dev/null
+++ b/avatica/src/main/java/org/apache/calcite/avatica/util/PackageMarker.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.calcite.avatica.util;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * This is a dummy annotation that forces javac to produce output for
+ * otherwise empty package-info.java.
+ *
+ * <p>The result is maven-compiler-plugin can properly identify the scope of
+ * changed files
+ *
+ * <p>See more details in
+ * <a href="https://jira.codehaus.org/browse/MCOMPILER-205">
+ * maven-compiler-plugin: incremental compilation broken</a>
+ */
+@Retention(RetentionPolicy.SOURCE)
+public @interface PackageMarker {
+}
+
+// End PackageMarker.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/avatica/src/main/java/org/apache/calcite/avatica/util/package-info.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/util/package-info.java b/avatica/src/main/java/org/apache/calcite/avatica/util/package-info.java
index f351e67..eab457c 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/util/package-info.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/util/package-info.java
@@ -18,6 +18,7 @@
/**
* Avatica utilities.
*/
+@PackageMarker
package org.apache.calcite.avatica.util;
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/avatica/src/test/java/org/apache/calcite/avatica/test/package-info.java
----------------------------------------------------------------------
diff --git a/avatica/src/test/java/org/apache/calcite/avatica/test/package-info.java b/avatica/src/test/java/org/apache/calcite/avatica/test/package-info.java
index 7680316..501bb9f 100644
--- a/avatica/src/test/java/org/apache/calcite/avatica/test/package-info.java
+++ b/avatica/src/test/java/org/apache/calcite/avatica/test/package-info.java
@@ -18,6 +18,9 @@
/**
* Avatica tests.
*/
+@PackageMarker
package org.apache.calcite.avatica.test;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java b/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java
index eef12e2..e7f4b89 100644
--- a/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java
@@ -18,6 +18,9 @@
/**
* Provides utility classes.
*/
+@PackageMarker
package org.apache.calcite.adapter.clone;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java
index d1df993..b1b2aad 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java
@@ -18,6 +18,9 @@
/**
* Calcite-specific classes for implementation of regular and window aggregates.
*/
+@PackageMarker
package org.apache.calcite.adapter.enumerable.impl;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java
index 5751e7c..5d29f8b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java
@@ -18,6 +18,9 @@
/**
* Query optimizer rules for Java calling convention.
*/
+@PackageMarker
package org.apache.calcite.adapter.enumerable;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/adapter/java/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/java/package-info.java b/core/src/main/java/org/apache/calcite/adapter/java/package-info.java
index 4d66ffe..58da953 100644
--- a/core/src/main/java/org/apache/calcite/adapter/java/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/java/package-info.java
@@ -19,6 +19,9 @@
* Query provider based on Java in-memory data
* structures.
*/
+@PackageMarker
package org.apache.calcite.adapter.java;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java
index 92990dd..ba2bdd8 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java
@@ -18,6 +18,9 @@
/**
* Query provider based on a JDBC data source.
*/
+@PackageMarker
package org.apache.calcite.adapter.jdbc;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/adapter/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/package-info.java b/core/src/main/java/org/apache/calcite/adapter/package-info.java
index 697412a..29084db 100644
--- a/core/src/main/java/org/apache/calcite/adapter/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/package-info.java
@@ -37,6 +37,9 @@
* </pre>
* </blockquote>
*/
+@PackageMarker
package org.apache.calcite.adapter;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/config/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/config/package-info.java b/core/src/main/java/org/apache/calcite/config/package-info.java
index b6d2ddb..dcfc9af 100644
--- a/core/src/main/java/org/apache/calcite/config/package-info.java
+++ b/core/src/main/java/org/apache/calcite/config/package-info.java
@@ -18,6 +18,9 @@
/**
* Configuration.
*/
+@PackageMarker
package org.apache.calcite.config;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/interpreter/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/interpreter/package-info.java b/core/src/main/java/org/apache/calcite/interpreter/package-info.java
index c2e152f..19e8bca 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/package-info.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/package-info.java
@@ -22,6 +22,9 @@
* preparation time is less, and so the total prepare + execute time is
* competitive for queries over small data sets.
*/
+@PackageMarker
package org.apache.calcite.interpreter;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/jdbc/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/jdbc/package-info.java b/core/src/main/java/org/apache/calcite/jdbc/package-info.java
index 40b3744..63af3b2 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/package-info.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/package-info.java
@@ -18,6 +18,9 @@
/**
* JDBC driver for Calcite.
*/
+@PackageMarker
package org.apache.calcite.jdbc;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/materialize/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/materialize/package-info.java b/core/src/main/java/org/apache/calcite/materialize/package-info.java
index 0aab1ca..a68f5b9 100644
--- a/core/src/main/java/org/apache/calcite/materialize/package-info.java
+++ b/core/src/main/java/org/apache/calcite/materialize/package-info.java
@@ -32,6 +32,9 @@
* instantiating materializations from the intermediate results of queries, and
* recognize what materializations would be useful based on actual query load.
*/
+@PackageMarker
package org.apache.calcite.materialize;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/model/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/model/package-info.java b/core/src/main/java/org/apache/calcite/model/package-info.java
index 38a08a5..ce16b52 100644
--- a/core/src/main/java/org/apache/calcite/model/package-info.java
+++ b/core/src/main/java/org/apache/calcite/model/package-info.java
@@ -34,6 +34,9 @@
* <a href="https://github.com/julianhyde/blog/master/optiq-csv/TUTORIAL.md">optiq-csv
* tutorial</a>.
*/
+@PackageMarker
package org.apache.calcite.model;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/package-info.java b/core/src/main/java/org/apache/calcite/package-info.java
index 87ef21f..8a4d228 100644
--- a/core/src/main/java/org/apache/calcite/package-info.java
+++ b/core/src/main/java/org/apache/calcite/package-info.java
@@ -18,6 +18,9 @@
/**
* Main package for Calcite, the dynamic data management platform.
*/
+@PackageMarker
package org.apache.calcite;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/plan/hep/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/package-info.java b/core/src/main/java/org/apache/calcite/plan/hep/package-info.java
index 424ad80..55962c1 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/package-info.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/package-info.java
@@ -19,6 +19,9 @@
* Provides a heuristic planner implementation for the interfaces in
* {@link org.apache.calcite.plan}.
*/
+@PackageMarker
package org.apache.calcite.plan.hep;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/plan/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/plan/package-info.java b/core/src/main/java/org/apache/calcite/plan/package-info.java
index e6fecd2..057bbec 100644
--- a/core/src/main/java/org/apache/calcite/plan/package-info.java
+++ b/core/src/main/java/org/apache/calcite/plan/package-info.java
@@ -19,6 +19,9 @@
* Defines interfaces for constructing rule-based optimizers of
* relational expressions.
*/
+@PackageMarker
package org.apache.calcite.plan;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java b/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java
index 482a3ee..9e47d75 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java
@@ -268,6 +268,9 @@
* McKenna
* (1993)</a>.</p>
*/
+@PackageMarker
package org.apache.calcite.plan.volcano;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/prepare/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/prepare/package-info.java b/core/src/main/java/org/apache/calcite/prepare/package-info.java
index 0d4dd6e..e8868ad 100644
--- a/core/src/main/java/org/apache/calcite/prepare/package-info.java
+++ b/core/src/main/java/org/apache/calcite/prepare/package-info.java
@@ -18,6 +18,9 @@
/**
* Preparation of queries (parsing, planning and implementation).
*/
+@PackageMarker
package org.apache.calcite.prepare;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rel/convert/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/convert/package-info.java b/core/src/main/java/org/apache/calcite/rel/convert/package-info.java
index cf1032c..e3cf961 100644
--- a/core/src/main/java/org/apache/calcite/rel/convert/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/convert/package-info.java
@@ -19,6 +19,9 @@
* Defines relational expressions and rules for converting between calling
* conventions.
*/
+@PackageMarker
package org.apache.calcite.rel.convert;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rel/core/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/core/package-info.java b/core/src/main/java/org/apache/calcite/rel/core/package-info.java
index 2e547fb..3f302e0 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/package-info.java
@@ -31,6 +31,9 @@
*
* </ul>
*/
+@PackageMarker
package org.apache.calcite.rel.core;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java b/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java
index d5897ff..d418734 100644
--- a/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java
@@ -19,6 +19,9 @@
* Facilities to externalize {@link org.apache.calcite.rel.RelNode}s to and from
* XML and JSON format.
*/
+@PackageMarker
package org.apache.calcite.rel.externalize;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rel/jdbc/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/jdbc/package-info.java b/core/src/main/java/org/apache/calcite/rel/jdbc/package-info.java
index 877c848..2186666 100644
--- a/core/src/main/java/org/apache/calcite/rel/jdbc/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/jdbc/package-info.java
@@ -19,6 +19,9 @@
* Contains query transformation rules relating to generating SQL for
* foreign JDBC databases.
*/
+@PackageMarker
package org.apache.calcite.rel.jdbc;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rel/logical/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/package-info.java b/core/src/main/java/org/apache/calcite/rel/logical/package-info.java
index 3317ac1..c8f8d7e 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/package-info.java
@@ -31,6 +31,9 @@
*
* </ul>
*/
+@PackageMarker
package org.apache.calcite.rel.logical;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java b/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java
index ed98035..e644578 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java
@@ -19,6 +19,9 @@
* Defines metadata interfaces and utilities for relational
* expressions.
*/
+@PackageMarker
package org.apache.calcite.rel.metadata;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rel/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/package-info.java b/core/src/main/java/org/apache/calcite/rel/package-info.java
index fdbfd3b..ad7b366 100644
--- a/core/src/main/java/org/apache/calcite/rel/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/package-info.java
@@ -35,6 +35,9 @@
*
* </ul>
*/
+@PackageMarker
package org.apache.calcite.rel;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/package-info.java b/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
index 47ef478..4f9d8bd 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
@@ -47,6 +47,9 @@
* provides an optimizer interface.</li>
* </ul>
*/
+@PackageMarker
package org.apache.calcite.rel.rules;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rel/type/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/type/package-info.java b/core/src/main/java/org/apache/calcite/rel/type/package-info.java
index 7c2e251..4703294 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/package-info.java
@@ -18,6 +18,9 @@
/**
* Defines a type system for relational expressions.
*/
+@PackageMarker
package org.apache.calcite.rel.type;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/rex/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rex/package-info.java b/core/src/main/java/org/apache/calcite/rex/package-info.java
index b776422..e0f4007 100644
--- a/core/src/main/java/org/apache/calcite/rex/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rex/package-info.java
@@ -79,6 +79,9 @@
*
* </ul>
*/
+@PackageMarker
package org.apache.calcite.rex;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/runtime/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/runtime/package-info.java b/core/src/main/java/org/apache/calcite/runtime/package-info.java
index 25e404f..1f14156 100644
--- a/core/src/main/java/org/apache/calcite/runtime/package-info.java
+++ b/core/src/main/java/org/apache/calcite/runtime/package-info.java
@@ -18,6 +18,9 @@
/**
* Utilities required at runtime.
*/
+@PackageMarker
package org.apache.calcite.runtime;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/schema/impl/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/package-info.java b/core/src/main/java/org/apache/calcite/schema/impl/package-info.java
index 8b918de..dc8fb2a 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/package-info.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/package-info.java
@@ -18,6 +18,9 @@
/**
* Utilities to help implement Calcite's SPIs.
*/
+@PackageMarker
package org.apache.calcite.schema.impl;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/schema/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/schema/package-info.java b/core/src/main/java/org/apache/calcite/schema/package-info.java
index bded44c..4a24038 100644
--- a/core/src/main/java/org/apache/calcite/schema/package-info.java
+++ b/core/src/main/java/org/apache/calcite/schema/package-info.java
@@ -22,6 +22,9 @@
* SQL validator to validate SQL abstract syntax trees and resolve
* identifiers to objects.
*/
+@PackageMarker
package org.apache.calcite.schema;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/server/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/server/package-info.java b/core/src/main/java/org/apache/calcite/server/package-info.java
index 5de3ce7..b24ef1e 100644
--- a/core/src/main/java/org/apache/calcite/server/package-info.java
+++ b/core/src/main/java/org/apache/calcite/server/package-info.java
@@ -18,6 +18,9 @@
/**
* Provides a server for hosting Calcite connections.
*/
+@PackageMarker
package org.apache.calcite.server;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql/advise/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/advise/package-info.java b/core/src/main/java/org/apache/calcite/sql/advise/package-info.java
index a30a886..2530250 100644
--- a/core/src/main/java/org/apache/calcite/sql/advise/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/advise/package-info.java
@@ -24,6 +24,9 @@
* <p>The advisor uses the validation and parser framework set up in
* <code>org.apache.calcite.sql.validate</code> package.
*/
+@PackageMarker
package org.apache.calcite.sql.advise;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql/fun/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/package-info.java b/core/src/main/java/org/apache/calcite/sql/fun/package-info.java
index bd996ce..6cee38b 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/package-info.java
@@ -27,6 +27,9 @@
* which are not row-level (e.g. select and join) should be defined in package
* {@link org.apache.calcite.sql} instead.</p>
*/
+@PackageMarker
package org.apache.calcite.sql.fun;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/package-info.java b/core/src/main/java/org/apache/calcite/sql/package-info.java
index 698fd89..887ebf0 100644
--- a/core/src/main/java/org/apache/calcite/sql/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/package-info.java
@@ -92,6 +92,9 @@
* {@link org.apache.calcite.sql.SqlNode}s into a SQL string. A
* {@link org.apache.calcite.sql.SqlDialect} defines how this happens.</p>
*/
+@PackageMarker
package org.apache.calcite.sql;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java b/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java
index 281cf49..0d996bd 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java
@@ -19,6 +19,9 @@
* Contains generated code for the
* {@link org.apache.calcite.sql.parser Calcite SQL parser}.
*/
+@PackageMarker
package org.apache.calcite.sql.parser.impl;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql/parser/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/package-info.java b/core/src/main/java/org/apache/calcite/sql/parser/package-info.java
index f518710..0105fc6 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/package-info.java
@@ -18,6 +18,9 @@
/**
* Provides a SQL parser.
*/
+@PackageMarker
package org.apache.calcite.sql.parser;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java b/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java
index bd30861..b234699 100644
--- a/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java
@@ -18,6 +18,9 @@
/**
* Provides a pretty-printer for SQL statements.
*/
+@PackageMarker
package org.apache.calcite.sql.pretty;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql/type/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/package-info.java b/core/src/main/java/org/apache/calcite/sql/type/package-info.java
index 8a396f4..2e7bee3 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/package-info.java
@@ -18,6 +18,9 @@
/**
* SQL type system.
*/
+@PackageMarker
package org.apache.calcite.sql.type;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql/util/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/util/package-info.java b/core/src/main/java/org/apache/calcite/sql/util/package-info.java
index 22f73b5..9dd51aa 100644
--- a/core/src/main/java/org/apache/calcite/sql/util/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/util/package-info.java
@@ -18,6 +18,9 @@
/**
* Utility classes for the SQL object model, parsing, and validation.
*/
+@PackageMarker
package org.apache.calcite.sql.util;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql/validate/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/package-info.java b/core/src/main/java/org/apache/calcite/sql/validate/package-info.java
index d904da3..c79be93 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/package-info.java
@@ -18,6 +18,9 @@
/**
* SQL validation.
*/
+@PackageMarker
package org.apache.calcite.sql.validate;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/sql2rel/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql2rel/package-info.java b/core/src/main/java/org/apache/calcite/sql2rel/package-info.java
index 0b0aa01..865e358 100644
--- a/core/src/main/java/org/apache/calcite/sql2rel/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql2rel/package-info.java
@@ -18,6 +18,9 @@
/**
* Translates a SQL parse tree to relational expression.
*/
+@PackageMarker
package org.apache.calcite.sql2rel;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/tools/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/tools/package-info.java b/core/src/main/java/org/apache/calcite/tools/package-info.java
index 3273ae2..a8c5ffa 100644
--- a/core/src/main/java/org/apache/calcite/tools/package-info.java
+++ b/core/src/main/java/org/apache/calcite/tools/package-info.java
@@ -18,6 +18,9 @@
/**
* Provides utility classes.
*/
+@PackageMarker
package org.apache.calcite.tools;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/util/graph/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/util/graph/package-info.java b/core/src/main/java/org/apache/calcite/util/graph/package-info.java
index 69d3018..5b7c017 100644
--- a/core/src/main/java/org/apache/calcite/util/graph/package-info.java
+++ b/core/src/main/java/org/apache/calcite/util/graph/package-info.java
@@ -18,6 +18,9 @@
/**
* Graph-theoretic algorithms and data structures.
*/
+@PackageMarker
package org.apache.calcite.util.graph;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/util/javac/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/util/javac/package-info.java b/core/src/main/java/org/apache/calcite/util/javac/package-info.java
index aabcd55..36e2f29 100644
--- a/core/src/main/java/org/apache/calcite/util/javac/package-info.java
+++ b/core/src/main/java/org/apache/calcite/util/javac/package-info.java
@@ -18,6 +18,9 @@
/**
* Provides compilers for Java code.
*/
+@PackageMarker
package org.apache.calcite.util.javac;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/util/mapping/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/util/mapping/package-info.java b/core/src/main/java/org/apache/calcite/util/mapping/package-info.java
index 2a994ca..1a344a8 100644
--- a/core/src/main/java/org/apache/calcite/util/mapping/package-info.java
+++ b/core/src/main/java/org/apache/calcite/util/mapping/package-info.java
@@ -18,6 +18,9 @@
/**
* Support for algebraic maps.
*/
+@PackageMarker
package org.apache.calcite.util.mapping;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/util/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/util/package-info.java b/core/src/main/java/org/apache/calcite/util/package-info.java
index ba2185f..6e0e35d 100644
--- a/core/src/main/java/org/apache/calcite/util/package-info.java
+++ b/core/src/main/java/org/apache/calcite/util/package-info.java
@@ -18,6 +18,9 @@
/**
* Provides utility classes.
*/
+@PackageMarker
package org.apache.calcite.util;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/main/java/org/apache/calcite/util/trace/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/util/trace/package-info.java b/core/src/main/java/org/apache/calcite/util/trace/package-info.java
index 282bbc9..6fd7c64 100644
--- a/core/src/main/java/org/apache/calcite/util/trace/package-info.java
+++ b/core/src/main/java/org/apache/calcite/util/trace/package-info.java
@@ -18,6 +18,9 @@
/**
* Tracing services.
*/
+@PackageMarker
package org.apache.calcite.util.trace;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/test/java/org/apache/calcite/sql/test/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/sql/test/package-info.java b/core/src/test/java/org/apache/calcite/sql/test/package-info.java
index 9d3e4ec..b682479 100644
--- a/core/src/test/java/org/apache/calcite/sql/test/package-info.java
+++ b/core/src/test/java/org/apache/calcite/sql/test/package-info.java
@@ -18,6 +18,9 @@
/**
* Regression tests for the SQL model.
*/
+@PackageMarker
package org.apache.calcite.sql.test;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/test/java/org/apache/calcite/test/concurrent/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/package-info.java b/core/src/test/java/org/apache/calcite/test/concurrent/package-info.java
index 38a59d0..c779728 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/package-info.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/package-info.java
@@ -314,6 +314,9 @@
* </ul>
*
*/
+@PackageMarker
package org.apache.calcite.test.concurrent;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/test/java/org/apache/calcite/test/enumerable/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/enumerable/package-info.java b/core/src/test/java/org/apache/calcite/test/enumerable/package-info.java
index 0b3113d..42f302a 100644
--- a/core/src/test/java/org/apache/calcite/test/enumerable/package-info.java
+++ b/core/src/test/java/org/apache/calcite/test/enumerable/package-info.java
@@ -18,6 +18,9 @@
/**
* Tests for Enumerable convention runtime.
*/
+@PackageMarker
package org.apache.calcite.test.enumerable;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/core/src/test/java/org/apache/calcite/test/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/package-info.java b/core/src/test/java/org/apache/calcite/test/package-info.java
index 013b476..291e3ee 100644
--- a/core/src/test/java/org/apache/calcite/test/package-info.java
+++ b/core/src/test/java/org/apache/calcite/test/package-info.java
@@ -18,6 +18,9 @@
/**
* Tests for Calcite.
*/
+@PackageMarker
package org.apache.calcite.test;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/example/csv/src/main/java/org/apache/calcite/adapter/csv/package-info.java
----------------------------------------------------------------------
diff --git a/example/csv/src/main/java/org/apache/calcite/adapter/csv/package-info.java b/example/csv/src/main/java/org/apache/calcite/adapter/csv/package-info.java
index f4b2d6e..48275c2 100644
--- a/example/csv/src/main/java/org/apache/calcite/adapter/csv/package-info.java
+++ b/example/csv/src/main/java/org/apache/calcite/adapter/csv/package-info.java
@@ -22,6 +22,9 @@
* directory appears as a table. Full SQL operations are available on
* those tables.</p>
*/
+@PackageMarker
package org.apache.calcite.adapter.csv;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/linq4j/src/main/java/org/apache/calcite/linq4j/PackageMarker.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/PackageMarker.java b/linq4j/src/main/java/org/apache/calcite/linq4j/PackageMarker.java
new file mode 100644
index 0000000..bb54a16
--- /dev/null
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/PackageMarker.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.calcite.linq4j;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * This is a dummy annotation that forces javac to produce output for
+ * otherwise empty package-info.java.
+ *
+ * <p>The result is maven-compiler-plugin can properly identify the scope of
+ * changed files
+ *
+ * <p>See more details in
+ * <a href="https://jira.codehaus.org/browse/MCOMPILER-205">
+ * maven-compiler-plugin: incremental compilation broken</a>
+ */
+@Retention(RetentionPolicy.SOURCE)
+public @interface PackageMarker {
+}
+
+// End PackageMarker.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/linq4j/src/main/java/org/apache/calcite/linq4j/function/package-info.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/function/package-info.java b/linq4j/src/main/java/org/apache/calcite/linq4j/function/package-info.java
index 38d9319..e71fac5 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/function/package-info.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/function/package-info.java
@@ -18,6 +18,9 @@
/**
* Contains definitions of functions and predicates.
*/
+@PackageMarker
package org.apache.calcite.linq4j.function;
+import org.apache.calcite.linq4j.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/linq4j/src/main/java/org/apache/calcite/linq4j/package-info.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/package-info.java b/linq4j/src/main/java/org/apache/calcite/linq4j/package-info.java
index 0288428..7e90007 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/package-info.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/package-info.java
@@ -18,6 +18,7 @@
/**
* Language-integrated query for Java (linq4j) main package.
*/
+@PackageMarker
package org.apache.calcite.linq4j;
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/linq4j/src/main/java/org/apache/calcite/linq4j/tree/package-info.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/package-info.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/package-info.java
index f8aa0e9..5d31bc5 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/package-info.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/package-info.java
@@ -25,6 +25,9 @@
* efficiency; for example, it may attempt to push down filters to the
* source SQL system.</p>
*/
+@PackageMarker
package org.apache.calcite.linq4j.tree;
+import org.apache.calcite.linq4j.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/linq4j/src/test/java/com/example/package-info.java
----------------------------------------------------------------------
diff --git a/linq4j/src/test/java/com/example/package-info.java b/linq4j/src/test/java/com/example/package-info.java
index 21f6bda..d994aa4 100644
--- a/linq4j/src/test/java/com/example/package-info.java
+++ b/linq4j/src/test/java/com/example/package-info.java
@@ -18,6 +18,9 @@
/**
* Examples of using linq4j.
*/
+@PackageMarker
package com.example;
+import org.apache.calcite.linq4j.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/linq4j/src/test/java/org/apache/calcite/linq4j/function/package-info.java
----------------------------------------------------------------------
diff --git a/linq4j/src/test/java/org/apache/calcite/linq4j/function/package-info.java b/linq4j/src/test/java/org/apache/calcite/linq4j/function/package-info.java
index 0871e72..e457e3d 100644
--- a/linq4j/src/test/java/org/apache/calcite/linq4j/function/package-info.java
+++ b/linq4j/src/test/java/org/apache/calcite/linq4j/function/package-info.java
@@ -18,6 +18,9 @@
/**
* Tests for functions.
*/
+@PackageMarker
package org.apache.calcite.linq4j.function;
+import org.apache.calcite.linq4j.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/linq4j/src/test/java/org/apache/calcite/linq4j/test/package-info.java
----------------------------------------------------------------------
diff --git a/linq4j/src/test/java/org/apache/calcite/linq4j/test/package-info.java b/linq4j/src/test/java/org/apache/calcite/linq4j/test/package-info.java
index 9745b87..3b120b4 100644
--- a/linq4j/src/test/java/org/apache/calcite/linq4j/test/package-info.java
+++ b/linq4j/src/test/java/org/apache/calcite/linq4j/test/package-info.java
@@ -18,6 +18,9 @@
/**
* Core linq4j tests.
*/
+@PackageMarker
package org.apache.calcite.linq4j.test;
+import org.apache.calcite.linq4j.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/linq4j/src/test/java/org/apache/calcite/linq4j/tree/package-info.java
----------------------------------------------------------------------
diff --git a/linq4j/src/test/java/org/apache/calcite/linq4j/tree/package-info.java b/linq4j/src/test/java/org/apache/calcite/linq4j/tree/package-info.java
index 655a4f5..86d8d9d 100644
--- a/linq4j/src/test/java/org/apache/calcite/linq4j/tree/package-info.java
+++ b/linq4j/src/test/java/org/apache/calcite/linq4j/tree/package-info.java
@@ -18,6 +18,9 @@
/**
* Tests for expressions.
*/
+@PackageMarker
package org.apache.calcite.linq4j.tree;
+import org.apache.calcite.linq4j.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/package-info.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/package-info.java b/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/package-info.java
index e56ecbd..4092ab7 100644
--- a/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/package-info.java
+++ b/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/package-info.java
@@ -18,6 +18,9 @@
/**
* Query provider based on a MongoDB database.
*/
+@PackageMarker
package org.apache.calcite.adapter.mongodb;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/plus/src/main/java/org/apache/calcite/adapter/tpcds/package-info.java
----------------------------------------------------------------------
diff --git a/plus/src/main/java/org/apache/calcite/adapter/tpcds/package-info.java b/plus/src/main/java/org/apache/calcite/adapter/tpcds/package-info.java
index d9e6115..9494321 100644
--- a/plus/src/main/java/org/apache/calcite/adapter/tpcds/package-info.java
+++ b/plus/src/main/java/org/apache/calcite/adapter/tpcds/package-info.java
@@ -18,6 +18,9 @@
/**
* TPC-DS schema.
*/
+@PackageMarker
package org.apache.calcite.adapter.tpcds;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/plus/src/main/java/org/apache/calcite/adapter/tpch/package-info.java
----------------------------------------------------------------------
diff --git a/plus/src/main/java/org/apache/calcite/adapter/tpch/package-info.java b/plus/src/main/java/org/apache/calcite/adapter/tpch/package-info.java
index fc18259..44039fd 100644
--- a/plus/src/main/java/org/apache/calcite/adapter/tpch/package-info.java
+++ b/plus/src/main/java/org/apache/calcite/adapter/tpch/package-info.java
@@ -18,6 +18,9 @@
/**
* TPC-H schema.
*/
+@PackageMarker
package org.apache.calcite.adapter.tpch;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/spark/src/main/java/org/apache/calcite/adapter/spark/package-info.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/org/apache/calcite/adapter/spark/package-info.java b/spark/src/main/java/org/apache/calcite/adapter/spark/package-info.java
index c41ab52..9e2d968 100644
--- a/spark/src/main/java/org/apache/calcite/adapter/spark/package-info.java
+++ b/spark/src/main/java/org/apache/calcite/adapter/spark/package-info.java
@@ -18,6 +18,9 @@
/**
* Adapter based on the Apache Spark data management system.
*/
+@PackageMarker
package org.apache.calcite.adapter.spark;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/splunk/src/main/java/org/apache/calcite/adapter/splunk/package-info.java
----------------------------------------------------------------------
diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/package-info.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/package-info.java
index 269d500..6e2fcef 100644
--- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/package-info.java
+++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/package-info.java
@@ -22,6 +22,9 @@
* "host", "index", "source", "sourcetype". It has a variable type, so other
* fields are held in a map field called "_others".</p>
*/
+@PackageMarker
package org.apache.calcite.adapter.splunk;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/package-info.java
----------------------------------------------------------------------
diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/package-info.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/package-info.java
index 7167666..7d6df6e 100644
--- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/package-info.java
+++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/package-info.java
@@ -18,6 +18,9 @@
/**
* Executes queries via Splunk's REST API.
*/
+@PackageMarker
package org.apache.calcite.adapter.splunk.search;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/957dea10/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/package-info.java
----------------------------------------------------------------------
diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/package-info.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/package-info.java
index 04bdbf2..3dbf2f0 100644
--- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/package-info.java
+++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/package-info.java
@@ -18,6 +18,9 @@
/**
* Utilities for RPC to Splunk.
*/
+@PackageMarker
package org.apache.calcite.adapter.splunk.util;
+import org.apache.calcite.avatica.util.PackageMarker;
+
// End package-info.java
[2/6] incubator-calcite git commit: [CALCITE-538] Generate Parser.jj
only at first build
Posted by vl...@apache.org.
[CALCITE-538] Generate Parser.jj only at first build
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/a311ccef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/a311ccef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/a311ccef
Branch: refs/heads/master
Commit: a311cceffbb4f122e47e9f919e0fb0620ba556ff
Parents: 35a5b4f
Author: Vladimir Sitnikov <si...@gmail.com>
Authored: Wed Dec 17 23:21:19 2014 +0300
Committer: Vladimir Sitnikov <si...@gmail.com>
Committed: Tue Jan 6 15:01:13 2015 +0300
----------------------------------------------------------------------
core/pom.xml | 49 ++++++++++++++++++++++++++++++++-----------------
1 file changed, 32 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a311ccef/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 70feeb1..4c54bca 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -135,23 +135,6 @@ limitations under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.googlecode.fmpp-maven-plugin</groupId>
- <artifactId>fmpp-maven-plugin</artifactId>
- <configuration>
- <cfgFile>src/main/codegen/config.fmpp</cfgFile>
- <templateDirectory>src/main/codegen/templates</templateDirectory>
- </configuration>
- <executions>
- <execution>
- <id>generate-fmpp-sources</id>
- <phase>validate</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<resources>
@@ -189,6 +172,38 @@ limitations under the License.
</resources>
</build>
</profile>
+ <profile>
+ <!-- CALCITE-538: workaround for https://github.com/freemarker/fmpp/issues/11
+ FMPP always overwrites destination file, however we do not want
+ recompile the whole module every time.
+ -->
+ <id>generate-parser</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file><missing>target/generated-sources/fmpp/javacc/Parser.jj</missing></file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.fmpp-maven-plugin</groupId>
+ <artifactId>fmpp-maven-plugin</artifactId>
+ <configuration>
+ <cfgFile>src/main/codegen/config.fmpp</cfgFile>
+ <templateDirectory>src/main/codegen/templates</templateDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-fmpp-sources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
[6/6] incubator-calcite git commit: [CALCITE-541] Update
maven-source-plugin to 2.4 to get speedup in jdk 1.8
Posted by vl...@apache.org.
[CALCITE-541] Update maven-source-plugin to 2.4 to get speedup in jdk 1.8
Old version of maven-source-plugin has "is java.version==1.7" guard check for the usage of 1.7+ features.
New version has proper java.version>=1.7, so it is faster in 1.8
Fixes #35
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/dd05f6cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/dd05f6cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/dd05f6cd
Branch: refs/heads/master
Commit: dd05f6cd91d864c802d842c6f5f7ee48d943a1d8
Parents: e16aee7
Author: Vladimir Sitnikov <si...@gmail.com>
Authored: Tue Jan 6 16:08:57 2015 +0300
Committer: Vladimir Sitnikov <si...@gmail.com>
Committed: Tue Jan 6 16:08:57 2015 +0300
----------------------------------------------------------------------
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/dd05f6cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 80f4f16..49e5b6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,6 +381,11 @@ limitations under the License.
<version>2.1</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9</version>
[5/6] incubator-calcite git commit: [CALCITE-539] Avoid rewrite of
org-apache-calcite-jdbc.properties
Posted by vl...@apache.org.
[CALCITE-539] Avoid rewrite of org-apache-calcite-jdbc.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/35a5b4f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/35a5b4f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/35a5b4f5
Branch: refs/heads/master
Commit: 35a5b4f53b550761b3e6f1321767471a9820d95f
Parents: dfdf700
Author: Vladimir Sitnikov <si...@gmail.com>
Authored: Wed Dec 17 23:17:17 2014 +0300
Committer: Vladimir Sitnikov <si...@gmail.com>
Committed: Tue Jan 6 15:01:13 2015 +0300
----------------------------------------------------------------------
core/pom.xml | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/35a5b4f5/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 441d8d2..70feeb1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -162,10 +162,6 @@ limitations under the License.
</excludes>
</resource>
<resource>
- <directory>src/main/resources/version</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<!-- Copy freemarker template and fmpp configuration files of
Calcite's SQL parser to allow clients to extend parser. -->
<directory>${basedir}/src/main/codegen</directory>
@@ -174,4 +170,25 @@ limitations under the License.
</resources>
</build>
+ <profiles>
+ <profile>
+ <!-- CALCITE-539: workaround for MSHARED-394: Avoid rewrite of
+ destination in DefaultMavenFileFilter#filterFile when producing
+ the same contents -->
+ <id>generate-version-properties</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file><missing>target/classes/org-apache-calcite-jdbc.properties</missing></file>
+ </activation>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources/version</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+ </profile>
+ </profiles>
+
</project>
[4/6] incubator-calcite git commit: [CALCITE-540] Create
git.properties file only at first build. This saves time in development at a
cost of stale git.properties
Posted by vl...@apache.org.
[CALCITE-540] Create git.properties file only at first build. This saves time in development at a cost of stale git.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/dfdf7002
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/dfdf7002
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/dfdf7002
Branch: refs/heads/master
Commit: dfdf700211ad6ff0ba82fd48e9c93353a4a9c5db
Parents: 957dea1
Author: Vladimir Sitnikov <si...@gmail.com>
Authored: Wed Dec 17 23:33:57 2014 +0300
Committer: Vladimir Sitnikov <si...@gmail.com>
Committed: Tue Jan 6 15:01:13 2015 +0300
----------------------------------------------------------------------
pom.xml | 74 ++++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 47 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/dfdf7002/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7fc86bb..a1e8474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,33 +343,6 @@ limitations under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <goals>
- <goal>revision</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
- <verbose>false</verbose>
- <skipPoms>false</skipPoms>
- <generateGitPropertiesFile>true</generateGitPropertiesFile>
- <generateGitPropertiesFilename>target/git.properties</generateGitPropertiesFilename>
- <failOnNoGitDirectory>false</failOnNoGitDirectory>
- <gitDescribe>
- <skip>false</skip>
- <always>false</always>
- <abbrev>7</abbrev>
- <dirty>-dirty</dirty>
- <forceLongFormat>true</forceLongFormat>
- </gitDescribe>
- </configuration>
- </plugin>
</plugins>
<pluginManagement>
@@ -561,5 +534,52 @@ limitations under the License.
</plugins>
</build>
</profile>
+ <profile>
+ <!-- Generate git.properties on first build -->
+ <id>generate-git-id</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <!-- Note: <missing> here does NOT support interpolation,
+ so technically, this profile is active for sub-modules.
+ It would be nice to use ${top.dir}/target/... here, but
+ it is not possible.
+ However sub-modules lack .git folder, so no git.properties
+ is generated. -->
+ <file>
+ <missing>target/git.properties</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+ <verbose>false</verbose>
+ <skipPoms>false</skipPoms>
+ <generateGitPropertiesFile>true</generateGitPropertiesFile>
+ <generateGitPropertiesFilename>target/git.properties</generateGitPropertiesFilename>
+ <failOnNoGitDirectory>false</failOnNoGitDirectory>
+ <gitDescribe>
+ <skip>false</skip>
+ <always>false</always>
+ <abbrev>7</abbrev>
+ <dirty>-dirty</dirty>
+ <forceLongFormat>true</forceLongFormat>
+ </gitDescribe>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>