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 2019/11/19 08:15:45 UTC
[calcite] 10/11: [CALCITE-2905] @PackageMaker is no longer needed
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit c7c8ab17c3f4785f81dc02184034ebeb5e1d4ae1
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Mon Nov 18 15:41:32 2019 +0300
[CALCITE-2905] @PackageMaker is no longer needed
---
babel/src/main/java/org/apache/calcite/sql/babel/package-info.java | 3 ---
.../main/java/org/apache/calcite/adapter/cassandra/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/adapter/clone/package-info.java | 3 ---
.../java/org/apache/calcite/adapter/enumerable/impl/package-info.java | 3 ---
.../main/java/org/apache/calcite/adapter/enumerable/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/adapter/java/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/adapter/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/config/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/interpreter/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/jdbc/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/materialize/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/model/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/plan/hep/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/plan/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/plan/volcano/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/prepare/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/profile/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/convert/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/core/package-info.java | 3 ---
.../src/main/java/org/apache/calcite/rel/externalize/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/hint/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/logical/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/metadata/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/mutable/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/rules/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/stream/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rel/type/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/rex/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/runtime/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/schema/impl/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/schema/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/server/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql/advise/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql/dialect/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql/fun/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql/package-info.java | 3 ---
.../src/main/java/org/apache/calcite/sql/parser/impl/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql/parser/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql/pretty/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql/type/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql/util/package-info.java | 3 ---
.../java/org/apache/calcite/sql/validate/implicit/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql/validate/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/sql2rel/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/statistic/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/tools/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/util/graph/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/util/javac/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/util/mapping/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/util/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/util/trace/package-info.java | 3 ---
core/src/test/java/org/apache/calcite/sql/test/package-info.java | 3 ---
.../src/test/java/org/apache/calcite/test/concurrent/package-info.java | 3 ---
.../src/test/java/org/apache/calcite/test/enumerable/package-info.java | 3 ---
core/src/test/java/org/apache/calcite/test/package-info.java | 3 ---
druid/src/main/java/org/apache/calcite/adapter/druid/package-info.java | 3 ---
.../java/org/apache/calcite/adapter/elasticsearch/package-info.java | 3 ---
.../csv/src/main/java/org/apache/calcite/adapter/csv/package-info.java | 3 ---
.../src/main/java/org/apache/calcite/example/maze/package-info.java | 3 ---
.../main/java/org/apache/calcite/adapter/geode/rel/package-info.java | 3 ---
.../java/org/apache/calcite/adapter/geode/simple/package-info.java | 3 ---
.../main/java/org/apache/calcite/adapter/geode/util/package-info.java | 3 ---
kafka/src/main/java/org/apache/calcite/adapter/kafka/package-info.java | 3 ---
.../src/main/java/org/apache/calcite/linq4j/function/package-info.java | 3 ---
linq4j/src/main/java/org/apache/calcite/linq4j/package-info.java | 1 -
linq4j/src/main/java/org/apache/calcite/linq4j/tree/package-info.java | 3 ---
linq4j/src/test/java/com/example/package-info.java | 3 ---
.../src/test/java/org/apache/calcite/linq4j/function/package-info.java | 3 ---
linq4j/src/test/java/org/apache/calcite/linq4j/test/package-info.java | 3 ---
linq4j/src/test/java/org/apache/calcite/linq4j/tree/package-info.java | 3 ---
.../src/main/java/org/apache/calcite/adapter/mongodb/package-info.java | 3 ---
pig/src/main/java/org/apache/calcite/adapter/pig/package-info.java | 3 ---
piglet/src/main/java/org/apache/calcite/piglet/package-info.java | 3 ---
plus/src/main/java/org/apache/calcite/adapter/os/package-info.java | 3 ---
plus/src/main/java/org/apache/calcite/adapter/tpcds/package-info.java | 3 ---
plus/src/main/java/org/apache/calcite/adapter/tpch/package-info.java | 3 ---
plus/src/main/java/org/apache/calcite/chinook/package-info.java | 3 ---
server/src/main/java/org/apache/calcite/sql/ddl/package-info.java | 3 ---
spark/src/main/java/org/apache/calcite/adapter/spark/package-info.java | 3 ---
.../src/main/java/org/apache/calcite/adapter/splunk/package-info.java | 3 ---
.../java/org/apache/calcite/adapter/splunk/search/package-info.java | 3 ---
.../main/java/org/apache/calcite/adapter/splunk/util/package-info.java | 3 ---
.../src/main/jmh/org/apache/calcite/benchmarks/package-info.java | 3 ---
87 files changed, 259 deletions(-)
diff --git a/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java b/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java
index 498513a..b5c8540 100644
--- a/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java
+++ b/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java
@@ -18,9 +18,6 @@
/**
* Parse tree for SQL extensions used by the Babel parser.
*/
-@PackageMarker
package org.apache.calcite.sql.babel;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java
index c4be45a..bd56f6a 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java
@@ -20,9 +20,6 @@
*
* <p>There is one table for each Cassandra column family.</p>
*/
-@PackageMarker
package org.apache.calcite.adapter.cassandra;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 e7f4b89..eef12e2 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,9 +18,6 @@
/**
* Provides utility classes.
*/
-@PackageMarker
package org.apache.calcite.adapter.clone;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 b1b2aad..d1df993 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,9 +18,6 @@
/**
* 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
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 5d29f8b..5751e7c 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,9 +18,6 @@
/**
* 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
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 58da953..4d66ffe 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,9 +19,6 @@
* 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
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 ba2bdd8..92990dd 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,9 +18,6 @@
/**
* 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
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 29084db..697412a 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,9 +37,6 @@
* </pre>
* </blockquote>
*/
-@PackageMarker
package org.apache.calcite.adapter;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 dcfc9af..b6d2ddb 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,9 +18,6 @@
/**
* Configuration.
*/
-@PackageMarker
package org.apache.calcite.config;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 19e8bca..c2e152f 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,9 +22,6 @@
* 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
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 63af3b2..40b3744 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,9 +18,6 @@
/**
* JDBC driver for Calcite.
*/
-@PackageMarker
package org.apache.calcite.jdbc;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 a68f5b9..0aab1ca 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,9 +32,6 @@
* 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
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 d7cbed7..b0abc14 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
@@ -33,9 +33,6 @@
* <p>There are several examples of schemas in the
* <a href="https://calcite.apache.org/docs/tutorial.html">tutorial</a>.
*/
-@PackageMarker
package org.apache.calcite.model;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 8a4d228..87ef21f 100644
--- a/core/src/main/java/org/apache/calcite/package-info.java
+++ b/core/src/main/java/org/apache/calcite/package-info.java
@@ -18,9 +18,6 @@
/**
* 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
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 55962c1..424ad80 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,9 +19,6 @@
* 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
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 057bbec..e6fecd2 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,9 +19,6 @@
* 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
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 a3816f6..0dd4fa4 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,9 +268,6 @@
* McKenna
* (1993)</a>.</p>
*/
-@PackageMarker
package org.apache.calcite.plan.volcano;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 e8868ad..0d4dd6e 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,9 +18,6 @@
/**
* Preparation of queries (parsing, planning and implementation).
*/
-@PackageMarker
package org.apache.calcite.prepare;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/profile/package-info.java b/core/src/main/java/org/apache/calcite/profile/package-info.java
index c30e9e0..1af9951 100644
--- a/core/src/main/java/org/apache/calcite/profile/package-info.java
+++ b/core/src/main/java/org/apache/calcite/profile/package-info.java
@@ -18,9 +18,6 @@
/**
* Utilities to analyze data sets.
*/
-@PackageMarker
package org.apache.calcite.profile;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 e3cf961..cf1032c 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,9 +19,6 @@
* 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
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 3f302e0..2e547fb 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,9 +31,6 @@
*
* </ul>
*/
-@PackageMarker
package org.apache.calcite.rel.core;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 d418734..d5897ff 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,9 +19,6 @@
* 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
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/package-info.java b/core/src/main/java/org/apache/calcite/rel/hint/package-info.java
index e00c6d6..968c7cb 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/package-info.java
@@ -89,9 +89,6 @@
* <h2>Design Doc</h2>
* <a href="https://docs.google.com/document/d/1mykz-w2t1Yw7CH6NjUWpWqCAf_6YNKxSc59gXafrNCs/edit?usp=sharing">Calcite SQL and Planner Hints Design</a>.
*/
-@PackageMarker
package org.apache.calcite.rel.hint;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 c8f8d7e..3317ac1 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,9 +31,6 @@
*
* </ul>
*/
-@PackageMarker
package org.apache.calcite.rel.logical;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 e644578..ed98035 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,9 +19,6 @@
* 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
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java b/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java
index c932029..bad84ec 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java
@@ -31,9 +31,6 @@
*
* </ul>
*/
-@PackageMarker
package org.apache.calcite.rel.mutable;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 ad7b366..fdbfd3b 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,9 +35,6 @@
*
* </ul>
*/
-@PackageMarker
package org.apache.calcite.rel;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java
index 8339ac5..23a214a 100644
--- a/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java
@@ -18,9 +18,6 @@
/**
* Translates a relational expression to SQL parse tree.
*/
-@PackageMarker
package org.apache.calcite.rel.rel2sql;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 54b1e57..ba83e74 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,9 +47,6 @@
* provides an optimizer interface.</li>
* </ul>
*/
-@PackageMarker
package org.apache.calcite.rel.rules;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/stream/package-info.java b/core/src/main/java/org/apache/calcite/rel/stream/package-info.java
index 12c680a..46278b8 100644
--- a/core/src/main/java/org/apache/calcite/rel/stream/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/stream/package-info.java
@@ -27,9 +27,6 @@
*
* </ul>
*/
-@PackageMarker
package org.apache.calcite.rel.stream;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 4703294..7c2e251 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,9 +18,6 @@
/**
* 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
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 e0f4007..b776422 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,9 +79,6 @@
*
* </ul>
*/
-@PackageMarker
package org.apache.calcite.rex;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 1f14156..25e404f 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,9 +18,6 @@
/**
* Utilities required at runtime.
*/
-@PackageMarker
package org.apache.calcite.runtime;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 dc8fb2a..8b918de 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,9 +18,6 @@
/**
* 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
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 4a24038..bded44c 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,9 +22,6 @@
* 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
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 b24ef1e..5de3ce7 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,9 +18,6 @@
/**
* Provides a server for hosting Calcite connections.
*/
-@PackageMarker
package org.apache.calcite.server;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 2530250..a30a886 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,9 +24,6 @@
* <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
diff --git a/core/src/main/java/org/apache/calcite/sql/dialect/package-info.java b/core/src/main/java/org/apache/calcite/sql/dialect/package-info.java
index 348e27f..b5f4663 100644
--- a/core/src/main/java/org/apache/calcite/sql/dialect/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/dialect/package-info.java
@@ -18,9 +18,6 @@
/**
* SQL unparsers for JDBC dialects.
*/
-@PackageMarker
package org.apache.calcite.sql.dialect;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 6cee38b..bd996ce 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,9 +27,6 @@
* 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
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 104a6e9..96cb2db 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
@@ -91,9 +91,6 @@
* {@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
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 0d996bd..281cf49 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,9 +19,6 @@
* 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
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 0105fc6..f518710 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,9 +18,6 @@
/**
* Provides a SQL parser.
*/
-@PackageMarker
package org.apache.calcite.sql.parser;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 b234699..bd30861 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,9 +18,6 @@
/**
* 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
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 2e7bee3..8a396f4 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,9 +18,6 @@
/**
* SQL type system.
*/
-@PackageMarker
package org.apache.calcite.sql.type;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 9dd51aa..22f73b5 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,9 +18,6 @@
/**
* 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
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/implicit/package-info.java b/core/src/main/java/org/apache/calcite/sql/validate/implicit/package-info.java
index 66eb30c..e191b20 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/implicit/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/implicit/package-info.java
@@ -79,9 +79,6 @@
*
* <p>See <a href="https://docs.google.com/spreadsheets/d/1GhleX5h5W8-kJKh7NMJ4vtoE78pwfaZRJl88ULX_MgU/edit?usp=sharing">CalciteImplicitCasts</a>.
*/
-@PackageMarker
package org.apache.calcite.sql.validate.implicit;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 c79be93..d904da3 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,9 +18,6 @@
/**
* SQL validation.
*/
-@PackageMarker
package org.apache.calcite.sql.validate;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 865e358..0b0aa01 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,9 +18,6 @@
/**
* 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
diff --git a/core/src/main/java/org/apache/calcite/statistic/package-info.java b/core/src/main/java/org/apache/calcite/statistic/package-info.java
index e5abe29..ff59cf7 100644
--- a/core/src/main/java/org/apache/calcite/statistic/package-info.java
+++ b/core/src/main/java/org/apache/calcite/statistic/package-info.java
@@ -20,9 +20,6 @@
*
* @see org.apache.calcite.materialize.SqlStatisticProvider
*/
-@PackageMarker
package org.apache.calcite.statistic;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 a8c5ffa..3273ae2 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,9 +18,6 @@
/**
* Provides utility classes.
*/
-@PackageMarker
package org.apache.calcite.tools;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 5b7c017..69d3018 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,9 +18,6 @@
/**
* Graph-theoretic algorithms and data structures.
*/
-@PackageMarker
package org.apache.calcite.util.graph;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 36e2f29..aabcd55 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,9 +18,6 @@
/**
* Provides compilers for Java code.
*/
-@PackageMarker
package org.apache.calcite.util.javac;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 1a344a8..2a994ca 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,9 +18,6 @@
/**
* Support for algebraic maps.
*/
-@PackageMarker
package org.apache.calcite.util.mapping;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 6e0e35d..ba2185f 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,9 +18,6 @@
/**
* Provides utility classes.
*/
-@PackageMarker
package org.apache.calcite.util;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 6fd7c64..282bbc9 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,9 +18,6 @@
/**
* Tracing services.
*/
-@PackageMarker
package org.apache.calcite.util.trace;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 b682479..9d3e4ec 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,9 +18,6 @@
/**
* Regression tests for the SQL model.
*/
-@PackageMarker
package org.apache.calcite.sql.test;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 4d84965..9d6f1e4 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
@@ -313,9 +313,6 @@
* </ul>
*
*/
-@PackageMarker
package org.apache.calcite.test.concurrent;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 42f302a..0b3113d 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,9 +18,6 @@
/**
* Tests for Enumerable convention runtime.
*/
-@PackageMarker
package org.apache.calcite.test.enumerable;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 291e3ee..013b476 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,9 +18,6 @@
/**
* Tests for Calcite.
*/
-@PackageMarker
package org.apache.calcite.test;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/package-info.java b/druid/src/main/java/org/apache/calcite/adapter/druid/package-info.java
index 5ed7471..164b82e 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/package-info.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/package-info.java
@@ -18,9 +18,6 @@
/**
* Query provider based on a Druid database.
*/
-@PackageMarker
package org.apache.calcite.adapter.druid;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/package-info.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/package-info.java
index ee49d60..f694268 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/package-info.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/package-info.java
@@ -18,9 +18,6 @@
/**
* Query provider based on an Elasticsearch2 DB.
*/
-@PackageMarker
package org.apache.calcite.adapter.elasticsearch;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 48275c2..f4b2d6e 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,9 +22,6 @@
* 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
diff --git a/example/function/src/main/java/org/apache/calcite/example/maze/package-info.java b/example/function/src/main/java/org/apache/calcite/example/maze/package-info.java
index 9c2072a..f9dda81 100644
--- a/example/function/src/main/java/org/apache/calcite/example/maze/package-info.java
+++ b/example/function/src/main/java/org/apache/calcite/example/maze/package-info.java
@@ -18,9 +18,6 @@
/**
* User-defined table function that generates a maze.
*/
-@PackageMarker
package org.apache.calcite.example.maze;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/geode/src/main/java/org/apache/calcite/adapter/geode/rel/package-info.java b/geode/src/main/java/org/apache/calcite/adapter/geode/rel/package-info.java
index 468b28e..f406187 100644
--- a/geode/src/main/java/org/apache/calcite/adapter/geode/rel/package-info.java
+++ b/geode/src/main/java/org/apache/calcite/adapter/geode/rel/package-info.java
@@ -18,9 +18,6 @@
/**
* Query provider based on Apache Geode (Gemfire) In Memory Data Grid
*/
-@PackageMarker
package org.apache.calcite.adapter.geode.rel;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/geode/src/main/java/org/apache/calcite/adapter/geode/simple/package-info.java b/geode/src/main/java/org/apache/calcite/adapter/geode/simple/package-info.java
index 7f15530..3e1d44d 100644
--- a/geode/src/main/java/org/apache/calcite/adapter/geode/simple/package-info.java
+++ b/geode/src/main/java/org/apache/calcite/adapter/geode/simple/package-info.java
@@ -18,9 +18,6 @@
/**
* Query provider based on Apache Geode (Gemfire) In Memory Data Grid
*/
-@PackageMarker
package org.apache.calcite.adapter.geode.simple;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/geode/src/main/java/org/apache/calcite/adapter/geode/util/package-info.java b/geode/src/main/java/org/apache/calcite/adapter/geode/util/package-info.java
index b876717..622d24f 100644
--- a/geode/src/main/java/org/apache/calcite/adapter/geode/util/package-info.java
+++ b/geode/src/main/java/org/apache/calcite/adapter/geode/util/package-info.java
@@ -18,9 +18,6 @@
/**
* Query provider based on Apache Geode (Gemfire) In Memory Data Grid
*/
-@PackageMarker
package org.apache.calcite.adapter.geode.util;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/kafka/src/main/java/org/apache/calcite/adapter/kafka/package-info.java b/kafka/src/main/java/org/apache/calcite/adapter/kafka/package-info.java
index a303c70..8805de3 100644
--- a/kafka/src/main/java/org/apache/calcite/adapter/kafka/package-info.java
+++ b/kafka/src/main/java/org/apache/calcite/adapter/kafka/package-info.java
@@ -20,9 +20,6 @@
*
* <p>One Kafka topic is mapping to one STREAM table.</p>
*/
-@PackageMarker
package org.apache.calcite.adapter.kafka;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 e71fac5..38d9319 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,9 +18,6 @@
/**
* Contains definitions of functions and predicates.
*/
-@PackageMarker
package org.apache.calcite.linq4j.function;
-import org.apache.calcite.linq4j.PackageMarker;
-
// End 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 7e90007..0288428 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,7 +18,6 @@
/**
* Language-integrated query for Java (linq4j) main package.
*/
-@PackageMarker
package org.apache.calcite.linq4j;
// End 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 5d31bc5..f8aa0e9 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,9 +25,6 @@
* 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
diff --git a/linq4j/src/test/java/com/example/package-info.java b/linq4j/src/test/java/com/example/package-info.java
index d994aa4..21f6bda 100644
--- a/linq4j/src/test/java/com/example/package-info.java
+++ b/linq4j/src/test/java/com/example/package-info.java
@@ -18,9 +18,6 @@
/**
* Examples of using linq4j.
*/
-@PackageMarker
package com.example;
-import org.apache.calcite.linq4j.PackageMarker;
-
// End 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 e457e3d..0871e72 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,9 +18,6 @@
/**
* Tests for functions.
*/
-@PackageMarker
package org.apache.calcite.linq4j.function;
-import org.apache.calcite.linq4j.PackageMarker;
-
// End 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 3b120b4..9745b87 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,9 +18,6 @@
/**
* Core linq4j tests.
*/
-@PackageMarker
package org.apache.calcite.linq4j.test;
-import org.apache.calcite.linq4j.PackageMarker;
-
// End 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 86d8d9d..655a4f5 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,9 +18,6 @@
/**
* Tests for expressions.
*/
-@PackageMarker
package org.apache.calcite.linq4j.tree;
-import org.apache.calcite.linq4j.PackageMarker;
-
// End 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 4092ab7..e56ecbd 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,9 +18,6 @@
/**
* 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
diff --git a/pig/src/main/java/org/apache/calcite/adapter/pig/package-info.java b/pig/src/main/java/org/apache/calcite/adapter/pig/package-info.java
index 9bb298d..7d26a8a 100644
--- a/pig/src/main/java/org/apache/calcite/adapter/pig/package-info.java
+++ b/pig/src/main/java/org/apache/calcite/adapter/pig/package-info.java
@@ -19,9 +19,6 @@
* Pig query provider.
*
*/
-@PackageMarker
package org.apache.calcite.adapter.pig;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/piglet/src/main/java/org/apache/calcite/piglet/package-info.java b/piglet/src/main/java/org/apache/calcite/piglet/package-info.java
index 63d5365..4dd852a 100644
--- a/piglet/src/main/java/org/apache/calcite/piglet/package-info.java
+++ b/piglet/src/main/java/org/apache/calcite/piglet/package-info.java
@@ -16,9 +16,6 @@
*/
/** Piglet, a Pig-like language. */
-@PackageMarker
package org.apache.calcite.piglet;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/plus/src/main/java/org/apache/calcite/adapter/os/package-info.java b/plus/src/main/java/org/apache/calcite/adapter/os/package-info.java
index e3e94fa..e2aa9c0 100644
--- a/plus/src/main/java/org/apache/calcite/adapter/os/package-info.java
+++ b/plus/src/main/java/org/apache/calcite/adapter/os/package-info.java
@@ -19,9 +19,6 @@
* The OS adapter contains various table functions that let you query data
* sources in your operating system and environment.
*/
-@PackageMarker
package org.apache.calcite.adapter.os;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 9494321..d9e6115 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,9 +18,6 @@
/**
* TPC-DS schema.
*/
-@PackageMarker
package org.apache.calcite.adapter.tpcds;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 44039fd..fc18259 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,9 +18,6 @@
/**
* TPC-H schema.
*/
-@PackageMarker
package org.apache.calcite.adapter.tpch;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/plus/src/main/java/org/apache/calcite/chinook/package-info.java b/plus/src/main/java/org/apache/calcite/chinook/package-info.java
index cd46445..15f45db 100644
--- a/plus/src/main/java/org/apache/calcite/chinook/package-info.java
+++ b/plus/src/main/java/org/apache/calcite/chinook/package-info.java
@@ -18,9 +18,6 @@
/**
* End to end tests.
*/
-@PackageMarker
package org.apache.calcite.chinook;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/server/src/main/java/org/apache/calcite/sql/ddl/package-info.java b/server/src/main/java/org/apache/calcite/sql/ddl/package-info.java
index 89ff42f..2075cbc 100644
--- a/server/src/main/java/org/apache/calcite/sql/ddl/package-info.java
+++ b/server/src/main/java/org/apache/calcite/sql/ddl/package-info.java
@@ -27,9 +27,6 @@
* the parser and its supporting classes into your own module, rather than try
* to extend this one.
*/
-@PackageMarker
package org.apache.calcite.sql.ddl;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End 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 9e2d968..c41ab52 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,9 +18,6 @@
/**
* 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
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 6e2fcef..269d500 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,9 +22,6 @@
* "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
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 7d6df6e..7167666 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,9 +18,6 @@
/**
* 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
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 3dbf2f0..04bdbf2 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,9 +18,6 @@
/**
* Utilities for RPC to Splunk.
*/
-@PackageMarker
package org.apache.calcite.adapter.splunk.util;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/package-info.java b/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/package-info.java
index 3146cae..d6d91a6 100644
--- a/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/package-info.java
+++ b/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/package-info.java
@@ -18,9 +18,6 @@
/**
* JMH benchmarks for Calcite
*/
-@PackageMarker
package org.apache.calcite.benchmarks;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java