Skip to content

Commit 657ea47

Browse files
lenboodavidzollozhangchunyang1024zhangchunyang1024lgcareer
authored
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>
1 parent de41ac5 commit 657ea47

34 files changed

Lines changed: 178 additions & 932 deletions

File tree

‎LICENSE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,3 +215,4 @@ The following components are provided under the Apache License. See project link
215215
The text of each license is the standard Apache 2.0 license.
216216
ScriptRunner from https://github.com/mybatis/mybatis-3 Apache 2.0
217217
mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
218+
PropertyPlaceholderHelper from https://github.com/spring-projects/spring-framework Apache 2.0

‎NOTICE‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,16 @@ Refactored SqlBuilder class (SQL, AbstractSQL)
7272
distributed under the License is distributed on an "AS IS" BASIS,
7373
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
7474
See the License for the specific language governing permissions and
75-
limitations under the License.
75+
limitations under the License.
76+
77+
Spring Framework ${version}
78+
Copyright (c) 2002-${copyright} Pivotal, Inc.
79+
80+
This product is licensed to you under the Apache License, Version 2.0
81+
(the "License"). You may not use this product except in compliance with
82+
the License.
83+
84+
This product may include a number of subcomponents with separate
85+
copyright notices and license terms. Your use of the source code for
86+
these subcomponents is subject to the terms and conditions of the
87+
subcomponent's license, as noted in the license.txt file.

‎dolphinscheduler-alert/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.dolphinscheduler</groupId>
2323
<artifactId>dolphinscheduler</artifactId>
24-
<version>1.3.0-SNAPSHOT</version>
24+
<version>1.3.2-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>dolphinscheduler-alert</artifactId>
2727
<name>${project.artifactId}</name>

‎dolphinscheduler-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.dolphinscheduler</groupId>
2323
<artifactId>dolphinscheduler</artifactId>
24-
<version>1.3.0-SNAPSHOT</version>
24+
<version>1.3.2-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>dolphinscheduler-api</artifactId>
2727
<name>${project.artifactId}</name>

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/Directory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package org.apache.dolphinscheduler.api.dto.resources;
2-
31
/*
42
* Licensed to the Apache Software Foundation (ASF) under one or more
53
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +14,8 @@
1614
* See the License for the specific language governing permissions and
1715
* limitations under the License.
1816
*/
17+
package org.apache.dolphinscheduler.api.dto.resources;
18+
1919
/**
2020
* directory
2121
*/

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/FileLeaf.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package org.apache.dolphinscheduler.api.dto.resources;
2-
31
/*
42
* Licensed to the Apache Software Foundation (ASF) under one or more
53
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +14,8 @@
1614
* See the License for the specific language governing permissions and
1715
* limitations under the License.
1816
*/
17+
package org.apache.dolphinscheduler.api.dto.resources;
18+
1919
/**
2020
* file leaf
2121
*/

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/ResourceComponent.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
package org.apache.dolphinscheduler.api.dto.resources;
2-
3-
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
4-
import org.apache.dolphinscheduler.common.enums.ResourceType;
5-
6-
import java.util.ArrayList;
7-
import java.util.List;
8-
91
/*
102
* Licensed to the Apache Software Foundation (ASF) under one or more
113
* contributor license agreements. See the NOTICE file distributed with
@@ -22,6 +14,14 @@
2214
* See the License for the specific language governing permissions and
2315
* limitations under the License.
2416
*/
17+
package org.apache.dolphinscheduler.api.dto.resources;
18+
19+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
20+
import org.apache.dolphinscheduler.common.enums.ResourceType;
21+
22+
import java.util.ArrayList;
23+
import java.util.List;
24+
2525
/**
2626
* resource component
2727
*/

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/Visitor.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
package org.apache.dolphinscheduler.api.dto.resources.visitor;
2-
3-
4-
import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
5-
61
/*
72
* Licensed to the Apache Software Foundation (ASF) under one or more
83
* contributor license agreements. See the NOTICE file distributed with
@@ -19,6 +14,10 @@
1914
* See the License for the specific language governing permissions and
2015
* limitations under the License.
2116
*/
17+
package org.apache.dolphinscheduler.api.dto.resources.visitor;
18+
19+
import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
20+
2221
/**
2322
* Visitor
2423
*/

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,10 @@ public class LoginHandlerInterceptor implements HandlerInterceptor {
5050

5151
/**
5252
* Intercept the execution of a handler. Called after HandlerMapping determined
53-
* an appropriate handler object, but before HandlerAdapter invokes the handler.
54-
* <p>DispatcherServlet processes a handler in an execution chain, consisting
55-
* of any number of interceptors, with the handler itself at the end.
56-
* With this method, each interceptor can decide to abort the execution chain,
57-
* typically sending a HTTP error or writing a custom response.
58-
* <p><strong>Note:</strong> special considerations apply for asynchronous
59-
* request processing. For more details see
60-
* {@link org.springframework.web.servlet.AsyncHandlerInterceptor}.
61-
* @param request current HTTP request
62-
* @param response current HTTP response
63-
* @param handler chosen handler to execute, for type and/or instance evaluation
64-
* @return {@code true} if the execution chain should proceed with the
65-
* next interceptor or the handler itself. Else, DispatcherServlet assumes
66-
* that this interceptor has already dealt with the response itself.
53+
* @param request current HTTP request
54+
* @param response current HTTP response
55+
* @param handler chosen handler to execute, for type and/or instance evaluation
56+
* @return boolean true or false
6757
*/
6858
@Override
6959
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {

‎dolphinscheduler-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.dolphinscheduler</groupId>
2323
<artifactId>dolphinscheduler</artifactId>
24-
<version>1.3.0-SNAPSHOT</version>
24+
<version>1.3.2-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>dolphinscheduler-common</artifactId>
2727
<name>dolphinscheduler-common</name>

0 commit comments

Comments
 (0)