You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2023/01/16 03:50:41 UTC
[skywalking-java] branch test/ci/spring6 updated (583e57ab66 -> 02def1df44)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch test/ci/spring6
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
discard 583e57ab66 Add Spring 6 to test case
new 02def1df44 Add Spring 6 to test case
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (583e57ab66)
\
N -- N -- N refs/heads/test/ci/spring6 (02def1df44)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../scenarios/spring-4.3.x-scenario/support-version.list | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
[skywalking-java] 01/01: Add Spring 6 to test case
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch test/ci/spring6
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 02def1df442662a6bf0a9fa51016ac4dbb4a6be7
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Jan 16 11:50:34 2023 +0800
Add Spring 6 to test case
---
.github/actions/run/action.yml | 2 +-
.github/workflows/plugins-jdk17-test.0.yaml | 3 ++-
.github/workflows/plugins-test.3.yaml | 1 -
.../containers/tomcat-container/src/main/docker/catalina.sh | 2 +-
test/plugin/scenarios/spring-4.3.x-scenario/pom.xml | 5 +++++
.../scenarios/spring-4.3.x-scenario/support-version.list | 13 +++++++------
6 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/.github/actions/run/action.yml b/.github/actions/run/action.yml
index 57b711de0a..28f72df800 100644
--- a/.github/actions/run/action.yml
+++ b/.github/actions/run/action.yml
@@ -51,5 +51,5 @@ runs:
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 }}
+ bash test/plugin/run.sh ${{ inputs.test_case }}
echo "::endgroup::"
diff --git a/.github/workflows/plugins-jdk17-test.0.yaml b/.github/workflows/plugins-jdk17-test.0.yaml
index d496c158ab..fc220b10d2 100644
--- a/.github/workflows/plugins-jdk17-test.0.yaml
+++ b/.github/workflows/plugins-jdk17-test.0.yaml
@@ -48,7 +48,7 @@ jobs:
uses: ./.github/actions/build
with:
base_image_java: eclipse-temurin:17-jdk
- base_image_tomcat: tomcat:8.5-jdk17-openjdk
+ base_image_tomcat: tomcat:10.1-jdk17-temurin
test:
needs: [ build ]
@@ -59,6 +59,7 @@ jobs:
matrix:
case:
- jdk17-with-gson-scenario
+ - spring-4.3.x-scenario
# TODO: We can't test it just yet, because it requires a Skywalking release
# - resttemplate-6.x-scenario
steps:
diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml
index 0a8cdab1d9..84d4aa6aa1 100644
--- a/.github/workflows/plugins-test.3.yaml
+++ b/.github/workflows/plugins-test.3.yaml
@@ -61,7 +61,6 @@ jobs:
- zookeeper-scenario
- spring-3.1.x-scenario
- spring-4.1.x-scenario
- - spring-4.3.x-scenario
- spring-async-scenario
- vertx-core-4.x-scenario
- vertx-eventbus-3.x-scenario
diff --git a/test/plugin/containers/tomcat-container/src/main/docker/catalina.sh b/test/plugin/containers/tomcat-container/src/main/docker/catalina.sh
index 188d15eba9..416c41a8bb 100644
--- a/test/plugin/containers/tomcat-container/src/main/docker/catalina.sh
+++ b/test/plugin/containers/tomcat-container/src/main/docker/catalina.sh
@@ -119,7 +119,7 @@ if [ -f "${AGENT_FILE_PATH}/skywalking-agent.jar" ]; then
-Dskywalking.agent.authentication=test-token
-Dskywalking.meter.report_interval=1
-Dskywalking.logging.dir=${LOGS_HOME}
- -Xms256m -Xmx256m -XX:PermSize=64M -XX:MaxPermSize=64"
+ -Xms256m -Xmx256m"
fi
# OS specific support. $var _must_ be set to either true or false.
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml b/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml
index e42f589827..7b4e7bdc0b 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml
@@ -98,6 +98,11 @@
<build>
<finalName>spring-4.3.x-scenario</finalName>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
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 48d635b044..a41d9216a9 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
@@ -14,9 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-4.3.16.RELEASE
-4.3.24.RELEASE
-4.3.25.RELEASE
-5.0.15.RELEASE
-5.1.10.RELEASE
-5.2.0.RELEASE
+# 4.3.16.RELEASE
+# 4.3.24.RELEASE
+# 4.3.25.RELEASE
+# 5.0.15.RELEASE
+# 5.1.10.RELEASE
+# 5.2.0.RELEASE
+6.0.0