From 416e0417addda95b3e19e13750b667ec46c0c0ea Mon Sep 17 00:00:00 2001
From: khadgarmage <khadgar.mage@outlook.com>
Date: Sat, 21 Mar 2020 20:23:13 +0800
Subject: [PATCH] license and checkoutv2 fix (#2261)

---
 .github/workflows/ci_ut.yml                   | 10 +++---
 .../DOLPHIN/1.2.1/package/scripts/params.py   |  4 +--
 docker/docker-compose.yml                     | 15 ++++++++
 dolphinscheduler-remote/pom.xml               | 17 ++++++++-
 dolphinscheduler-service/pom.xml              | 17 ++++++++-
 .../src/lib/external/config.js                | 18 +++++++++-
 dolphinscheduler-ui/src/lib/external/email.js | 16 +++++++++
 e2e/pom.xml                                   | 16 +++++++++
 e2e/testng.xml                                | 16 +++++++++
 pom.xml                                       | 36 +++++++++----------
 10 files changed, 136 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci_ut.yml b/.github/workflows/ci_ut.yml
index 12f7c04ed..95dfed811 100644
--- a/.github/workflows/ci_ut.yml
+++ b/.github/workflows/ci_ut.yml
@@ -48,6 +48,11 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - name: Git fetch unshallow
+        run: |
+          git fetch --unshallow
+          git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+          git fetch origin
       - name: Compile
         run: |
           export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
@@ -56,11 +61,6 @@ jobs:
         if: github.event_name == 'pull_request'
         run: |
           CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)
-      - name: Git fetch unshallow
-        run: |
-          git fetch --unshallow
-          git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-          git fetch origin
       - name: Run SonarCloud Analysis
         run: >
           mvn verify --batch-mode
diff --git a/ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py b/ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
index 3780f6c27..93b324961 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
+++ b/ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
@@ -7,16 +7,16 @@ 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
+    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.
-
 """
 
+
 import sys
 from resource_management import *
 from resource_management.core.logger import Logger
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index de5908583..7e9c4e57c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,3 +1,18 @@
+# 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.
 version: '2'
 services:
   zookeeper:
diff --git a/dolphinscheduler-remote/pom.xml b/dolphinscheduler-remote/pom.xml
index 39c7c6a7c..0968e610b 100644
--- a/dolphinscheduler-remote/pom.xml
+++ b/dolphinscheduler-remote/pom.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+  ~ 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.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
diff --git a/dolphinscheduler-service/pom.xml b/dolphinscheduler-service/pom.xml
index 03bb94dc2..c150e834b 100644
--- a/dolphinscheduler-service/pom.xml
+++ b/dolphinscheduler-service/pom.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+  ~ 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.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
diff --git a/dolphinscheduler-ui/src/lib/external/config.js b/dolphinscheduler-ui/src/lib/external/config.js
index ac47c1ac7..497540be7 100644
--- a/dolphinscheduler-ui/src/lib/external/config.js
+++ b/dolphinscheduler-ui/src/lib/external/config.js
@@ -1,7 +1,23 @@
+/*
+ * 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.
+ */
 /**
  * project external config
  */
 export default {
   // task record switch
   recordSwitch:false
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-ui/src/lib/external/email.js b/dolphinscheduler-ui/src/lib/external/email.js
index 9398c1012..6b10efbf0 100644
--- a/dolphinscheduler-ui/src/lib/external/email.js
+++ b/dolphinscheduler-ui/src/lib/external/email.js
@@ -1 +1,17 @@
+/*
+ * 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.
+ */
 export default ["test@analysys.com.cn"]
diff --git a/e2e/pom.xml b/e2e/pom.xml
index ea67c0ca1..a5bdf69b4 100644
--- a/e2e/pom.xml
+++ b/e2e/pom.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/e2e/testng.xml b/e2e/testng.xml
index 56c964913..539d383a5 100644
--- a/e2e/testng.xml
+++ b/e2e/testng.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ 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.
+  -->
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 <suite name="dolphinscheduler_e2e" parallel="true">
     <test name="dolphinscheduler_test" preserve-order="true">
diff --git a/pom.xml b/pom.xml
index 6c864e77f..46712fb9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -774,25 +774,23 @@
                 <artifactId>apache-rat-plugin</artifactId>
                 <version>${apache.rat.version}</version>
                 <configuration>
-                    <includes>
-                        <include>**/*.java</include>
-                        <include>**/dolphinscheduler-ui/src/**/*.scss</include>
-                        <include>**/dolphinscheduler-ui/src/**/*.css</include>
-                        <include>**/dolphinscheduler-ui/src/**/*.vue</include>
-                        <include>**/dolphinscheduler-ui/src/**/*.js</include>
-                        <include>**/dolphinscheduler-ui/src/**/*.html</include>
-                    </includes>
                     <excludes>
-                        <exclude>**/dolphinscheduler-ui/src/lib/**</exclude>
-                        <exclude>**/dolphinscheduler-ui/src/js/module/util/cookie.js</exclude>
-                        <exclude>**/dolphinscheduler-ui/src/font/awesome/font-awesome.css</exclude>
-                        <exclude>**/dolphinscheduler-ui/src/sass/common/_animation.scss</exclude>
-                        <exclude>**/dolphinscheduler-ui/src/sass/common/_normalize.scss</exclude>
-                        <exclude>**/dolphinscheduler-ui/src/combo/1.0.0/es5.js</exclude>
-                        <exclude>**/dolphinscheduler-ui/src/combo/1.0.0/base.css</exclude>
-                        <exclude>**/dolphinscheduler-ui/src/view/common/outro.inc</exclude>
-                        <exclude>**/dolphinscheduler-ui/src/view/common/meta.inc</exclude>
-                        <exclude>**/dolphinscheduler-ui/src/combo/1.0.0/3rd.css</exclude>
+                        <exclude>**/node_modules/**</exclude>
+                        <exclude>**/node/**</exclude>
+                        <exclude>**/dist/**</exclude>
+                        <exclude>**/licenses/**</exclude>
+                        <exclude>**/src/sass/common/_animation.scss</exclude>
+                        <exclude>**/src/sass/common/_normalize.scss</exclude>
+                        <exclude>.github/**</exclude>
+                        <exclude>sql/soft_version</exclude>
+                        <exclude>**/*.json</exclude>
+                        <!-- document files -->
+                        <exclude>**/*.md</exclude>
+                        <excldue>**/*.MD</excldue>
+                        <exclude>**/*.txt</exclude>
+                        <exclude>**/docs/**</exclude>
+                        <exclude>**/*.babelrc</exclude>
+                        <exclude>**/*.eslintrc</exclude>
                     </excludes>
                     <consoleOutput>true</consoleOutput>
                 </configuration>
@@ -884,4 +882,4 @@
         <module>dolphinscheduler-service</module>
     </modules>
 
-</project>
\ No newline at end of file
+</project>
-- 
GitLab