Unverified Commit 657ea475 authored by bao liang's avatar bao liang Committed by GitHub
Browse files

merge from 1.3.1-release (#3161) 



* merge from 1.3.1-release

* [bugfix] remove Conflicting configuration sudo and user (#3038)

Co-authored-by: default avatarzhangchunyang1024 <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: default avatarlenboo <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: default avatardailidong <dailidong66@gmail.com>
Co-authored-by: default avatarzhangchunyang <zhangchunyang0123@gmail.com>
Co-authored-by: default avatarzhangchunyang1024 <zhangchunyang0123@gamil.com>
Co-authored-by: default avatarlgcareer <18610854716@163.com>
Co-authored-by: default avatarlenboo <baoliang@analysys.com.cn>
parent de41ac50

LICENSE

+1 −0
Original line number Diff line number Diff line
@@ -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

NOTICE

+13 −1
Original line number Diff line number Diff line
@@ -73,3 +73,15 @@ Refactored SqlBuilder class (SQL, AbstractSQL) 
   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.



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.
 
 No newline at end of file

dolphinscheduler-alert/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

dolphinscheduler-api/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

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

+2 −2
Original line number Diff line number Diff line 
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 @@ package org.apache.dolphinscheduler.api.dto.resources; 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package org.apache.dolphinscheduler.api.dto.resources;



/**

 * directory

 */