This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch chore/license in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit ef1d5c92dcdeddfd5d2452863b432b0d1f84c88b Author: kezhenxu94 <[email protected]> AuthorDate: Wed Jan 13 12:08:47 2021 +0800 chore: set up license-eye to check license header --- .github/actions/e2e-test/action.yml | 65 +++++++++++ .github/actions/plugins-test/action.yml | 73 ++++++++++++ .github/workflows/ci-it.yaml | 6 + .github/workflows/e2e.cluster.yaml | 14 +-- .github/workflows/e2e.compat.yaml | 13 +-- .github/workflows/e2e.go.yaml | 11 +- .github/workflows/e2e.jdk-versions.yaml | 16 +-- .github/workflows/e2e.js.yaml | 17 +-- .github/workflows/e2e.kafka.yaml | 81 +++----------- .github/workflows/e2e.nodejs.yaml | 11 +- .github/workflows/e2e.php.yaml | 14 +-- .github/workflows/e2e.profiling.yaml | 14 +-- .github/workflows/e2e.python.yaml | 11 +- .github/workflows/e2e.so11y.yaml | 14 +-- .github/workflows/e2e.storages.yaml | 14 +-- .github/workflows/e2e.ttl.yaml | 14 +-- .github/workflows/e2e.yaml | 124 ++++----------------- .github/workflows/plugins-jdk14-test.0.yaml | 19 +--- .github/workflows/plugins-test.0.yaml | 15 +-- .github/workflows/plugins-test.1.yaml | 15 +-- .github/workflows/plugins-test.2.yaml | 15 +-- .github/workflows/plugins-test.3.yaml | 41 ++----- .licenserc.yaml | 67 +++++++++++ CHANGES.md | 5 + docs/en/guides/How-to-release.md | 2 +- .../storage-influxdb-plugin/pom.xml | 4 +- pom.xml | 122 -------------------- skywalking-ui | 2 +- .../archetype-resources/support-version.list | 4 +- .../archetype-resources/support-version.list | 4 +- test/plugin/containers/jvm-container/pom.xml | 2 +- test/plugin/containers/tomcat-container/pom.xml | 4 +- test/plugin/generator.sh | 4 +- test/plugin/run.sh | 2 +- .../activemq-scenario/support-version.list | 2 +- .../asynchttpclient-scenario/support-version.list | 2 +- .../scenarios/avro-scenario/support-version.list | 4 +- .../baidu-brpc-scenario/support-version.list | 2 +- .../scenarios/canal-scenario/support-version.list | 4 +- .../support-version.list | 2 +- .../support-version.list | 4 +- .../scenarios/cxf-scenario/support-version.list | 4 +- .../src/main/resources/jdbc.properties | 2 +- .../dbcp-2.x-scenario/support-version.list | 4 +- .../elasticjob-2.x-scenario/support-version.list | 4 +- .../elasticjob-3.x-scenario/support-version.list | 2 +- .../support-version.list | 2 +- .../support-version.list | 4 +- .../support-version.list | 4 +- .../scenarios/feign-scenario/support-version.list | 2 +- .../finagle-17.10.x-scenario/support-version.list | 4 +- .../finagle-6.44.x-scenario/support-version.list | 4 +- .../graphql-12.x-scenario/support-version.list | 4 +- .../graphql-8.x-scenario/support-version.list | 4 +- .../graphql-9.x-scenario/support-version.list | 4 +- .../scenarios/grpc-scenario/support-version.list | 4 +- .../scenarios/gson-scenario/support-version.list | 4 +- .../scenarios/h2-scenario/support-version.list | 4 +- .../hystrix-scenario/support-version.list | 2 +- .../influxdb-scenario/support-version.list | 4 +- .../jdk-http-scenario/support-version.list | 4 +- .../jdk14-with-gson-scenario/support-version.list | 4 +- .../scenarios/jedis-scenario/support-version.list | 4 +- .../scenarios/kafka-scenario/support-version.list | 4 +- .../kotlin-coroutine-scenario/support-version.list | 4 +- .../src/main/resources/jdbc.properties | 2 +- .../mariadb-scenario/support-version.list | 2 +- .../src/main/resources/jdbc.properties | 2 +- .../mssql-jdbc-scenario/support-version.list | 4 +- .../src/main/resources/jdbc.properties | 2 +- .../mssql-jtds-scenario/support-version.list | 4 +- .../src/main/resources/jdbc.properties | 2 +- .../scenarios/mysql-scenario/support-version.list | 4 +- .../scenarios/oracle-scenario/support-version.list | 2 +- .../scenarios/play-scenario/support-version.list | 2 +- .../scenarios/pulsar-scenario/support-version.list | 2 +- .../support-version.list | 4 +- .../scenarios/quasar-scenario/support-version.list | 2 +- .../rabbitmq-scenario/support-version.list | 2 +- .../redisson-scenario/support-version.list | 4 +- .../support-version.list | 4 +- .../support-version.list | 4 +- .../servicecomb-0.x-scenario/support-version.list | 4 +- .../servicecomb-1.x-scenario/support-version.list | 4 +- .../support-version.list | 4 +- .../support-version.list | 2 +- .../support-version.list | 4 +- .../support-version.list | 2 +- .../support-version.list | 2 +- .../sofarpc-scenario/support-version.list | 2 +- .../spring-3.0.x-scenario/support-version.list | 4 +- .../spring-3.1.x-scenario/support-version.list | 2 +- .../spring-4.1.x-scenario/support-version.list | 2 +- .../spring-4.3.x-scenario/support-version.list | 4 +- .../spring-async-scenario/support-version.list | 2 +- .../support-version.list | 2 +- .../support-version.list | 2 +- .../support-version.list | 2 +- .../support-version.list | 4 +- .../support-version.list | 4 +- .../support-version.list | 4 +- .../spring-scheduled-scenario/support-version.list | 4 +- .../spring-tx-scenario/support-version.list | 4 +- .../struts2.3-scenario/support-version.list | 4 +- .../struts2.5-scenario/support-version.list | 2 +- .../scenarios/thrift-scenario/support-version.list | 4 +- .../undertow-scenario/support-version.list | 4 +- .../support-version.list | 4 +- .../support-version.list | 4 +- .../support-version.list | 2 +- .../xxl-job-2.x-scenario/support-version.list | 4 +- 111 files changed, 459 insertions(+), 626 deletions(-) diff --git a/.github/actions/e2e-test/action.yml b/.github/actions/e2e-test/action.yml new file mode 100644 index 0000000..f3176ee --- /dev/null +++ b/.github/actions/e2e-test/action.yml @@ -0,0 +1,65 @@ +# +# 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. +# +name: 'Run E2E Test' +description: 'Common steps when running an E2E Test' +inputs: + test_class: + description: 'The e2e test class name' + required: true +runs: + using: "composite" + steps: + - name: Check License + shell: bash + run: | + echo "::group::Build License-Eye Binary" + git clone https://github.com/apache/skywalking-eyes.git + git -C skywalking-eyes reset --hard 9bd5feb86b5817aa6072b008f9866a2c3bbc8587 + make -C skywalking-eyes docker + rm -rf skywalking-eyes + docker run --rm -v $(pwd):/github/workspace license-eye:latest header check + echo "::endgroup::" + - name: Build Docker Image + shell: bash + env: + SKIP_TEST: "true" + run: | + echo "::group::Build Docker Image" + make docker && ES_VERSION=es7 TAG=latest-es7 make docker.oap + echo "::endgroup::" + - name: Copy Dist Package + shell: bash + run: | + echo "::group::Copy Dist Package to test/e2e" + cp -R dist test/e2e/ + echo "::endgroup::" + - name: Run E2E Test + shell: bash + run: | + echo "::group::Run E2E Test ${{ inputs.test_class }}" + ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=${{ inputs.test_class }} + echo "::endgroup::" + - name: Report Coverage + shell: bash + env: + CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 + run: | + echo "::group::Uploading Code Coverage" + bash -x tools/coverage/report.sh + echo "::endgroup::" diff --git a/.github/actions/plugins-test/action.yml b/.github/actions/plugins-test/action.yml new file mode 100644 index 0000000..36da3a4 --- /dev/null +++ b/.github/actions/plugins-test/action.yml @@ -0,0 +1,73 @@ +# +# 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. +# +name: "Run Plugin Test" +description: "Common steps when running a plugin test" +inputs: + test_case: + description: "The plugin test name" + required: true + java_version: + description: "The Java version under which this test case will run" + required: false + default: "jdk8" +runs: + using: "composite" + steps: + - name: Check License + shell: bash + run: | + echo "::group::Build License-Eye Binary" + git clone https://github.com/apache/skywalking-eyes.git + git -C skywalking-eyes reset --hard 9bd5feb86b5817aa6072b008f9866a2c3bbc8587 + make -C skywalking-eyes docker + rm -rf skywalking-eyes + docker run --rm -v $(pwd):/github/workspace license-eye:latest header check + echo "::endgroup::" + - name: Add checkstyle-plugin + shell: bash + run: | + echo "::group::Add checkstyle plugin to the pom.xml" + sed -i "/<\/sourceDirectories>/i <sourceDirectory>scenarios\/""${{ matrix.case }}""<\/sourceDirectory>" test/plugin/pom.xml + echo "::endgroup::" + - name: Build SkyWalking Agent + shell: bash + run: | + echo "::group::Build SkyWalking Agent" + ./mvnw --batch-mode clean package -DskipTests -Pagent + echo "::endgroup::" + - name: Build Docker Image + shell: bash + run: | + echo "::group::Build Docker Image" + ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests -P${{ inputs.java_version }} + echo "::endgroup::" + - name: Run Plugin Test ${{ inputs.test_case }} + shell: bash + run: | + echo "::group::Run Plugin Test ${{ inputs.test_case }}" + bash test/plugin/run.sh --image_version=${{ inputs.java_version }}-1.0.0 ${{ inputs.test_case }} + echo "::endgroup::" + - name: Report Coverage + shell: bash + env: + CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 + run: | + echo "::group::Uploading Code Coverage" + bash -x tools/coverage/report.sh + echo "::endgroup::" diff --git a/.github/workflows/ci-it.yaml b/.github/workflows/ci-it.yaml index ce91374..c9636ef 100644 --- a/.github/workflows/ci-it.yaml +++ b/.github/workflows/ci-it.yaml @@ -33,6 +33,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Check License Header + uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Cache local Maven repository uses: actions/cache@v2 with: @@ -59,6 +63,8 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Check License Header + uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587 - name: Cache local Maven repository uses: actions/cache@v2 with: diff --git a/.github/workflows/e2e.cluster.yaml b/.github/workflows/e2e.cluster.yaml index a516b82..a282908 100644 --- a/.github/workflows/e2e.cluster.yaml +++ b/.github/workflows/e2e.cluster.yaml @@ -22,9 +22,7 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 - CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: CoordinatorsStorage: @@ -49,14 +47,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker && ES_VERSION=es7 TAG=latest-es7 make docker.oap - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Cluster with ${{ matrix.coordinator }} and ${{ matrix.storage }} - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.ClusterE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.ClusterE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.compat.yaml b/.github/workflows/e2e.compat.yaml index 81d278c..ef9e6b1 100644 --- a/.github/workflows/e2e.compat.yaml +++ b/.github/workflows/e2e.compat.yaml @@ -21,9 +21,6 @@ on: schedule: - cron: '0 18 * * *' -env: - SKIP_TEST: true - jobs: Compatability: name: Compatability @@ -48,12 +45,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 - - name: Build Docker Image - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Compatability Test (8.3.0 Agent) - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.simple.SimpleE2E + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.simple.SimpleE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.go.yaml b/.github/workflows/e2e.go.yaml index a22d052..5fe93c4 100644 --- a/.github/workflows/e2e.go.yaml +++ b/.github/workflows/e2e.go.yaml @@ -25,7 +25,6 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 jobs: @@ -44,12 +43,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: GO2SKY - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.GOE2E + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.GOE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml index be418ac..383d36f 100644 --- a/.github/workflows/e2e.jdk-versions.yaml +++ b/.github/workflows/e2e.jdk-versions.yaml @@ -21,10 +21,6 @@ on: schedule: - cron: '0 18 * * *' -env: - SKIP_TEST: true - CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 - jobs: JavaVersions: name: Agent Java Versions @@ -52,14 +48,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: ${{ matrix.jdk }} - - name: Build Docker Image - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Agent on JDK Version ${{ matrix.jdk }} - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.simple.SimpleE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.simple.SimpleE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.js.yaml b/.github/workflows/e2e.js.yaml index c78aa71..f5c9776 100644 --- a/.github/workflows/e2e.js.yaml +++ b/.github/workflows/e2e.js.yaml @@ -25,7 +25,7 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true + SW_AGENT_JDK_VERSION: 8 jobs: JavaScriptClient: @@ -47,17 +47,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: checkout submodules - shell: bash - run: | - git submodule sync --recursive - git -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Compile and Build - run: make docker && ES_VERSION=es7 TAG=latest-es7 make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Browser Receiver ${{ matrix.storage }} - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.browser.BrowserE2E + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.browser.BrowserE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.kafka.yaml b/.github/workflows/e2e.kafka.yaml index 589fcbe..c120299 100644 --- a/.github/workflows/e2e.kafka.yaml +++ b/.github/workflows/e2e.kafka.yaml @@ -25,15 +25,22 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 - CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: Kafka: - name: Kafka + name: ${{ matrix.case.name }} runs-on: ubuntu-latest timeout-minutes: 90 + strategy: + matrix: + case: + - name: Kafka + class: org.apache.skywalking.e2e.kafka.KafkaE2E + - name: Profiling + class: org.apache.skywalking.e2e.kafka.KafkaProfileE2E + - name: Meter + class: org.apache.skywalking.e2e.kafka.KafkaMeterE2E steps: - uses: actions/checkout@v2 with: @@ -45,72 +52,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Kafka - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.kafka.KafkaE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh - - uses: actions/upload-artifact@v1 - if: failure() + - name: Run E2E Test + uses: ./.github/actions/e2e-test with: - name: logs - path: logs - profile: - name: Kafka(profiling) - runs-on: ubuntu-latest - timeout-minutes: 90 - env: - SW_STORAGE: influxdb - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Kafka Profiling - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.kafka.KafkaProfileE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh - - uses: actions/upload-artifact@v1 - if: failure() - with: - name: logs - path: logs - meter: - name: Kafka(meter) - runs-on: ubuntu-latest - timeout-minutes: 90 - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Kafka Meter System - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.kafka.KafkaMeterE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh + test_class: ${{ matrix.case.class }} - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.nodejs.yaml b/.github/workflows/e2e.nodejs.yaml index eebeea9..371c5df 100644 --- a/.github/workflows/e2e.nodejs.yaml +++ b/.github/workflows/e2e.nodejs.yaml @@ -25,7 +25,6 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 jobs: @@ -44,9 +43,7 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: NodeJS Agent - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.NodeJSE2E + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.NodeJSE2E diff --git a/.github/workflows/e2e.php.yaml b/.github/workflows/e2e.php.yaml index b2ae110..d5af9cb 100644 --- a/.github/workflows/e2e.php.yaml +++ b/.github/workflows/e2e.php.yaml @@ -24,10 +24,6 @@ on: schedule: - cron: '0 18 * * *' -env: - SKIP_TEST: true - SW_AGENT_JDK_VERSION: 8 - jobs: PHPAgent: name: PHP @@ -44,12 +40,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: PHP - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.PHPE2E + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.PHPE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.profiling.yaml b/.github/workflows/e2e.profiling.yaml index 6e06294..2c0ad77 100644 --- a/.github/workflows/e2e.profiling.yaml +++ b/.github/workflows/e2e.profiling.yaml @@ -25,9 +25,7 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 - CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: Profiling: @@ -50,14 +48,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker && ES_VERSION=es7 TAG=latest-es7 make docker.oap - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Profiling ${{ matrix.storage }} - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.profile.ProfileE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.profile.ProfileE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.python.yaml b/.github/workflows/e2e.python.yaml index 1661264..909d4cc 100644 --- a/.github/workflows/e2e.python.yaml +++ b/.github/workflows/e2e.python.yaml @@ -25,7 +25,6 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 jobs: @@ -44,12 +43,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Python Agent - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.PythonE2E + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.PythonE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.so11y.yaml b/.github/workflows/e2e.so11y.yaml index 8ac8c8f..03bbacd 100644 --- a/.github/workflows/e2e.so11y.yaml +++ b/.github/workflows/e2e.so11y.yaml @@ -25,9 +25,7 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 - CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: SelfObservability: @@ -45,14 +43,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: ${{ matrix.case }} - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.SO11yE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.SO11yE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index 9718c63..791a6d1 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -22,9 +22,7 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 - CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: StoragePlugins: @@ -47,14 +45,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker && ES_VERSION=es7 TAG=latest-es7 make docker.oap - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Storage ${{ matrix.storage }} - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.storage.StorageE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.storage.StorageE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.ttl.yaml b/.github/workflows/e2e.ttl.yaml index 21580f3..495588f 100644 --- a/.github/workflows/e2e.ttl.yaml +++ b/.github/workflows/e2e.ttl.yaml @@ -25,9 +25,7 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 - CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: TTL: @@ -50,14 +48,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker && ES_VERSION=es7 TAG=latest-es7 make docker.oap - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: TTL of storage ${{ matrix.storage }} - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.ttl.StorageTTLE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run E2E Test + uses: ./.github/actions/e2e-test + with: + test_class: org.apache.skywalking.e2e.ttl.StorageTTLE2E - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 69b9baf..0f91cf2 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -26,9 +26,7 @@ on: - cron: '0 18 * * *' env: - SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 - CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: FeatureGroup01: @@ -51,82 +49,31 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: ${{ matrix.case }} - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.simple.SimpleE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh - - uses: actions/upload-artifact@v1 - if: failure() - with: - name: logs - path: logs - - FeatureGroup02: - name: Lua Nginx - runs-on: ubuntu-latest - timeout-minutes: 90 - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 + - name: Run E2E Test + uses: ./.github/actions/e2e-test with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Nginx Lua - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.LuaE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh + test_class: org.apache.skywalking.e2e.simple.SimpleE2E - uses: actions/upload-artifact@v1 if: failure() with: name: logs path: logs - FeatureGroup03: - name: Gateway - runs-on: ubuntu-latest - timeout-minutes: 90 - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Uninstrumnented gateway - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.GatewayE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh - - uses: actions/upload-artifact@v1 - if: failure() - with: - name: logs - path: logs - - FeatureGroup04: - name: Meter + FeatureGroup02: + name: ${{ matrix.case.name }} runs-on: ubuntu-latest timeout-minutes: 90 + strategy: + matrix: + case: + - name: Lua Nginx + class: org.apache.skywalking.e2e.LuaE2E + - name: Gateway + class: org.apache.skywalking.e2e.GatewayE2E + - name: Meter + class: org.apache.skywalking.e2e.meter.MeterE2E + - name: Alarm + class: org.apache.skywalking.e2e.alarm.AlarmE2E steps: - uses: actions/checkout@v2 with: @@ -138,43 +85,10 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Meter receiver - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.meter.MeterE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh - - uses: actions/upload-artifact@v1 - if: failure() + - name: Run E2E Test + uses: ./.github/actions/e2e-test with: - name: logs - path: logs - - FeatureGroup05: - name: Alarm - runs-on: ubuntu-latest - timeout-minutes: 90 - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Compile and Build - run: make docker - - name: Copy dist package - run: cp -R dist test/e2e/ - - name: Meter receiver - run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.alarm.AlarmE2E - - name: Report Coverage - run: bash -x tools/coverage/report.sh + test_class: ${{ matrix.case.class }} - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/plugins-jdk14-test.0.yaml b/.github/workflows/plugins-jdk14-test.0.yaml index 2464549..735fc7d 100644 --- a/.github/workflows/plugins-jdk14-test.0.yaml +++ b/.github/workflows/plugins-jdk14-test.0.yaml @@ -40,7 +40,6 @@ jobs: runs-on: ubuntu-18.04 timeout-minutes: 90 strategy: - fail-fast: true matrix: case: - jdk14-with-gson-scenario @@ -57,17 +56,9 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v1 with: - java-version: 8 - - name: Add checkstyle-plugin - run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml - - name: Build SkyWalking Agent - run: ./mvnw --batch-mode clean package -DskipTests -Pagent - - name: Build Docker image - run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests -Pjdk14 - - uses: actions/setup-java@v1 - with: java-version: 14 - - name: ${{ matrix.case }} - run: bash test/plugin/run.sh --image_version=jdk14-1.0.0 ${{ matrix.case }} - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run Plugin Test + uses: ./.github/actions/plugins-test + with: + test_case: ${{ matrix.case }} + java_version: jdk14 diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml index 77b06b5..b627277 100644 --- a/.github/workflows/plugins-test.0.yaml +++ b/.github/workflows/plugins-test.0.yaml @@ -40,7 +40,6 @@ jobs: runs-on: ubuntu-18.04 timeout-minutes: 90 strategy: - fail-fast: true matrix: case: - activemq-scenario @@ -84,13 +83,7 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 8 - - name: Add checkstyle-plugin - run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml - - name: Build SkyWalking Agent - run: ./mvnw --batch-mode clean package -DskipTests -Pagent - - name: Build Docker image - run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests - - name: ${{ matrix.case }} - run: bash test/plugin/run.sh ${{ matrix.case }} - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run Plugin Test + uses: ./.github/actions/plugins-test + with: + test_case: ${{ matrix.case }} diff --git a/.github/workflows/plugins-test.1.yaml b/.github/workflows/plugins-test.1.yaml index 318b3a7..d14908f 100644 --- a/.github/workflows/plugins-test.1.yaml +++ b/.github/workflows/plugins-test.1.yaml @@ -40,7 +40,6 @@ jobs: runs-on: ubuntu-18.04 timeout-minutes: 90 strategy: - fail-fast: true matrix: case: - h2-scenario @@ -79,13 +78,7 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 8 - - name: Add checkstyle-plugin - run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml - - name: Build SkyWalking Agent - run: ./mvnw --batch-mode clean package -DskipTests -Pagent - - name: Build Docker image - run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests - - name: ${{ matrix.case }} - run: bash test/plugin/run.sh ${{ matrix.case }} - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run Plugin Test + uses: ./.github/actions/plugins-test + with: + test_case: ${{ matrix.case }} diff --git a/.github/workflows/plugins-test.2.yaml b/.github/workflows/plugins-test.2.yaml index 4e4030e..31fb1ae 100644 --- a/.github/workflows/plugins-test.2.yaml +++ b/.github/workflows/plugins-test.2.yaml @@ -40,7 +40,6 @@ jobs: runs-on: ubuntu-18.04 timeout-minutes: 90 strategy: - fail-fast: true matrix: case: - okhttp-scenario @@ -81,13 +80,7 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 8 - - name: Add checkstyle-plugin - run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml - - name: Build SkyWalking Agent - run: ./mvnw --batch-mode clean package -DskipTests -Pagent - - name: Build Docker image - run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests - - name: ${{ matrix.case }} - run: bash test/plugin/run.sh ${{ matrix.case }} - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run Plugin Test + uses: ./.github/actions/plugins-test + with: + test_case: ${{ matrix.case }} diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml index ebc6325..ba52002 100644 --- a/.github/workflows/plugins-test.3.yaml +++ b/.github/workflows/plugins-test.3.yaml @@ -40,7 +40,6 @@ jobs: runs-on: ubuntu-18.04 timeout-minutes: 90 strategy: - fail-fast: true matrix: case: - mysql-scenario @@ -72,6 +71,7 @@ jobs: - xxl-job-2.x-scenario - thrift-scenario - dbcp-2.x-scenario + - oracle-scenario steps: - uses: actions/checkout@v2 with: @@ -86,39 +86,14 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 8 - - name: Add checkstyle-plugin - run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml - - name: Build SkyWalking Agent - run: ./mvnw --batch-mode clean package -DskipTests -Pagent - - name: Build Docker image - run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests - - name: ${{ matrix.case }} - run: bash test/plugin/run.sh ${{ matrix.case }} - - name: Report Coverage - run: bash -x tools/coverage/report.sh - - Oracle: - name: Oracle - runs-on: ubuntu-18.04 - timeout-minutes: 90 - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Add checkstyle-plugin - run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/oracle-scenario<\/sourceDirectory>' test/plugin/pom.xml - - name: Build SkyWalking Agent - run: ./mvnw --batch-mode clean package -DskipTests -Pagent - - name: Build Docker image - run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests - - name: Oracle 10.2.0.4.0 (1) + - name: Download and Install Oracle Jars + if: ${{ matrix.case }} == "oracle-scenario" run: | + mkdir -p ./skywalking-agent/plugins/ curl -O https://skyapm.github.io/ci-assist/jars/ojdbc14-10.2.0.4.0.jar curl -L -o ./skywalking-agent/plugins/apm-oracle-10.x-plugin-2.0.0.jar https://github.com/SkyAPM/java-plugin-extensions/releases/download/2.0.0/apm-oracle-10.x-plugin-2.0.0.jar ./mvnw --batch-mode install:install-file -Dfile=ojdbc14-10.2.0.4.0.jar -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.4.0 -Dpackaging=jar - bash test/plugin/run.sh oracle-scenario - - name: Report Coverage - run: bash -x tools/coverage/report.sh + - name: Run Plugin Test + uses: ./.github/actions/plugins-test + with: + test_case: ${{ matrix.case }} diff --git a/.licenserc.yaml b/.licenserc.yaml new file mode 100644 index 0000000..dff67f4 --- /dev/null +++ b/.licenserc.yaml @@ -0,0 +1,67 @@ +# +# 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. +# +header: + license: + spdx-id: Apache-2.0 + copyright-owner: Apache Software Foundation + + paths-ignore: + - '.github/ISSUE_TEMPLATE' + - '.github/PULL_REQUEST_TEMPLATE' + - '**/.gitignore' + - '.gitmodules' + - '.muse' + - '.mvn' + - 'apm-checkstyle/CHECKSTYLE_HEAD' + - 'apm-protocol/apm-network/src/main/proto/.gitignore' + - 'codeStyle.xml' + - 'docker/.env' + - 'dist' + - 'licenses' + - 'dist-material/release-docs' + - '**/*.md' + - '**/*.json' + - '**/*.ftl' + - '**/target/**' + - '**/*.iml' + - '**/*.ini' + - '**/*.crt' + - '**/*.pem' + - 'LICENSE' + - 'NOTICE' + - 'skywalking-ui/dist' + - 'skywalking-ui/node_modules' + - 'skywalking-ui/node' + - 'skywalking-ui/.browserslistrc' + - 'skywalking-ui/.prettierrc' + - '**/src/main/fbs/istio/**' + - '**/src/main/proto/envoy/**' + - '**/src/main/proto/udpa/**' + - '**/src/main/proto/gogoproto/gogo.proto' + - '**/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/**' + - '**/src/main/proto/validate/validate.proto' + - '**/src/main/proto/opencensus/**' + + comment: on-failure diff --git a/CHANGES.md b/CHANGES.md index 79e8a11..a4a8318 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ Release Notes. * Chore: adapt `create_source_release.sh` to make it runnable on Linux. * Add `package` to `.proto` files, prevent polluting top-level namespace in some languages; The OAP server supports previous agent releases, whereas the previous OAP server (<=8.3.0) won't recognize newer agents since this version (>= 8.4.0). * Add ElasticSearch 7.10 to test matrix and verify it works. +* Replace Apache RAT with skywalking-eyes to check license headers. #### Java Agent * The operation name of quartz-scheduler plugin, has been changed as the `quartz-scheduler/${className}` format. @@ -88,6 +89,10 @@ Release Notes. * Fix dashboard wrong instance. * Add a legend for the topology. * Update the condition of unhealthy cube. +* Fix: use icons to replace buttons for task list in profile. +* Fix: support `=` in the tag value in the trace query page. +* Add envoy proxy component logo. +* Chore: set up license-eye to check license headers and add missing license headers. #### Documentation * Update the documents of backend fetcher and self observability about the latest configurations. diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index b68231d..2568e29 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -218,7 +218,7 @@ are in `https://dist.apache.org/repos/dist/dev/skywalking/x.y.z` with .asc, .sha 1. Check `shasum -c apache-skywalking-apm-x.y.z-src.tgz.sha512` 1. Check `gpg --verify apache-skywalking-apm-x.y.z-src.tgz.asc apache-skywalking-apm-x.y.z-src.tgz` 1. Build distribution from source code package (apache-skywalking-x.y.z-src.tar.gz) by following this [doc](https://github.com/apache/skywalking/blob/master/docs/en/guides/How-to-build.md#build-from-apache-source-code-release). -1. Apache RAT check. Run `./mvnw apache-rat:check`. (No binary in source codes) +1. Check Apache License Header. Run `docker run --rm -v $(pwd):/github/workspace apache/skywalking-eyes header check`. (No binary in source codes) Vote result should follow these. diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/pom.xml b/oap-server/server-storage-plugin/storage-influxdb-plugin/pom.xml index 05f3580..5ace041 100644 --- a/oap-server/server-storage-plugin/storage-influxdb-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/pom.xml @@ -12,7 +12,7 @@ ~ 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 specrm ific language governing permissions and + ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> @@ -49,4 +49,4 @@ <version>${influxdb-jave.version}</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/pom.xml b/pom.xml index ca46d9f..e24894f 100755 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,6 @@ <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version> <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version> <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version> - <apache-rat-plugin.version>0.12</apache-rat-plugin.version> <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> <maven-resource-plugin.version>3.1.0</maven-resource-plugin.version> <maven-source-plugin.version>3.0.1</maven-source-plugin.version> @@ -424,127 +423,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.rat</groupId> - <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> - <exclude>**/ui-licenses/**</exclude> - <exclude>**/codeStyle.xml</exclude> - - <!-- IDE files --> - <exclude>**/*.iml</exclude> - <exclude>**/.idea/**</exclude> - <exclude>**/*.classpath</exclude> - <exclude>**/.project</exclude> - <exclude>**/.settings/**</exclude> - <exclude>**/dependency-reduced-pom.xml</exclude> - <exclude>**/.vscode/**</exclude> - <exclude>**/.factorypath</exclude> - - <!-- Docker compose envrioment variables file --> - <excludes>**/.env/**</excludes> - - <!-- UI IDE configs --> - <exclude>**/skywalking-ui/.editorconfig</exclude> - <!-- UI ignore --> - <exclude>**/skywalking-ui/.browserslistrc</exclude> - <!-- UI prettier config --> - <exclude>**/skywalking-ui/.prettierrc</exclude> - - <!-- git files --> - <exclude>**/.gitignore</exclude> - <exclude>**/.gitmodules</exclude> - <exclude>**/.git/**</exclude> - - <!-- CI files --> - <exclude>**/.muse/**</exclude> - <exclude>**/.travis.yml</exclude> - - <!-- GitHub files --> - <exclude>**/.github/**</exclude> - - <!-- document files --> - <exclude>**/*.md</exclude> - <excldue>**/*.MD</excldue> - <exclude>**/*.txt</exclude> - <exclude>**/docs/**</exclude> - - <!-- Test cases data in JSON format --> - <exclude>**/src/test/resources/json/*.json</exclude> - - <!-- front end libary and generated files --> - <exclude>**/skywalking-ui/node_modules/**</exclude> - <exclude>**/skywalking-ui/node/**</exclude> - <exclude>**/skywalking-ui/dist/**</exclude> - - <!-- web UI dependencies descriptions --> - <exclude>skywalking-ui/package.json</exclude> - <exclude>skywalking-ui/package-lock.json</exclude> - - <!-- Proto files of Istio, envoy, prometheus and gogoproto projects --> - <exclude>**/src/main/fbs/istio/**</exclude> - <exclude>**/src/main/proto/envoy/**</exclude> - <exclude>**/src/main/proto/udpa/**</exclude> - <exclude>**/src/main/proto/gogoproto/gogo.proto</exclude> - <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> - <exclude>**/src/main/proto/validate/validate.proto</exclude> - <exclude>**/src/main/proto/opencensus/**</exclude> - - <!-- generated file from oal grammar and rt template --> - <exclude>**/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.tokens</exclude> - <exclude>**/src/main/resources/code-templates/*/*.ftl</exclude> - - <!-- Maven Wrapper generated files --> - <exclude>.mvn/wrapper/**</exclude> - <exclude>tools/dependencies/known-oap-backend-dependencies.txt</exclude> - <exclude>apm-checkstyle/CHECKSTYLE_HEAD</exclude> - - <!-- generated file from test agent plugin scenarios --> - <exclude>**/test/plugin/workspace/**</exclude> - <exclude>**/test/jacoco/**</exclude> - - <!-- TSL relevant files for e2e test --> - <exclude>**/*.crt</exclude> - <exclude>**/*.pem</exclude> - - <exclude>.m2/**</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>${maven-compiler-plugin.version}</version> <configuration> diff --git a/skywalking-ui b/skywalking-ui index f075160..f85dead 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit f0751600d90d442636d93ca99147d6b924a479f0 +Subproject commit f85deadec00f5c620ee68c7e4ed62a121a3b25b2 diff --git a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/support-version.list b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/support-version.list index 3425fd0..164625f 100644 --- a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/support-version.list +++ b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# lists your version here (Contains only the last version number of each minor version.) \ No newline at end of file +# lists your version here (Contains only the last version number of each minor version.) diff --git a/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/support-version.list b/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/support-version.list index 3425fd0..164625f 100644 --- a/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/support-version.list +++ b/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# lists your version here (Contains only the last version number of each minor version.) \ No newline at end of file +# lists your version here (Contains only the last version number of each minor version.) diff --git a/test/plugin/containers/jvm-container/pom.xml b/test/plugin/containers/jvm-container/pom.xml index 6ca2023..6bffc4f 100644 --- a/test/plugin/containers/jvm-container/pom.xml +++ b/test/plugin/containers/jvm-container/pom.xml @@ -47,7 +47,7 @@ <configuration> <images> <image> - <name>skywalking/agent-test-jvm:${project.version}</name> + <name>skywalking/agent-test-jvm:jdk8-${project.version}</name> <build> <from>openjdk:8</from> <workdir>/usr/local/skywalking/scenario</workdir> diff --git a/test/plugin/containers/tomcat-container/pom.xml b/test/plugin/containers/tomcat-container/pom.xml index 751f22a..f1759b6 100644 --- a/test/plugin/containers/tomcat-container/pom.xml +++ b/test/plugin/containers/tomcat-container/pom.xml @@ -47,7 +47,7 @@ <configuration> <images> <image> - <name>skywalking/agent-test-tomcat:${project.version}</name> + <name>skywalking/agent-test-tomcat:jdk8-${project.version}</name> <build> <from>tomcat:8.5.57-jdk8-openjdk</from> <workdir>/usr/local/skywalking/scenario</workdir> @@ -94,7 +94,7 @@ <configuration> <images> <image> - <name>skywalking/agent-test-tomcat:jd414-${project.version}</name> + <name>skywalking/agent-test-tomcat:jdk14-${project.version}</name> <build> <from>tomcat:8.5.57-jdk14-openjdk</from> <workdir>/usr/local/skywalking/scenario</workdir> diff --git a/test/plugin/generator.sh b/test/plugin/generator.sh index 886a00f..3d0fa67 100644 --- a/test/plugin/generator.sh +++ b/test/plugin/generator.sh @@ -14,7 +14,7 @@ # 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 -# limitation under the License. +# limitations under the License. wkdir="$(cd "$(dirname $0)"; pwd)" MVNW=${wkdir}/../../mvnw @@ -74,4 +74,4 @@ ${MVNW} archetype:generate \ -DarchetypeCatalog=local \ -DinteractiveMode=false \ -DarchetypeVersion=1.0.0 \ - -Dpackage=${package} \ No newline at end of file + -Dpackage=${package} diff --git a/test/plugin/run.sh b/test/plugin/run.sh index e6c052e..ba44620 100755 --- a/test/plugin/run.sh +++ b/test/plugin/run.sh @@ -30,7 +30,7 @@ jacoco_home="${home}"/../jacoco scenarios_home="${home}/scenarios" num_of_testcases= -image_version="1.0.0" +image_version="jdk8-1.0.0" print_help() { echo "Usage: run.sh [OPTION] SCENARIO_NAME" diff --git a/test/plugin/scenarios/activemq-scenario/support-version.list b/test/plugin/scenarios/activemq-scenario/support-version.list index ac2a165..e7aadb0 100644 --- a/test/plugin/scenarios/activemq-scenario/support-version.list +++ b/test/plugin/scenarios/activemq-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/asynchttpclient-scenario/support-version.list b/test/plugin/scenarios/asynchttpclient-scenario/support-version.list index e8b580e..3a1cc30 100644 --- a/test/plugin/scenarios/asynchttpclient-scenario/support-version.list +++ b/test/plugin/scenarios/asynchttpclient-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/avro-scenario/support-version.list b/test/plugin/scenarios/avro-scenario/support-version.list index ce3fcfa..9d4d574 100644 --- a/test/plugin/scenarios/avro-scenario/support-version.list +++ b/test/plugin/scenarios/avro-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -15,4 +15,4 @@ # limitations under the License. 1.7.7 -1.8.2 \ No newline at end of file +1.8.2 diff --git a/test/plugin/scenarios/baidu-brpc-scenario/support-version.list b/test/plugin/scenarios/baidu-brpc-scenario/support-version.list index 3974dca..3b7de05 100644 --- a/test/plugin/scenarios/baidu-brpc-scenario/support-version.list +++ b/test/plugin/scenarios/baidu-brpc-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/canal-scenario/support-version.list b/test/plugin/scenarios/canal-scenario/support-version.list index 5ab31fd..14e2a59 100644 --- a/test/plugin/scenarios/canal-scenario/support-version.list +++ b/test/plugin/scenarios/canal-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -15,4 +15,4 @@ # limitations under the License. 1.1.2 -1.0.25 \ No newline at end of file +1.0.25 diff --git a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/support-version.list b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/support-version.list index c869f86..4dbc736 100644 --- a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/support-version.list +++ b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/correlation-autotag-scenario/support-version.list b/test/plugin/scenarios/correlation-autotag-scenario/support-version.list index e8d497e..b8923e8 100644 --- a/test/plugin/scenarios/correlation-autotag-scenario/support-version.list +++ b/test/plugin/scenarios/correlation-autotag-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -19,4 +19,4 @@ # Contains only the last version number of each minor version -1.25.0 \ No newline at end of file +1.25.0 diff --git a/test/plugin/scenarios/cxf-scenario/support-version.list b/test/plugin/scenarios/cxf-scenario/support-version.list index 1d93afa..90cbc3e 100644 --- a/test/plugin/scenarios/cxf-scenario/support-version.list +++ b/test/plugin/scenarios/cxf-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -18,4 +18,4 @@ 3.1.9 3.2.7 3.3.5 -3.4.1 \ No newline at end of file +3.4.1 diff --git a/test/plugin/scenarios/dbcp-2.x-scenario/src/main/resources/jdbc.properties b/test/plugin/scenarios/dbcp-2.x-scenario/src/main/resources/jdbc.properties index aad3ac1..5c266c3 100755 --- a/test/plugin/scenarios/dbcp-2.x-scenario/src/main/resources/jdbc.properties +++ b/test/plugin/scenarios/dbcp-2.x-scenario/src/main/resources/jdbc.properties @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/dbcp-2.x-scenario/support-version.list b/test/plugin/scenarios/dbcp-2.x-scenario/support-version.list index d70f152..6589c87 100755 --- a/test/plugin/scenarios/dbcp-2.x-scenario/support-version.list +++ b/test/plugin/scenarios/dbcp-2.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -22,4 +22,4 @@ 2.3.0 2.2.0 2.1.1 -2.0.1 \ No newline at end of file +2.0.1 diff --git a/test/plugin/scenarios/elasticjob-2.x-scenario/support-version.list b/test/plugin/scenarios/elasticjob-2.x-scenario/support-version.list index 9ba5d7f..9204b8e 100644 --- a/test/plugin/scenarios/elasticjob-2.x-scenario/support-version.list +++ b/test/plugin/scenarios/elasticjob-2.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -15,4 +15,4 @@ # limitations under the License. 2.0.3 -2.1.5 \ No newline at end of file +2.1.5 diff --git a/test/plugin/scenarios/elasticjob-3.x-scenario/support-version.list b/test/plugin/scenarios/elasticjob-3.x-scenario/support-version.list index b530a64..ce26c5d 100644 --- a/test/plugin/scenarios/elasticjob-3.x-scenario/support-version.list +++ b/test/plugin/scenarios/elasticjob-3.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/support-version.list b/test/plugin/scenarios/elasticsearch-7.x-scenario/support-version.list index 5b5a2fe..3671af5 100644 --- a/test/plugin/scenarios/elasticsearch-7.x-scenario/support-version.list +++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/support-version.list b/test/plugin/scenarios/exception-checker-spring-scenario/support-version.list index 15369a3..293331a 100644 --- a/test/plugin/scenarios/exception-checker-spring-scenario/support-version.list +++ b/test/plugin/scenarios/exception-checker-spring-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -1.0.0 \ No newline at end of file +1.0.0 diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/support-version.list b/test/plugin/scenarios/exception-checker-tomcat-scenario/support-version.list index 15369a3..293331a 100644 --- a/test/plugin/scenarios/exception-checker-tomcat-scenario/support-version.list +++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -1.0.0 \ No newline at end of file +1.0.0 diff --git a/test/plugin/scenarios/feign-scenario/support-version.list b/test/plugin/scenarios/feign-scenario/support-version.list index a6a4a08..54e90a7 100644 --- a/test/plugin/scenarios/feign-scenario/support-version.list +++ b/test/plugin/scenarios/feign-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/finagle-17.10.x-scenario/support-version.list b/test/plugin/scenarios/finagle-17.10.x-scenario/support-version.list index 74652e1..8d46b54 100644 --- a/test/plugin/scenarios/finagle-17.10.x-scenario/support-version.list +++ b/test/plugin/scenarios/finagle-17.10.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -32,4 +32,4 @@ 19.10.0 19.11.0 19.12.0 -20.1.0 \ No newline at end of file +20.1.0 diff --git a/test/plugin/scenarios/finagle-6.44.x-scenario/support-version.list b/test/plugin/scenarios/finagle-6.44.x-scenario/support-version.list index 34a0e1c..70d6faf 100644 --- a/test/plugin/scenarios/finagle-6.44.x-scenario/support-version.list +++ b/test/plugin/scenarios/finagle-6.44.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -17,4 +17,4 @@ 6.44.0 6.45.0 7.0.0 -7.1.0 \ No newline at end of file +7.1.0 diff --git a/test/plugin/scenarios/graphql-12.x-scenario/support-version.list b/test/plugin/scenarios/graphql-12.x-scenario/support-version.list index 12b708f..9b0deb1 100644 --- a/test/plugin/scenarios/graphql-12.x-scenario/support-version.list +++ b/test/plugin/scenarios/graphql-12.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -19,4 +19,4 @@ 12.0 13.0 14.0 -15.0 \ No newline at end of file +15.0 diff --git a/test/plugin/scenarios/graphql-8.x-scenario/support-version.list b/test/plugin/scenarios/graphql-8.x-scenario/support-version.list index b89a296..bf855b2 100644 --- a/test/plugin/scenarios/graphql-8.x-scenario/support-version.list +++ b/test/plugin/scenarios/graphql-8.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -8.0 \ No newline at end of file +8.0 diff --git a/test/plugin/scenarios/graphql-9.x-scenario/support-version.list b/test/plugin/scenarios/graphql-9.x-scenario/support-version.list index 77ff080..80b7d2b 100644 --- a/test/plugin/scenarios/graphql-9.x-scenario/support-version.list +++ b/test/plugin/scenarios/graphql-9.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -18,4 +18,4 @@ 9.0 10.0 -11.0 \ No newline at end of file +11.0 diff --git a/test/plugin/scenarios/grpc-scenario/support-version.list b/test/plugin/scenarios/grpc-scenario/support-version.list index 2e032cb..824c5bd 100644 --- a/test/plugin/scenarios/grpc-scenario/support-version.list +++ b/test/plugin/scenarios/grpc-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -38,4 +38,4 @@ 1.9.1 1.8.0 1.7.1 -1.6.1 \ No newline at end of file +1.6.1 diff --git a/test/plugin/scenarios/gson-scenario/support-version.list b/test/plugin/scenarios/gson-scenario/support-version.list index 1dd4418..03d0f44 100644 --- a/test/plugin/scenarios/gson-scenario/support-version.list +++ b/test/plugin/scenarios/gson-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -2.8.6 \ No newline at end of file +2.8.6 diff --git a/test/plugin/scenarios/h2-scenario/support-version.list b/test/plugin/scenarios/h2-scenario/support-version.list index a1b38e2..f6a5fd8 100644 --- a/test/plugin/scenarios/h2-scenario/support-version.list +++ b/test/plugin/scenarios/h2-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -1.4.200 \ No newline at end of file +1.4.200 diff --git a/test/plugin/scenarios/hystrix-scenario/support-version.list b/test/plugin/scenarios/hystrix-scenario/support-version.list index 2b11589..1a5fe91 100644 --- a/test/plugin/scenarios/hystrix-scenario/support-version.list +++ b/test/plugin/scenarios/hystrix-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/influxdb-scenario/support-version.list b/test/plugin/scenarios/influxdb-scenario/support-version.list index 08e6ccf..85f4412 100644 --- a/test/plugin/scenarios/influxdb-scenario/support-version.list +++ b/test/plugin/scenarios/influxdb-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -26,4 +26,4 @@ 2.8 2.7 2.6 -2.5 \ No newline at end of file +2.5 diff --git a/test/plugin/scenarios/jdk-http-scenario/support-version.list b/test/plugin/scenarios/jdk-http-scenario/support-version.list index 05dfb02..658e529 100644 --- a/test/plugin/scenarios/jdk-http-scenario/support-version.list +++ b/test/plugin/scenarios/jdk-http-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -all \ No newline at end of file +all diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/support-version.list b/test/plugin/scenarios/jdk14-with-gson-scenario/support-version.list index 1dd4418..03d0f44 100644 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/support-version.list +++ b/test/plugin/scenarios/jdk14-with-gson-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -2.8.6 \ No newline at end of file +2.8.6 diff --git a/test/plugin/scenarios/jedis-scenario/support-version.list b/test/plugin/scenarios/jedis-scenario/support-version.list index bebe2d2..e95ee72 100644 --- a/test/plugin/scenarios/jedis-scenario/support-version.list +++ b/test/plugin/scenarios/jedis-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -19,4 +19,4 @@ 2.7.3 2.6.3 2.5.2 -2.4.2 \ No newline at end of file +2.4.2 diff --git a/test/plugin/scenarios/kafka-scenario/support-version.list b/test/plugin/scenarios/kafka-scenario/support-version.list index b40856b..fdfa2cb 100644 --- a/test/plugin/scenarios/kafka-scenario/support-version.list +++ b/test/plugin/scenarios/kafka-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -22,4 +22,4 @@ 2.2.1 2.3.0 2.5.1 -2.6.1 \ No newline at end of file +2.6.1 diff --git a/test/plugin/scenarios/kotlin-coroutine-scenario/support-version.list b/test/plugin/scenarios/kotlin-coroutine-scenario/support-version.list index 78f648b..3c01ce9 100644 --- a/test/plugin/scenarios/kotlin-coroutine-scenario/support-version.list +++ b/test/plugin/scenarios/kotlin-coroutine-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -17,4 +17,4 @@ 1.3.3 1.2.2 1.1.1 -1.0.1 \ No newline at end of file +1.0.1 diff --git a/test/plugin/scenarios/mariadb-scenario/src/main/resources/jdbc.properties b/test/plugin/scenarios/mariadb-scenario/src/main/resources/jdbc.properties index c494405..4b7d7ad 100644 --- a/test/plugin/scenarios/mariadb-scenario/src/main/resources/jdbc.properties +++ b/test/plugin/scenarios/mariadb-scenario/src/main/resources/jdbc.properties @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/mariadb-scenario/support-version.list b/test/plugin/scenarios/mariadb-scenario/support-version.list index bb41366..8d642a9 100644 --- a/test/plugin/scenarios/mariadb-scenario/support-version.list +++ b/test/plugin/scenarios/mariadb-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/mssql-jdbc-scenario/src/main/resources/jdbc.properties b/test/plugin/scenarios/mssql-jdbc-scenario/src/main/resources/jdbc.properties index 98cc840..3120876 100644 --- a/test/plugin/scenarios/mssql-jdbc-scenario/src/main/resources/jdbc.properties +++ b/test/plugin/scenarios/mssql-jdbc-scenario/src/main/resources/jdbc.properties @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/mssql-jdbc-scenario/support-version.list b/test/plugin/scenarios/mssql-jdbc-scenario/support-version.list index 1f0e85a..4daf4cc 100644 --- a/test/plugin/scenarios/mssql-jdbc-scenario/support-version.list +++ b/test/plugin/scenarios/mssql-jdbc-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -20,4 +20,4 @@ 7.2.2.jre8 7.4.1.jre8 8.2.2.jre8 -8.4.0.jre8 \ No newline at end of file +8.4.0.jre8 diff --git a/test/plugin/scenarios/mssql-jtds-scenario/src/main/resources/jdbc.properties b/test/plugin/scenarios/mssql-jtds-scenario/src/main/resources/jdbc.properties index 718ac48..6c76b57 100644 --- a/test/plugin/scenarios/mssql-jtds-scenario/src/main/resources/jdbc.properties +++ b/test/plugin/scenarios/mssql-jtds-scenario/src/main/resources/jdbc.properties @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/mssql-jtds-scenario/support-version.list b/test/plugin/scenarios/mssql-jtds-scenario/support-version.list index a313c10..cf9b965 100644 --- a/test/plugin/scenarios/mssql-jtds-scenario/support-version.list +++ b/test/plugin/scenarios/mssql-jtds-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -20,4 +20,4 @@ 1.2.7 1.2.8 1.3.0 -1.3.1 \ No newline at end of file +1.3.1 diff --git a/test/plugin/scenarios/mysql-scenario/src/main/resources/jdbc.properties b/test/plugin/scenarios/mysql-scenario/src/main/resources/jdbc.properties index aad3ac1..5c266c3 100644 --- a/test/plugin/scenarios/mysql-scenario/src/main/resources/jdbc.properties +++ b/test/plugin/scenarios/mysql-scenario/src/main/resources/jdbc.properties @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/mysql-scenario/support-version.list b/test/plugin/scenarios/mysql-scenario/support-version.list index 6bd787f..a6885c3 100644 --- a/test/plugin/scenarios/mysql-scenario/support-version.list +++ b/test/plugin/scenarios/mysql-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -16,4 +16,4 @@ 8.0.15 6.0.6 -5.1.44 \ No newline at end of file +5.1.44 diff --git a/test/plugin/scenarios/oracle-scenario/support-version.list b/test/plugin/scenarios/oracle-scenario/support-version.list index 1da30f0..58b2e2f 100644 --- a/test/plugin/scenarios/oracle-scenario/support-version.list +++ b/test/plugin/scenarios/oracle-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/play-scenario/support-version.list b/test/plugin/scenarios/play-scenario/support-version.list index 3d549b4..92fbff7 100644 --- a/test/plugin/scenarios/play-scenario/support-version.list +++ b/test/plugin/scenarios/play-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/pulsar-scenario/support-version.list b/test/plugin/scenarios/pulsar-scenario/support-version.list index 313db84..57208a3 100644 --- a/test/plugin/scenarios/pulsar-scenario/support-version.list +++ b/test/plugin/scenarios/pulsar-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/support-version.list b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/support-version.list index f36d2f8..34b06ab 100644 --- a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/support-version.list +++ b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -17,4 +17,4 @@ 2.0.2 2.1.7 2.2.3 -2.3.2 \ No newline at end of file +2.3.2 diff --git a/test/plugin/scenarios/quasar-scenario/support-version.list b/test/plugin/scenarios/quasar-scenario/support-version.list index 92ec2e2..8a58040 100644 --- a/test/plugin/scenarios/quasar-scenario/support-version.list +++ b/test/plugin/scenarios/quasar-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/rabbitmq-scenario/support-version.list b/test/plugin/scenarios/rabbitmq-scenario/support-version.list index 198540c..0c77c7a 100644 --- a/test/plugin/scenarios/rabbitmq-scenario/support-version.list +++ b/test/plugin/scenarios/rabbitmq-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/redisson-scenario/support-version.list b/test/plugin/scenarios/redisson-scenario/support-version.list index 1a494c1..7800965 100644 --- a/test/plugin/scenarios/redisson-scenario/support-version.list +++ b/test/plugin/scenarios/redisson-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -20,4 +20,4 @@ 3.8.2 3.7.5 3.6.5 -3.5.7 \ No newline at end of file +3.5.7 diff --git a/test/plugin/scenarios/retransform-class-scenario/support-version.list b/test/plugin/scenarios/retransform-class-scenario/support-version.list index 05dfb02..658e529 100644 --- a/test/plugin/scenarios/retransform-class-scenario/support-version.list +++ b/test/plugin/scenarios/retransform-class-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -all \ No newline at end of file +all diff --git a/test/plugin/scenarios/retransform-class-tomcat-scenario/support-version.list b/test/plugin/scenarios/retransform-class-tomcat-scenario/support-version.list index 05dfb02..658e529 100644 --- a/test/plugin/scenarios/retransform-class-tomcat-scenario/support-version.list +++ b/test/plugin/scenarios/retransform-class-tomcat-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -all \ No newline at end of file +all diff --git a/test/plugin/scenarios/servicecomb-0.x-scenario/support-version.list b/test/plugin/scenarios/servicecomb-0.x-scenario/support-version.list index 285ca47..2a4870c 100644 --- a/test/plugin/scenarios/servicecomb-0.x-scenario/support-version.list +++ b/test/plugin/scenarios/servicecomb-0.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -18,4 +18,4 @@ 0.2.0 0.3.0 0.4.0 -0.5.0 \ No newline at end of file +0.5.0 diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/support-version.list b/test/plugin/scenarios/servicecomb-1.x-scenario/support-version.list index 1b4d8a6..38ff728 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/support-version.list +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -17,4 +17,4 @@ 1.0.0 1.1.0 1.2.1 -1.3.0 \ No newline at end of file +1.3.0 diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/support-version.list b/test/plugin/scenarios/shardingsphere-3.x-scenario/support-version.list index 7af80fa..62c408d 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/support-version.list +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -3.0.0 \ No newline at end of file +3.0.0 diff --git a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/support-version.list b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/support-version.list index ef8e0dd..5d4caa6 100644 --- a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/support-version.list +++ b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/support-version.list b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/support-version.list index b15f752..9794986 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/support-version.list +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -4.0.0-RC2 \ No newline at end of file +4.0.0-RC2 diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/support-version.list b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/support-version.list index 018119f..5e37c14 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/support-version.list +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/shardingsphere-4.x-scenario/support-version.list b/test/plugin/scenarios/shardingsphere-4.x-scenario/support-version.list index ab30342..1c8442c 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-scenario/support-version.list +++ b/test/plugin/scenarios/shardingsphere-4.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/sofarpc-scenario/support-version.list b/test/plugin/scenarios/sofarpc-scenario/support-version.list index 8b573d7..a1f5d43 100644 --- a/test/plugin/scenarios/sofarpc-scenario/support-version.list +++ b/test/plugin/scenarios/sofarpc-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/support-version.list b/test/plugin/scenarios/spring-3.0.x-scenario/support-version.list index 006b242..c689d6a 100644 --- a/test/plugin/scenarios/spring-3.0.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-3.0.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -3.0.7.RELEASE \ No newline at end of file +3.0.7.RELEASE diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/support-version.list b/test/plugin/scenarios/spring-3.1.x-scenario/support-version.list index a1502a3..46060fe 100644 --- a/test/plugin/scenarios/spring-3.1.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-3.1.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/support-version.list b/test/plugin/scenarios/spring-4.1.x-scenario/support-version.list index d0edb9d..0dfccb9 100644 --- a/test/plugin/scenarios/spring-4.1.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-4.1.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list b/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list index 905d97a..02096a6 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -17,4 +17,4 @@ 4.3.25.RELEASE 5.0.15.RELEASE 5.1.10.RELEASE -5.2.0.RELEASE \ No newline at end of file +5.2.0.RELEASE diff --git a/test/plugin/scenarios/spring-async-scenario/support-version.list b/test/plugin/scenarios/spring-async-scenario/support-version.list index ee193ac..932e6f8 100644 --- a/test/plugin/scenarios/spring-async-scenario/support-version.list +++ b/test/plugin/scenarios/spring-async-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/support-version.list b/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/support-version.list index a1b826b..e4317d9 100644 --- a/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/support-version.list b/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/support-version.list index 73f03fa..319f8f1 100644 --- a/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/support-version.list b/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/support-version.list index 58c0cdb..9dd6f0a 100644 --- a/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/support-version.list b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/support-version.list index 5d6463f..274e7e6 100644 --- a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -16,4 +16,4 @@ 1.3.9.RELEASE 1.3.10.RELEASE -1.3.11.RELEASE \ No newline at end of file +1.3.11.RELEASE diff --git a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/support-version.list b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/support-version.list index 0fee082..d6e81db 100644 --- a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -2.2.14.RELEASE \ No newline at end of file +2.2.14.RELEASE diff --git a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/support-version.list b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/support-version.list index 8b63bf2..6859d9a 100644 --- a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -2.3.10.RELEASE \ No newline at end of file +2.3.10.RELEASE diff --git a/test/plugin/scenarios/spring-scheduled-scenario/support-version.list b/test/plugin/scenarios/spring-scheduled-scenario/support-version.list index c044ff3..78ff603 100644 --- a/test/plugin/scenarios/spring-scheduled-scenario/support-version.list +++ b/test/plugin/scenarios/spring-scheduled-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -22,4 +22,4 @@ 4.3.28.RELEASE 5.0.18.RELEASE 5.1.17.RELEASE -5.2.8.RELEASE \ No newline at end of file +5.2.8.RELEASE diff --git a/test/plugin/scenarios/spring-tx-scenario/support-version.list b/test/plugin/scenarios/spring-tx-scenario/support-version.list index 9cad44a..c879f8a 100644 --- a/test/plugin/scenarios/spring-tx-scenario/support-version.list +++ b/test/plugin/scenarios/spring-tx-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -17,4 +17,4 @@ 2.1.9.RELEASE 2.0.9.RELEASE 1.5.22.RELEASE -1.4.7.RELEASE \ No newline at end of file +1.4.7.RELEASE diff --git a/test/plugin/scenarios/struts2.3-scenario/support-version.list b/test/plugin/scenarios/struts2.3-scenario/support-version.list index e8c88df..01181a9 100644 --- a/test/plugin/scenarios/struts2.3-scenario/support-version.list +++ b/test/plugin/scenarios/struts2.3-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -2.3.37 \ No newline at end of file +2.3.37 diff --git a/test/plugin/scenarios/struts2.5-scenario/support-version.list b/test/plugin/scenarios/struts2.5-scenario/support-version.list index fa9a95c..5b311d9 100644 --- a/test/plugin/scenarios/struts2.5-scenario/support-version.list +++ b/test/plugin/scenarios/struts2.5-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/thrift-scenario/support-version.list b/test/plugin/scenarios/thrift-scenario/support-version.list index ba27aa4..9dede31 100644 --- a/test/plugin/scenarios/thrift-scenario/support-version.list +++ b/test/plugin/scenarios/thrift-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -16,4 +16,4 @@ 0.12.0 0.11.0 -0.10.0 \ No newline at end of file +0.10.0 diff --git a/test/plugin/scenarios/undertow-scenario/support-version.list b/test/plugin/scenarios/undertow-scenario/support-version.list index 8d18490..420cc76 100644 --- a/test/plugin/scenarios/undertow-scenario/support-version.list +++ b/test/plugin/scenarios/undertow-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -21,4 +21,4 @@ 1.3.33.Final 1.4.27.Final -2.0.27.Final \ No newline at end of file +2.0.27.Final diff --git a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/support-version.list b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/support-version.list index 3234cf8..ddf3658 100644 --- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/support-version.list +++ b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -21,4 +21,4 @@ 3.5.4 3.4.2 3.3.3 -3.2.1 \ No newline at end of file +3.2.1 diff --git a/test/plugin/scenarios/vertx-web-3.54minus-scenario/support-version.list b/test/plugin/scenarios/vertx-web-3.54minus-scenario/support-version.list index f203bb1..9453033 100644 --- a/test/plugin/scenarios/vertx-web-3.54minus-scenario/support-version.list +++ b/test/plugin/scenarios/vertx-web-3.54minus-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -19,4 +19,4 @@ 3.3.3 3.2.1 3.1.0 -3.0.0 \ No newline at end of file +3.0.0 diff --git a/test/plugin/scenarios/vertx-web-3.6plus-scenario/support-version.list b/test/plugin/scenarios/vertx-web-3.6plus-scenario/support-version.list index cb46536..34af1cc 100644 --- a/test/plugin/scenarios/vertx-web-3.6plus-scenario/support-version.list +++ b/test/plugin/scenarios/vertx-web-3.6plus-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/support-version.list b/test/plugin/scenarios/xxl-job-2.x-scenario/support-version.list index aca6e94..988a930 100644 --- a/test/plugin/scenarios/xxl-job-2.x-scenario/support-version.list +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/support-version.list @@ -2,7 +2,7 @@ # 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 +# 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 # @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -2.2.0 \ No newline at end of file +2.2.0
