You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/03/23 05:51:48 UTC
[skywalking] branch master updated: [Chore] Fix license headers and
rename E2E job name (#4551)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new f51ba3a [Chore] Fix license headers and rename E2E job name (#4551)
f51ba3a is described below
commit f51ba3a94d465350966de258ba2a71b9bfe0a1f9
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Mar 23 13:51:39 2020 +0800
[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 +++++++++++++++-
test/e2e/e2e-test/docker/cluster/download-mysql.sh | 15 ++++++-------
test/e2e/e2e-test/docker/profile/download-mysql.sh | 15 ++++++-------
test/e2e/e2e-test/docker/simple/ssl/hosts | 26 ----------------------
test/e2e/e2e-test/docker/storage/download-mysql.sh | 15 ++++++-------
test/e2e/pom.xml | 11 +++++++++
8 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 8ee9d81..554f9b9 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 4ad9a43..4e5377d 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 f2f95ca..29bc8b4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -385,6 +385,22 @@
<artifactId>apache-rat-plugin</artifactId>
<version>${apache-rat-plugin.version}</version>
<configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>AL20</licenseFamilyCategory>
+ <licenseFamilyName>Apache License, 2.0</licenseFamilyName>
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF)</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <licenseFamilies>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>Apache License, 2.0</familyName>
+ </licenseFamily>
+ </licenseFamilies>
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/licenses/**</exclude>
@@ -446,6 +462,7 @@
<exclude>**/src/main/proto/google/**</exclude>
<exclude>**/src/main/proto/istio/**</exclude>
<exclude>**/src/main/proto/jaeger/**</exclude>
+ <exclude>**/src/main/proto/mixer/**</exclude>
<exclude>**/src/main/proto/policy/**</exclude>
<exclude>**/src/main/proto/prometheus/client_model/metrics.proto</exclude>
<exclude>**/src/main/proto/protoc-gen-swagger/**</exclude>
@@ -456,7 +473,7 @@
<exclude>**/src/main/resources/code-templates/*/*.ftl</exclude>
<!-- Maven Wrapper generated files -->
- <exclude>.mvn/wrapper/maven-wrapper.properties</exclude>
+ <exclude>.mvn/wrapper/**</exclude>
<exclude>tools/dependencies/known-oap-backend-dependencies.txt</exclude>
<exclude>apm-checkstyle/CHECKSTYLE_HEAD</exclude>
diff --git a/test/e2e/e2e-test/docker/cluster/download-mysql.sh b/test/e2e/e2e-test/docker/cluster/download-mysql.sh
index ede411e..970937c 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 ede411e..970937c 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 fca2eb2..0000000
--- 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 ede411e..970937c 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 0e37bb2..eb1d9cb 100644
--- a/test/e2e/pom.xml
+++ b/test/e2e/pom.xml
@@ -111,6 +111,17 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>${basedir}/docker</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>