merge from 1.3.1-release (#3161)

* merge from 1.3.1-release * [bugfix] remove Conflicting configuration sudo and user (#3038) Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> * remove some standard notices in order to cut down the NOTICE file. (#3101) * #3084 remove some standard notices in order to cut down the NOTICE file. * update exclude element sql/soft_version of rat plugin * update soft_version * merge from 1.3.1-release * fix 3112:download udf resource need find the tenant code of resource owner (#3114) * fix 3112:download udf resource need find the tenant code of resource owner * fix 2975:download resource need find the tenant code of resource owner * remove useless code * merge from 1.3.1-release * remove some notes (#3127) Co-authored-by: lenboo <baoliang@analysys.com.cn> * fix Permission denied if not found dolphinscheder-env.sh on 1.3.1 (#3128) * fix Permission denied if not found dolphinscheder-env.sh * update some comments on method * add PropertyPlaceholderHelper on license (#3129) * update license header location * add PropertyPlaceholderHelper on license * merge from 1.3.1-release * change from 1.3.0 to 1.3.2 * add Set import Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: zhangchunyang <zhangchunyang0123@gmail.com> Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> Co-authored-by: lgcareer <18610854716@163.com> Co-authored-by: lenboo <baoliang@analysys.com.cn>
apache · Jul 13, 2020 · 657ea47 · 657ea47
1 parent de41ac5
commit 657ea47
Show file tree

Hide file tree

Showing 34 changed files with 178 additions and 932 deletions.
diff --git a/LICENSE b/LICENSE
@@ -215,3 +215,4 @@ The following components are provided under the Apache License. See project link
 The text of each license is the standard Apache 2.0 license.
     ScriptRunner from https://github.com/mybatis/mybatis-3 Apache 2.0
     mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
+    PropertyPlaceholderHelper from https://github.com/spring-projects/spring-framework Apache 2.0
diff --git a/NOTICE b/NOTICE
@@ -72,4 +72,16 @@ Refactored SqlBuilder class (SQL, AbstractSQL)
    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.
+   limitations under the License.
+
+Spring Framework ${version}
+Copyright (c) 2002-${copyright} Pivotal, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the license.txt file.
diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.dolphinscheduler</groupId>
         <artifactId>dolphinscheduler</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT</version>
     </parent>
     <artifactId>dolphinscheduler-alert</artifactId>
     <name>${project.artifactId}</name>

diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.dolphinscheduler</groupId>
     <artifactId>dolphinscheduler</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
   </parent>
   <artifactId>dolphinscheduler-api</artifactId>
   <name>${project.artifactId}</name>

diff --git a/...nscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/Directory.java b/...nscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/Directory.java
@@ -1,5 +1,3 @@
-package org.apache.dolphinscheduler.api.dto.resources;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -16,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.dolphinscheduler.api.dto.resources;
+
 /**
  * directory
  */

diff --git a/...inscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/FileLeaf.java b/...inscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/FileLeaf.java
@@ -1,5 +1,3 @@
-package org.apache.dolphinscheduler.api.dto.resources;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -16,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.dolphinscheduler.api.dto.resources;
+
 /**
  * file leaf
  */

diff --git a/...er-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/ResourceComponent.java b/...er-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/ResourceComponent.java
@@ -1,11 +1,3 @@
-package org.apache.dolphinscheduler.api.dto.resources;
-
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.dolphinscheduler.common.enums.ResourceType;
-
-import java.util.ArrayList;
-import java.util.List;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,6 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.dolphinscheduler.api.dto.resources;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.dolphinscheduler.common.enums.ResourceType;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * resource component
  */

diff --git a/...uler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/Visitor.java b/...uler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/Visitor.java
@@ -1,8 +1,3 @@
-package org.apache.dolphinscheduler.api.dto.resources.visitor;
-
-
-import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,6 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.dolphinscheduler.api.dto.resources.visitor;
+
+import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
+
 /**
  * Visitor
  */

diff --git a/...pi/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java b/...pi/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java
@@ -50,20 +50,10 @@ public class LoginHandlerInterceptor implements HandlerInterceptor {
 
   /**
    * Intercept the execution of a handler. Called after HandlerMapping determined
-   * an appropriate handler object, but before HandlerAdapter invokes the handler.
-   * <p>DispatcherServlet processes a handler in an execution chain, consisting
-   * of any number of interceptors, with the handler itself at the end.
-   * With this method, each interceptor can decide to abort the execution chain,
-   * typically sending a HTTP error or writing a custom response.
-   * <p><strong>Note:</strong> special considerations apply for asynchronous
-   * request processing. For more details see
-   * {@link org.springframework.web.servlet.AsyncHandlerInterceptor}.
-   * @param request current HTTP request
-   * @param response current HTTP response
-   * @param handler chosen handler to execute, for type and/or instance evaluation
-   * @return {@code true} if the execution chain should proceed with the
-   * next interceptor or the handler itself. Else, DispatcherServlet assumes
-   * that this interceptor has already dealt with the response itself.
+   * @param request   current HTTP request
+   * @param response  current HTTP response
+   * @param handler   chosen handler to execute, for type and/or instance evaluation
+   * @return boolean true or false
    */
   @Override
   public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {

diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.dolphinscheduler</groupId>
 		<artifactId>dolphinscheduler</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>dolphinscheduler-common</artifactId>
 	<name>dolphinscheduler-common</name>

diff --git a/...nscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java b/...nscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
@@ -408,7 +408,7 @@ public boolean isYarnEnabled() {
      * @param applicationId application id
      * @return the return may be null or there may be other parse exceptions
      */
-    public ExecutionStatus getApplicationStatus(String applicationId) throws Exception{
+    public ExecutionStatus getApplicationStatus(String applicationId) throws Exception {
         if (StringUtils.isEmpty(applicationId)) {
             return null;
         }