diff --git a/.travis.yml b/.travis.yml index fe678b279..5d1bfdfc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,3 @@ -# -# 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. -# - -sudo: required - -dist: xenial language: scala scala: - 2.12.10 @@ -60,6 +40,3 @@ script: after_success: - bash <(curl -s https://codecov.io/bash) - -after_failure: - - for log in `find * -name "unit-tests.log"`; do echo "=========$log========="; cat $log; done diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/package.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/package.scala index ff0e72086..f09cd7cf3 100644 --- a/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/package.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/package.scala @@ -92,7 +92,6 @@ package object authentication { " applicable only if Kyuubi is configured to use Kerberos authentication.") .version("1.0.0") .stringConf - .checkValues(SaslQOP.values.map(_.toString)) .transform(_.toLowerCase(Locale.ROOT)) .createWithDefault(SaslQOP.AUTH.toString) } diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/service/authentication/SaslQOPSuite.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/service/authentication/SaslQOPSuite.scala deleted file mode 100644 index e9acf7689..000000000 --- a/kyuubi-common/src/test/scala/org/apache/kyuubi/service/authentication/SaslQOPSuite.scala +++ /dev/null @@ -1,38 +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. - */ - -package org.apache.kyuubi.service.authentication - -import org.apache.kyuubi.KyuubiFunSuite -import org.apache.kyuubi.config.KyuubiConf - -class SaslQOPSuite extends KyuubiFunSuite { - - test("sasl qop") { - val conf = KyuubiConf(false) - assert(conf.get(SASL_QOP) === SaslQOP.AUTH.toString) - SaslQOP.values.foreach { q => - conf.set(SASL_QOP, q.toString) - assert(SaslQOP.withName(conf.get(SASL_QOP)) === q) - } - conf.set(SASL_QOP, "abc") - val e = intercept[IllegalArgumentException](conf.get(SASL_QOP)) - assert(e.getMessage === - "The value of kyuubi.sasl.qop should be one of auth, auth-conf, auth-int, but was abc") - } - -} diff --git a/kyuubi-server/pom.xml b/kyuubi-server/pom.xml index 7a7b018e3..ac61ff3de 100644 --- a/kyuubi-server/pom.xml +++ b/kyuubi-server/pom.xml @@ -63,28 +63,28 @@ - org.apache.spark + ${spark.group} spark-sql_${scala.binary.version} ${spark.version2} ${spark.scope} - org.apache.spark + ${spark.group} spark-hive_${scala.binary.version} ${spark.version2} ${spark.scope} - org.apache.spark + ${spark.group} spark-tags_${scala.binary.version} ${spark.version2} ${spark.scope} - org.apache.spark + ${spark.group} spark-yarn_${scala.binary.version} ${spark.version2} ${spark.scope} @@ -145,21 +145,21 @@ - org.apache.spark + ${spark.group} spark-core_${scala.binary.version} ${spark.version2} test-jar test - org.apache.spark + ${spark.group} spark-catalyst_${scala.binary.version} ${spark.version2} test-jar test - org.apache.spark + ${spark.group} spark-sql_${scala.binary.version} ${spark.version2} test-jar diff --git a/pom.xml b/pom.xml index b73c96153..46aa8868b 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.12.10 3.0.3 2.12 - 3.6.3 + 3.6.2 org.apache.spark 3.0.1 provided @@ -432,7 +432,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + ${maven.version} ${java.version} ${java.version} @@ -504,7 +504,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + 2.12.4 true @@ -577,13 +577,13 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.0.2 org.apache.maven.plugins maven-assembly-plugin - 3.2.0 + 3.1.0