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/18 22:30:52 UTC
[calcite-avatica] branch master updated (a183e3c -> 9c401b4)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git.
from a183e3c Sort dependencies, use api(javax.servlet), implementation(slf4j-api)
new fd82129 @PackageMarker is no longer needed
new f515bdf License header is managed with Spotless, there's no need to double-check it with Checkstyle
new 9c401b4 Whitespace is managed with Spotless, so the check is removed from Checkstyle config
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle.kts | 2 +-
.../java/org/apache/calcite/avatica/package-info.java | 3 ---
.../apache/calcite/avatica/remote/package-info.java | 3 ---
.../org/apache/calcite/avatica/util/package-info.java | 1 -
.../org/apache/calcite/avatica/test/package-info.java | 3 ---
.../avatica/metrics/dropwizard/package-info.java | 3 ---
.../calcite/avatica/metrics/noop/package-info.java | 3 ---
.../apache/calcite/avatica/metrics/package-info.java | 1 -
.../org/apache/calcite/avatica/noop/package-info.java | 1 -
.../apache/calcite/avatica/server/package-info.java | 3 ---
src/main/config/checkstyle/checker.xml | 19 -------------------
src/main/config/checkstyle/header.txt | 16 ----------------
.../calcite/avatica/standalone/package-info.java | 3 ---
.../org/apache/calcite/avatica/tck/package-info.java | 1 -
.../calcite/avatica/tck/tests/package-info.java | 3 ---
15 files changed, 1 insertion(+), 64 deletions(-)
delete mode 100644 src/main/config/checkstyle/header.txt
[calcite-avatica] 01/03: @PackageMarker is no longer needed
Posted by vl...@apache.org.
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-avatica.git
commit fd82129ec31b6a1df8f135acdae8cff6cf7e953a
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Tue Nov 19 01:25:51 2019 +0300
@PackageMarker is no longer needed
It helped to avoid recompilation in Maven, and it is no longer needed for Gradle
The annotation is kept as it was in public API
---
core/src/main/java/org/apache/calcite/avatica/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/avatica/remote/package-info.java | 3 ---
core/src/main/java/org/apache/calcite/avatica/util/package-info.java | 1 -
core/src/test/java/org/apache/calcite/avatica/test/package-info.java | 3 ---
.../org/apache/calcite/avatica/metrics/dropwizard/package-info.java | 3 ---
.../java/org/apache/calcite/avatica/metrics/noop/package-info.java | 3 ---
.../src/main/java/org/apache/calcite/avatica/metrics/package-info.java | 1 -
.../src/main/java/org/apache/calcite/avatica/noop/package-info.java | 1 -
.../src/main/java/org/apache/calcite/avatica/server/package-info.java | 3 ---
.../main/java/org/apache/calcite/avatica/standalone/package-info.java | 3 ---
tck/src/main/java/org/apache/calcite/avatica/tck/package-info.java | 1 -
.../main/java/org/apache/calcite/avatica/tck/tests/package-info.java | 3 ---
12 files changed, 28 deletions(-)
diff --git a/core/src/main/java/org/apache/calcite/avatica/package-info.java b/core/src/main/java/org/apache/calcite/avatica/package-info.java
index 89a9fbb..7aad356 100644
--- a/core/src/main/java/org/apache/calcite/avatica/package-info.java
+++ b/core/src/main/java/org/apache/calcite/avatica/package-info.java
@@ -18,9 +18,6 @@
/**
* Avatica JDBC framework.
*/
-@PackageMarker
package org.apache.calcite.avatica;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/package-info.java b/core/src/main/java/org/apache/calcite/avatica/remote/package-info.java
index 1cf3e14..280dfb3 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/package-info.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/package-info.java
@@ -18,9 +18,6 @@
/**
* 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
diff --git a/core/src/main/java/org/apache/calcite/avatica/util/package-info.java b/core/src/main/java/org/apache/calcite/avatica/util/package-info.java
index eab457c..f351e67 100644
--- a/core/src/main/java/org/apache/calcite/avatica/util/package-info.java
+++ b/core/src/main/java/org/apache/calcite/avatica/util/package-info.java
@@ -18,7 +18,6 @@
/**
* Avatica utilities.
*/
-@PackageMarker
package org.apache.calcite.avatica.util;
// End package-info.java
diff --git a/core/src/test/java/org/apache/calcite/avatica/test/package-info.java b/core/src/test/java/org/apache/calcite/avatica/test/package-info.java
index 501bb9f..7680316 100644
--- a/core/src/test/java/org/apache/calcite/avatica/test/package-info.java
+++ b/core/src/test/java/org/apache/calcite/avatica/test/package-info.java
@@ -18,9 +18,6 @@
/**
* Avatica tests.
*/
-@PackageMarker
package org.apache.calcite.avatica.test;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/metrics-dropwizardmetrics/src/main/java/org/apache/calcite/avatica/metrics/dropwizard/package-info.java b/metrics-dropwizardmetrics/src/main/java/org/apache/calcite/avatica/metrics/dropwizard/package-info.java
index 0104f20..4405edb 100644
--- a/metrics-dropwizardmetrics/src/main/java/org/apache/calcite/avatica/metrics/dropwizard/package-info.java
+++ b/metrics-dropwizardmetrics/src/main/java/org/apache/calcite/avatica/metrics/dropwizard/package-info.java
@@ -18,9 +18,6 @@
/**
* Dropwizard-Metrics (v3) implementation of the Avatica Metrics framework.
*/
-@PackageMarker
package org.apache.calcite.avatica.metrics.dropwizard;
-import org.apache.calcite.avatica.metrics.PackageMarker;
-
// End package-info.java
diff --git a/metrics/src/main/java/org/apache/calcite/avatica/metrics/noop/package-info.java b/metrics/src/main/java/org/apache/calcite/avatica/metrics/noop/package-info.java
index 826a655..f6adcbc 100644
--- a/metrics/src/main/java/org/apache/calcite/avatica/metrics/noop/package-info.java
+++ b/metrics/src/main/java/org/apache/calcite/avatica/metrics/noop/package-info.java
@@ -18,9 +18,6 @@
/**
* No-operation implementation for the Avatica Metrics framework.
*/
-@PackageMarker
package org.apache.calcite.avatica.metrics.noop;
-import org.apache.calcite.avatica.metrics.PackageMarker;
-
// End package-info.java
diff --git a/metrics/src/main/java/org/apache/calcite/avatica/metrics/package-info.java b/metrics/src/main/java/org/apache/calcite/avatica/metrics/package-info.java
index efed28c..1033627 100644
--- a/metrics/src/main/java/org/apache/calcite/avatica/metrics/package-info.java
+++ b/metrics/src/main/java/org/apache/calcite/avatica/metrics/package-info.java
@@ -18,7 +18,6 @@
/**
* Metrics for the Avatica framework.
*/
-@PackageMarker
package org.apache.calcite.avatica.metrics;
// End package-info.java
diff --git a/noop-driver/src/main/java/org/apache/calcite/avatica/noop/package-info.java b/noop-driver/src/main/java/org/apache/calcite/avatica/noop/package-info.java
index da1c5c4..b40653d 100644
--- a/noop-driver/src/main/java/org/apache/calcite/avatica/noop/package-info.java
+++ b/noop-driver/src/main/java/org/apache/calcite/avatica/noop/package-info.java
@@ -18,7 +18,6 @@
/**
* A no-operation implementation of a JDBC driver built for testing Avatica.
*/
-@PackageMarker
package org.apache.calcite.avatica.noop;
// End package-info.java
diff --git a/server/src/main/java/org/apache/calcite/avatica/server/package-info.java b/server/src/main/java/org/apache/calcite/avatica/server/package-info.java
index f2b8728..4b267bb 100644
--- a/server/src/main/java/org/apache/calcite/avatica/server/package-info.java
+++ b/server/src/main/java/org/apache/calcite/avatica/server/package-info.java
@@ -18,9 +18,6 @@
/**
* 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
diff --git a/standalone-server/src/main/java/org/apache/calcite/avatica/standalone/package-info.java b/standalone-server/src/main/java/org/apache/calcite/avatica/standalone/package-info.java
index 1adb260..fca5f79 100644
--- a/standalone-server/src/main/java/org/apache/calcite/avatica/standalone/package-info.java
+++ b/standalone-server/src/main/java/org/apache/calcite/avatica/standalone/package-info.java
@@ -18,9 +18,6 @@
/**
* Avatica Server without any authentication for any JDBC driver.
*/
-@PackageMarker
package org.apache.calcite.avatica.standalone;
-import org.apache.calcite.avatica.util.PackageMarker;
-
// End package-info.java
diff --git a/tck/src/main/java/org/apache/calcite/avatica/tck/package-info.java b/tck/src/main/java/org/apache/calcite/avatica/tck/package-info.java
index 77c2d16..823b38e 100644
--- a/tck/src/main/java/org/apache/calcite/avatica/tck/package-info.java
+++ b/tck/src/main/java/org/apache/calcite/avatica/tck/package-info.java
@@ -18,7 +18,6 @@
/**
* Avatica compatibility framework.
*/
-@PackageMarker
package org.apache.calcite.avatica.tck;
// End package-info.java
diff --git a/tck/src/main/java/org/apache/calcite/avatica/tck/tests/package-info.java b/tck/src/main/java/org/apache/calcite/avatica/tck/tests/package-info.java
index 940a1bd..85ea91c 100644
--- a/tck/src/main/java/org/apache/calcite/avatica/tck/tests/package-info.java
+++ b/tck/src/main/java/org/apache/calcite/avatica/tck/tests/package-info.java
@@ -18,9 +18,6 @@
/**
* Tests for the Avatica compatibility framework.
*/
-@PackageMarker
package org.apache.calcite.avatica.tck.tests;
-import org.apache.calcite.avatica.tck.PackageMarker;
-
// End package-info.java
[calcite-avatica] 03/03: Whitespace is managed with Spotless,
so the check is removed from Checkstyle config
Posted by vl...@apache.org.
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-avatica.git
commit 9c401b402941fbbf9bfa6f7f2d7c4adf2da53da5
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Tue Nov 19 01:29:49 2019 +0300
Whitespace is managed with Spotless, so the check is removed from Checkstyle config
---
build.gradle.kts | 2 +-
src/main/config/checkstyle/checker.xml | 12 ------------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 7756b1e..7f7157d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -324,7 +324,7 @@ allprojects {
)
removeUnusedImports()
trimTrailingWhitespace()
- indentWithSpaces(4)
+ indentWithSpaces(2)
endWithNewline()
}
}
diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml
index edf0de7..501cc19 100644
--- a/src/main/config/checkstyle/checker.xml
+++ b/src/main/config/checkstyle/checker.xml
@@ -37,18 +37,6 @@ limitations under the License.
<!-- Require package javadoc -->
<module name="JavadocPackage"/>
- <!-- Miscellaneous other checks (checker). -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <!-- Require files to end with newline characters -->
- <module name="NewlineAtEndOfFile">
- <property name="lineSeparator" value="lf"/>
- </module>
-
- <!-- Checks for whitespace (tree walker) -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <!-- No tabs allowed! -->
- <module name="FileTabCharacter"/>
-
<module name="TreeWalker">
<property name="cacheFile" value="target/checkstyle-cachefile"/>
[calcite-avatica] 02/03: License header is managed with Spotless,
there's no need to double-check it with Checkstyle
Posted by vl...@apache.org.
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-avatica.git
commit f515bdfb79b36b61d49aef93b9f4de8b13305571
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Tue Nov 19 01:26:32 2019 +0300
License header is managed with Spotless, there's no need to double-check it with Checkstyle
---
src/main/config/checkstyle/checker.xml | 7 -------
src/main/config/checkstyle/header.txt | 16 ----------------
2 files changed, 23 deletions(-)
diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml
index 7916684..edf0de7 100644
--- a/src/main/config/checkstyle/checker.xml
+++ b/src/main/config/checkstyle/checker.xml
@@ -32,13 +32,6 @@ limitations under the License.
<module name="Checker">
<property name="localeLanguage" value="en"/>
- <!-- Checks for headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <!-- Verify that EVERY source file has the appropriate license -->
- <module name="Header">
- <property name="headerFile" value="${checkstyle.header.file}"/>
- </module>
-
<!-- Checks for Javadoc comments (checker). -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<!-- Require package javadoc -->
diff --git a/src/main/config/checkstyle/header.txt b/src/main/config/checkstyle/header.txt
deleted file mode 100644
index 2a42971..0000000
--- a/src/main/config/checkstyle/header.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * 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.
- */