You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/03/02 07:42:22 UTC

[skywalking-java] branch chore created (now 75627ea)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch chore
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.


      at 75627ea  Add Tomcat 10 and 10.1 as base images.

This branch includes the following new commits:

     new 75627ea  Add Tomcat 10 and 10.1 as base images.

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.


[skywalking-java] 01/01: Add Tomcat 10 and 10.1 as base images.

Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch chore
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git

commit 75627ea211bea7759a2270bc55b737b74c7d0184
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Mar 2 15:41:58 2022 +0800

    Add Tomcat 10 and 10.1 as base images.
---
 CHANGES.md                                            |  1 +
 docs/en/setup/service-agent/java-agent/Plugin-test.md |  2 +-
 test/plugin/containers/tomcat-container/pom.xml       | 16 +++++++++++++++-
 test/plugin/pom.xml                                   |  3 ---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6e7639c..a0530c7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Release Notes.
 * Ignore the synthetic constructor created by the agent in the Spring patch plugin.
 * Add witness class for vertx-core-3.x plugin.
 * Add witness class for graphql plugin.
+* [Test] Add `tomcat:10.0-jdk8-openjdk` and `tomcat:10.1-jdk11-openjdk` as plugin test base images.
 
 #### Documentation
 * Add link about java agent injector.
diff --git a/docs/en/setup/service-agent/java-agent/Plugin-test.md b/docs/en/setup/service-agent/java-agent/Plugin-test.md
index 84769ba..f64652f 100644
--- a/docs/en/setup/service-agent/java-agent/Plugin-test.md
+++ b/docs/en/setup/service-agent/java-agent/Plugin-test.md
@@ -31,7 +31,7 @@ Take the following test projects as examples:
 
 ### Tomcat-container Image Introduction
 
-[Tomcat-container](../../../../../test/plugin/containers/tomcat-container) uses `tomcat:8.5-jdk8-openjdk`, `tomcat:8.5-jdk14-openjdk` or `tomcat:8.5-jdk17-openjdk` as the base image.
+[Tomcat-container](../../../../../test/plugin/containers/tomcat-container) uses `tomcat:8.5-jdk8-openjdk`, `tomcat:8.5-jdk14-openjdk`, `tomcat:8.5-jdk17-openjdk`, `tomcat:10.0-jdk8-openjdk`, or `tomcat:10.1-jdk11-openjdk` as the base image.
 The test case project must be packaged as `project-name.war` by using `mvn package`.
 
 Take the following test project as an example
diff --git a/test/plugin/containers/tomcat-container/pom.xml b/test/plugin/containers/tomcat-container/pom.xml
index de77c92..61771ea 100644
--- a/test/plugin/containers/tomcat-container/pom.xml
+++ b/test/plugin/containers/tomcat-container/pom.xml
@@ -99,6 +99,20 @@
                 <base.image.tomcat>tomcat:8.5-jdk17-openjdk</base.image.tomcat>
                 <java.version>jdk17</java.version>
             </properties>
-       </profile>
+        </profile>
+        <profile>
+            <id>jdk8-tomcat10.0</id>
+            <properties>
+                <base.image.tomcat>tomcat:10.0-jdk8-openjdk</base.image.tomcat>
+                <java.version>jdk8</java.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>jdk11-tomcat10.1</id>
+            <properties>
+                <base.image.tomcat>tomcat:10.1-jdk11-openjdk</base.image.tomcat>
+                <java.version>jdk11</java.version>
+            </properties>
+        </profile>
     </profiles>
 </project>
\ No newline at end of file
diff --git a/test/plugin/pom.xml b/test/plugin/pom.xml
index b9df3c6..d4811bf 100644
--- a/test/plugin/pom.xml
+++ b/test/plugin/pom.xml
@@ -131,9 +131,6 @@
                     <sourceDirectories>
                         <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
                         <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
-<sourceDirectory>scenarios/dbcp-2.x-scenario</sourceDirectory>
-<sourceDirectory>scenarios/druid-1.x-scenario</sourceDirectory>
-<sourceDirectory>scenarios/druid-1.x</sourceDirectory>
                     </sourceDirectories>
                     <resourceIncludes>
                         **/*.properties,