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 2018/09/26 16:37:09 UTC
calcite git commit: Add license to TestKtTest and add
apache-rat:check to Travis CI
Repository: calcite
Updated Branches:
refs/heads/master d92d9964f -> 1306040bd
Add license to TestKtTest and add apache-rat:check to Travis CI
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/1306040b
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/1306040b
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/1306040b
Branch: refs/heads/master
Commit: 1306040bd3149d84d8b36f1b442fa5dc42afb73a
Parents: d92d996
Author: Vladimir Sitnikov <si...@gmail.com>
Authored: Wed Sep 26 17:38:53 2018 +0300
Committer: Vladimir Sitnikov <si...@gmail.com>
Committed: Wed Sep 26 19:36:40 2018 +0300
----------------------------------------------------------------------
.travis.yml | 5 +++--
.../test/kotlin/org/apache/calcite/TestKtTest.kt | 16 ++++++++++++++++
pom.xml | 2 +-
3 files changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/1306040b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b995fd0..c70cc17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ language: java
matrix:
fast_finish: true
include:
- - env: IMAGE=maven:3-jdk-11 JDOC=Y
+ - env: IMAGE=maven:3-jdk-11 JDOC=Y RAT=Y
- env: IMAGE=maven:3-jdk-10
- env: IMAGE=maven:3-jdk-9
- env: IMAGE=maven:3-jdk-8 JDOC=Y
@@ -45,7 +45,8 @@ script:
# Print surefire output to the console instead of files
- unset _JAVA_OPTIONS
- if [ $JDOC = "Y" ]; then export JDOC=javadoc:javadoc; fi
- - $DOCKERRUN $IMAGE mvn -Dcheckstyle.skip -Dsurefire.useFile=false -Dsurefire.threadCount=1 -Dsurefire.perCoreThreadCount=false -Djavax.net.ssl.trustStorePassword=changeit test $JDOC
+ - if [ $RAT = "Y" ]; then export RAT="apache-rat:check -Drat.consoleOutput"; fi
+ - $DOCKERRUN $IMAGE mvn -Dcheckstyle.skip -Dsurefire.useFile=false -Dsurefire.threadCount=1 -Dsurefire.perCoreThreadCount=false -Djavax.net.ssl.trustStorePassword=changeit test $JDOC $RAT
git:
depth: 10000
sudo: required
http://git-wip-us.apache.org/repos/asf/calcite/blob/1306040b/core/src/test/kotlin/org/apache/calcite/TestKtTest.kt
----------------------------------------------------------------------
diff --git a/core/src/test/kotlin/org/apache/calcite/TestKtTest.kt b/core/src/test/kotlin/org/apache/calcite/TestKtTest.kt
index 7d8e4fa..fab708a 100644
--- a/core/src/test/kotlin/org/apache/calcite/TestKtTest.kt
+++ b/core/src/test/kotlin/org/apache/calcite/TestKtTest.kt
@@ -1,3 +1,19 @@
+/*
+ * 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
import org.junit.Test
http://git-wip-us.apache.org/repos/asf/calcite/blob/1306040b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6783c91..7ad1e58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -647,7 +647,7 @@ limitations under the License.
<exclude>**/src/test/resources/**/*.txt</exclude>
<exclude>**/src/test/resources/bug/archers.json</exclude>
<exclude>**/src/test/resources/foodmart-schema.spec</exclude>
- <exclude>**/src/test/resources/zips-mini.json</exclude>
+ <exclude>**/src/test/resources/*.json</exclude>
<exclude>**/data.txt</exclude>
<exclude>**/data2.txt</exclude>