diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 8ee9d812d453f6115559cbebf41a3dcde2e502ce..554f9b97b5903c248a3285e253dd992044b363ab 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 4ad9a433a5eebaf12e99062a055842fd9f1dc0d5..4e5377d9400b680836c0a54d2eb3ce6b826dcdf8 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 f2f95caf2b775af24d47dccb052acd6cbbd239a2..29bc8b4e5c9e443a08af871e91eef34bf40a44a8 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 ede411e92d4f081cfda89eb978be421356d3dd1f..970937c9318a65e6b8511eb98ab5218a2e6dc333 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 ede411e92d4f081cfda89eb978be421356d3dd1f..970937c9318a65e6b8511eb98ab5218a2e6dc333 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 fca2eb290a46ff1c6445f54e6574507a7419ec26..0000000000000000000000000000000000000000
--- 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 ede411e92d4f081cfda89eb978be421356d3dd1f..970937c9318a65e6b8511eb98ab5218a2e6dc333 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 0e37bb2f7264914b0aa495a1d8de3b82bc3fc12d..eb1d9cbb38faa2ce5aa9948f8987e057f0c54905 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