This is an automated email from the ASF dual-hosted git repository. xxyu pushed a commit to branch kylin5 in repository https://gitbox.apache.org/repos/asf/kylin.git
commit f760606ff3ed99a5189d0f66295a7515fa604220 Author: junqing.cai <junqing....@kyligence.io> AuthorDate: Wed Nov 9 20:19:13 2022 +0800 remove unused profile --- pom.xml | 1 - .../kylin/rest/controller/open/OpenUserController.java | 10 +++++----- .../java/org/apache/kylin/query/schema/OLAPTable.java | 18 ------------------ 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index c2bea76ab1..6ad384d72d 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,6 @@ <maven-model.version>3.3.9</maven-model.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <kylin.module.version>5.0.0-SNAPSHOT</kylin.module.version> <arthas.version>3.6.3-kyarthas-r2</arthas.version> <!-- Keep same order with dependencyManagement --> diff --git a/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenUserController.java b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenUserController.java index db19bb337a..0346534bbc 100644 --- a/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenUserController.java +++ b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenUserController.java @@ -26,16 +26,15 @@ import java.util.stream.Collectors; import org.apache.kylin.common.exception.KylinException; import org.apache.kylin.rest.constant.Constant; +import org.apache.kylin.rest.controller.NBasicController; +import org.apache.kylin.rest.controller.NUserController; import org.apache.kylin.rest.request.CachedUserUpdateRequest; +import org.apache.kylin.rest.request.PasswordChangeRequest; +import org.apache.kylin.rest.request.UserRequest; import org.apache.kylin.rest.response.DataResult; import org.apache.kylin.rest.response.EnvelopeResponse; import org.apache.kylin.rest.response.UserInfoResponse; import org.apache.kylin.rest.service.UserService; -import org.apache.kylin.metadata.user.ManagedUser; -import org.apache.kylin.rest.controller.NBasicController; -import org.apache.kylin.rest.controller.NUserController; -import org.apache.kylin.rest.request.PasswordChangeRequest; -import org.apache.kylin.rest.request.UserRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; @@ -49,6 +48,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.apache.kylin.metadata.user.ManagedUser; import io.swagger.annotations.ApiOperation; @Controller diff --git a/src/query-common/src/main/java/org/apache/kylin/query/schema/OLAPTable.java b/src/query-common/src/main/java/org/apache/kylin/query/schema/OLAPTable.java index 96e8fa02f4..9551f54bd0 100644 --- a/src/query-common/src/main/java/org/apache/kylin/query/schema/OLAPTable.java +++ b/src/query-common/src/main/java/org/apache/kylin/query/schema/OLAPTable.java @@ -16,24 +16,6 @@ * limitations under the License. */ -/* - * 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.kylin.query.schema; import java.util.ArrayList;