From f51ba3a94d465350966de258ba2a71b9bfe0a1f9 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Mon, 23 Mar 2020 13:51:39 +0800 Subject: [PATCH] [Chore] Fix license headers and rename E2E job name (#4551) * Fix license headers and rename E2E job name * Fix RAT plugin and enable both RAT and checkstyle plugin --- .github/workflows/e2e.yaml | 2 +- .github/workflows/plugins-test.yaml | 1 + pom.xml | 19 +++++++++++++- .../e2e-test/docker/cluster/download-mysql.sh | 15 +++++------ .../e2e-test/docker/profile/download-mysql.sh | 15 +++++------ test/e2e/e2e-test/docker/simple/ssl/hosts | 26 ------------------- .../e2e-test/docker/storage/download-mysql.sh | 15 +++++------ test/e2e/pom.xml | 11 ++++++++ 8 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 test/e2e/e2e-test/docker/simple/ssl/hosts diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 8ee9d812d..554f9b97b 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -80,7 +80,7 @@ jobs: name: logs path: logs - Gateway: + FeatureGroup03: name: Gateway runs-on: ubuntu-latest steps: diff --git a/.github/workflows/plugins-test.yaml b/.github/workflows/plugins-test.yaml index 4ad9a433a..4e5377d94 100644 --- a/.github/workflows/plugins-test.yaml +++ b/.github/workflows/plugins-test.yaml @@ -26,6 +26,7 @@ on: - 'test/plugin/**' - 'apm-application-toolkit/**' - '.github/workflows/plugins-test.yaml' + - '!test/e2e/**' jobs: Spring_Dubbo: diff --git a/pom.xml b/pom.xml index f2f95caf2..29bc8b4e5 100755 --- a/pom.xml +++ b/pom.xml @@ -385,6 +385,22 @@ apache-rat-plugin ${apache-rat-plugin.version} + false + false + + + AL20 + Apache License, 2.0 + + Licensed to the Apache Software Foundation (ASF) + + + + + + Apache License, 2.0 + + **/target/** **/licenses/** @@ -446,6 +462,7 @@ **/src/main/proto/google/** **/src/main/proto/istio/** **/src/main/proto/jaeger/** + **/src/main/proto/mixer/** **/src/main/proto/policy/** **/src/main/proto/prometheus/client_model/metrics.proto **/src/main/proto/protoc-gen-swagger/** @@ -456,7 +473,7 @@ **/src/main/resources/code-templates/*/*.ftl - .mvn/wrapper/maven-wrapper.properties + .mvn/wrapper/** tools/dependencies/known-oap-backend-dependencies.txt apm-checkstyle/CHECKSTYLE_HEAD diff --git a/test/e2e/e2e-test/docker/cluster/download-mysql.sh b/test/e2e/e2e-test/docker/cluster/download-mysql.sh index ede411e92..970937c93 100755 --- a/test/e2e/e2e-test/docker/cluster/download-mysql.sh +++ b/test/e2e/e2e-test/docker/cluster/download-mysql.sh @@ -1,11 +1,9 @@ -#!/usr/bin/env bash -# Licensed to the SkyAPM 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 +# 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 # @@ -14,6 +12,7 @@ # 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. +#!/usr/bin/env bash set -ex diff --git a/test/e2e/e2e-test/docker/profile/download-mysql.sh b/test/e2e/e2e-test/docker/profile/download-mysql.sh index ede411e92..970937c93 100755 --- a/test/e2e/e2e-test/docker/profile/download-mysql.sh +++ b/test/e2e/e2e-test/docker/profile/download-mysql.sh @@ -1,11 +1,9 @@ -#!/usr/bin/env bash -# Licensed to the SkyAPM 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 +# 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 # @@ -14,6 +12,7 @@ # 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. +#!/usr/bin/env bash set -ex diff --git a/test/e2e/e2e-test/docker/simple/ssl/hosts b/test/e2e/e2e-test/docker/simple/ssl/hosts deleted file mode 100644 index fca2eb290..000000000 --- a/test/e2e/e2e-test/docker/simple/ssl/hosts +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -# Licensed to the SkyAPM 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. - -# Host Database -# -# localhost is used to configure the loopback interface -# when the system is booting. Do not change this entry. -## -127.0.0.1 localhost -255.255.255.255 broadcasthost -::1 localhost -127.0.0.1 oap.skywalking diff --git a/test/e2e/e2e-test/docker/storage/download-mysql.sh b/test/e2e/e2e-test/docker/storage/download-mysql.sh index ede411e92..970937c93 100755 --- a/test/e2e/e2e-test/docker/storage/download-mysql.sh +++ b/test/e2e/e2e-test/docker/storage/download-mysql.sh @@ -1,11 +1,9 @@ -#!/usr/bin/env bash -# Licensed to the SkyAPM 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 +# 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 # @@ -14,6 +12,7 @@ # 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. +#!/usr/bin/env bash set -ex diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml index 0e37bb2f7..eb1d9cbb3 100644 --- a/test/e2e/pom.xml +++ b/test/e2e/pom.xml @@ -111,6 +111,17 @@ + + + ${project.basedir}/src/test/resources + + + ${basedir}/docker + + **/* + + + maven-compiler-plugin