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

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


    from d616544  Merge branch 'master' into webapp_refactoring
     add 156678a  Move ehcache-2.x plugin as optional (#7236)
     add ec29d54  Merge branch 'master' into webapp_refactoring

No new revisions were added by this update.

Summary of changes:
 CHANGES.md                                                              | 1 +
 apm-sniffer/apm-sdk-plugin/pom.xml                                      | 1 -
 .../{apm-sdk-plugin => optional-plugins}/ehcache-2.x-plugin/pom.xml     | 2 +-
 .../skywalking/apm/plugin/ehcache/v2/EhcacheCacheNameInterceptor.java   | 0
 .../skywalking/apm/plugin/ehcache/v2/EhcacheConstructorInterceptor.java | 0
 .../org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheEnhanceInfo.java | 0
 .../apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java | 0
 .../skywalking/apm/plugin/ehcache/v2/EhcacheOperateAllInterceptor.java  | 0
 .../apm/plugin/ehcache/v2/EhcacheOperateElementInterceptor.java         | 0
 .../apm/plugin/ehcache/v2/EhcacheOperateObjectInterceptor.java          | 0
 .../apm/plugin/ehcache/v2/EhcachePrivateConstructorInterceptor.java     | 0
 .../apm/plugin/ehcache/v2/define/EhcachePluginInstrumentation.java      | 0
 .../ehcache-2.x-plugin/src/main/resources/skywalking-plugin.def         | 0
 .../apache/skywalking/apm/plugin/ehcache/v2/EhcacheInterceptorTest.java | 0
 apm-sniffer/optional-plugins/pom.xml                                    | 1 +
 docs/en/setup/service-agent/java-agent/README.md                        | 1 +
 test/plugin/scenarios/ehcache-2.x-scenario/configuration.yml            | 2 ++
 17 files changed, 6 insertions(+), 2 deletions(-)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/pom.xml (96%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheCacheNameInterceptor.java
 (100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheConstructorInterceptor.java
 (100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheEnhanceInfo.java
 (100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java
 (100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateAllInterceptor.java
 (100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateElementInterceptor.java
 (100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateObjectInterceptor.java
 (100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcachePrivateConstructorInterceptor.java
 (100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/define/EhcachePluginInstrumentation.java
 (100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/main/resources/skywalking-plugin.def 
(100%)
 rename apm-sniffer/{apm-sdk-plugin => 
optional-plugins}/ehcache-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheInterceptorTest.java
 (100%)

Reply via email to