Revert "fix"

This reverts commit d97f71456b.
This commit is contained in:
Kent Yao 2020-09-22 18:33:11 +08:00
parent 944980ef80
commit 9f4ccdd70c
5 changed files with 12 additions and 74 deletions

View File

@ -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

View File

@ -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)
}

View File

@ -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")
}
}

View File

@ -63,28 +63,28 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<groupId>${spark.group}</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version2}</version>
<scope>${spark.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<groupId>${spark.group}</groupId>
<artifactId>spark-hive_${scala.binary.version}</artifactId>
<version>${spark.version2}</version>
<scope>${spark.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<groupId>${spark.group}</groupId>
<artifactId>spark-tags_${scala.binary.version}</artifactId>
<version>${spark.version2}</version>
<scope>${spark.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<groupId>${spark.group}</groupId>
<artifactId>spark-yarn_${scala.binary.version}</artifactId>
<version>${spark.version2}</version>
<scope>${spark.scope}</scope>
@ -145,21 +145,21 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<groupId>${spark.group}</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version2}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<groupId>${spark.group}</groupId>
<artifactId>spark-catalyst_${scala.binary.version}</artifactId>
<version>${spark.version2}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<groupId>${spark.group}</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version2}</version>
<type>test-jar</type>

10
pom.xml
View File

@ -61,7 +61,7 @@
<scala.version>2.12.10</scala.version>
<scalatest.version>3.0.3</scalatest.version>
<scala.binary.version>2.12</scala.binary.version>
<maven.version>3.6.3</maven.version>
<maven.version>3.6.2</maven.version>
<spark.group>org.apache.spark</spark.group>
<spark.version>3.0.1</spark.version>
<spark.scope>provided</spark.scope>
@ -432,7 +432,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>${maven.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@ -504,7 +504,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>2.12.4</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
@ -577,13 +577,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.2.0</version>
<version>3.1.0</version>
</plugin>
<plugin>