apache · CrazyHZM · Oct 9, 2023 · Sep 28, 2023 · Sep 28, 2023 · Oct 7, 2023
diff --git a/.artifacts b/.artifacts
@@ -44,7 +44,6 @@ dubbo-dependencies-bom
 dubbo-dependencies-zookeeper
 dubbo-dependencies-zookeeper-curator5
 dubbo-distribution
-dubbo-filter
 dubbo-filter-cache
 dubbo-filter-validation
 dubbo-kubernetes

diff --git a/dubbo-filter/pom.xml b/dubbo-filter/pom.xml
diff --git a/dubbo-filter/dubbo-filter-cache/pom.xml → dubbo-plugin/dubbo-filter-cache/pom.xml b/dubbo-filter/dubbo-filter-cache/pom.xml → dubbo-plugin/dubbo-filter-cache/pom.xml
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-filter</artifactId>
+        <artifactId>dubbo-plugin</artifactId>
         <version>${revision}</version>
     </parent>
     <artifactId>dubbo-filter-cache</artifactId>
@@ -45,4 +45,4 @@
             <version>${hazelcast_version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/...in/java/org/apache/dubbo/cache/Cache.java → ...in/java/org/apache/dubbo/cache/Cache.java b/...in/java/org/apache/dubbo/cache/Cache.java → ...in/java/org/apache/dubbo/cache/Cache.java
diff --git a/.../org/apache/dubbo/cache/CacheFactory.java → .../org/apache/dubbo/cache/CacheFactory.java b/.../org/apache/dubbo/cache/CacheFactory.java → .../org/apache/dubbo/cache/CacheFactory.java
diff --git a/...pache/dubbo/cache/filter/CacheFilter.java → ...pache/dubbo/cache/filter/CacheFilter.java b/...pache/dubbo/cache/filter/CacheFilter.java → ...pache/dubbo/cache/filter/CacheFilter.java
diff --git a/...o/cache/support/AbstractCacheFactory.java → ...o/cache/support/AbstractCacheFactory.java b/...o/cache/support/AbstractCacheFactory.java → ...o/cache/support/AbstractCacheFactory.java
diff --git a/...cache/support/expiring/ExpiringCache.java → ...cache/support/expiring/ExpiringCache.java b/...cache/support/expiring/ExpiringCache.java → ...cache/support/expiring/ExpiringCache.java
diff --git a/...upport/expiring/ExpiringCacheFactory.java → ...upport/expiring/ExpiringCacheFactory.java b/...upport/expiring/ExpiringCacheFactory.java → ...upport/expiring/ExpiringCacheFactory.java
diff --git a/...o/cache/support/expiring/ExpiringMap.java → ...o/cache/support/expiring/ExpiringMap.java b/...o/cache/support/expiring/ExpiringMap.java → ...o/cache/support/expiring/ExpiringMap.java
diff --git a/...he/dubbo/cache/support/jcache/JCache.java → ...he/dubbo/cache/support/jcache/JCache.java b/...he/dubbo/cache/support/jcache/JCache.java → ...he/dubbo/cache/support/jcache/JCache.java
diff --git a/...o/cache/support/jcache/JCacheFactory.java → ...o/cache/support/jcache/JCacheFactory.java b/...o/cache/support/jcache/JCacheFactory.java → ...o/cache/support/jcache/JCacheFactory.java
diff --git a/...che/dubbo/cache/support/lfu/LfuCache.java → ...che/dubbo/cache/support/lfu/LfuCache.java b/...che/dubbo/cache/support/lfu/LfuCache.java → ...che/dubbo/cache/support/lfu/LfuCache.java
diff --git a/...bo/cache/support/lfu/LfuCacheFactory.java → ...bo/cache/support/lfu/LfuCacheFactory.java b/...bo/cache/support/lfu/LfuCacheFactory.java → ...bo/cache/support/lfu/LfuCacheFactory.java
diff --git a/...che/dubbo/cache/support/lru/LruCache.java → ...che/dubbo/cache/support/lru/LruCache.java b/...che/dubbo/cache/support/lru/LruCache.java → ...che/dubbo/cache/support/lru/LruCache.java
diff --git a/...bo/cache/support/lru/LruCacheFactory.java → ...bo/cache/support/lru/LruCacheFactory.java b/...bo/cache/support/lru/LruCacheFactory.java → ...bo/cache/support/lru/LruCacheFactory.java
diff --git a/...support/threadlocal/ThreadLocalCache.java → ...support/threadlocal/ThreadLocalCache.java b/...support/threadlocal/ThreadLocalCache.java → ...support/threadlocal/ThreadLocalCache.java
diff --git a/.../threadlocal/ThreadLocalCacheFactory.java → .../threadlocal/ThreadLocalCacheFactory.java b/.../threadlocal/ThreadLocalCacheFactory.java → .../threadlocal/ThreadLocalCacheFactory.java
diff --git a/...ernal/org.apache.dubbo.cache.CacheFactory → ...ernal/org.apache.dubbo.cache.CacheFactory b/...ernal/org.apache.dubbo.cache.CacheFactory → ...ernal/org.apache.dubbo.cache.CacheFactory
diff --git a/...ubbo/internal/org.apache.dubbo.rpc.Filter → ...ubbo/internal/org.apache.dubbo.rpc.Filter b/...ubbo/internal/org.apache.dubbo.rpc.Filter → ...ubbo/internal/org.apache.dubbo.rpc.Filter
diff --git a/...e/dubbo/cache/filter/CacheFilterTest.java → ...e/dubbo/cache/filter/CacheFilterTest.java b/...e/dubbo/cache/filter/CacheFilterTest.java → ...e/dubbo/cache/filter/CacheFilterTest.java
diff --git a/...che/support/AbstractCacheFactoryTest.java → ...che/support/AbstractCacheFactoryTest.java b/...che/support/AbstractCacheFactoryTest.java → ...che/support/AbstractCacheFactoryTest.java
diff --git a/...rt/expiring/ExpiringCacheFactoryTest.java → ...rt/expiring/ExpiringCacheFactoryTest.java b/...rt/expiring/ExpiringCacheFactoryTest.java → ...rt/expiring/ExpiringCacheFactoryTest.java
diff --git a/...che/support/jcache/JCacheFactoryTest.java → ...che/support/jcache/JCacheFactoryTest.java b/...che/support/jcache/JCacheFactoryTest.java → ...che/support/jcache/JCacheFactoryTest.java
diff --git a/...ache/support/lru/LruCacheFactoryTest.java → ...ache/support/lru/LruCacheFactoryTest.java b/...ache/support/lru/LruCacheFactoryTest.java → ...ache/support/lru/LruCacheFactoryTest.java
diff --git a/...eadlocal/ThreadLocalCacheFactoryTest.java → ...eadlocal/ThreadLocalCacheFactoryTest.java b/...eadlocal/ThreadLocalCacheFactoryTest.java → ...eadlocal/ThreadLocalCacheFactoryTest.java
diff --git a/...cache/src/test/resources/dubbo.properties → ...cache/src/test/resources/dubbo.properties b/...cache/src/test/resources/dubbo.properties → ...cache/src/test/resources/dubbo.properties
diff --git a/dubbo-filter/dubbo-filter-validation/pom.xml → dubbo-plugin/dubbo-filter-validation/pom.xml b/dubbo-filter/dubbo-filter-validation/pom.xml → dubbo-plugin/dubbo-filter-validation/pom.xml
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-filter</artifactId>
+        <artifactId>dubbo-plugin</artifactId>
         <version>${revision}</version>
     </parent>
     <artifactId>dubbo-filter-validation</artifactId>
@@ -73,4 +73,4 @@
             <version>${jaxb_api_version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/...che/dubbo/validation/MethodValidated.java → ...che/dubbo/validation/MethodValidated.java b/...che/dubbo/validation/MethodValidated.java → ...che/dubbo/validation/MethodValidated.java
diff --git a/...g/apache/dubbo/validation/Validation.java → ...g/apache/dubbo/validation/Validation.java b/...g/apache/dubbo/validation/Validation.java → ...g/apache/dubbo/validation/Validation.java
diff --git a/...rg/apache/dubbo/validation/Validator.java → ...rg/apache/dubbo/validation/Validator.java b/...rg/apache/dubbo/validation/Validator.java → ...rg/apache/dubbo/validation/Validator.java
diff --git a/...o/validation/filter/ValidationFilter.java → ...o/validation/filter/ValidationFilter.java b/...o/validation/filter/ValidationFilter.java → ...o/validation/filter/ValidationFilter.java
diff --git a/...alidation/support/AbstractValidation.java → ...alidation/support/AbstractValidation.java b/...alidation/support/AbstractValidation.java → ...alidation/support/AbstractValidation.java
diff --git a/...tion/support/jvalidation/JValidation.java → ...tion/support/jvalidation/JValidation.java b/...tion/support/jvalidation/JValidation.java → ...tion/support/jvalidation/JValidation.java
diff --git a/...n/support/jvalidation/JValidationNew.java → ...n/support/jvalidation/JValidationNew.java b/...n/support/jvalidation/JValidationNew.java → ...n/support/jvalidation/JValidationNew.java
diff --git a/...ation/support/jvalidation/JValidator.java → ...ation/support/jvalidation/JValidator.java b/...ation/support/jvalidation/JValidator.java → ...ation/support/jvalidation/JValidator.java
diff --git a/...on/support/jvalidation/JValidatorNew.java → ...on/support/jvalidation/JValidatorNew.java b/...on/support/jvalidation/JValidatorNew.java → ...on/support/jvalidation/JValidatorNew.java
diff --git a/...ubbo/internal/org.apache.dubbo.rpc.Filter → ...ubbo/internal/org.apache.dubbo.rpc.Filter b/...ubbo/internal/org.apache.dubbo.rpc.Filter → ...ubbo/internal/org.apache.dubbo.rpc.Filter
diff --git a/...al/org.apache.dubbo.validation.Validation → ...al/org.apache.dubbo.validation.Validation b/...al/org.apache.dubbo.validation.Validation → ...al/org.apache.dubbo.validation.Validation
diff --git a/...lidation/filter/ValidationFilterTest.java → ...lidation/filter/ValidationFilterTest.java b/...lidation/filter/ValidationFilterTest.java → ...lidation/filter/ValidationFilterTest.java
diff --git a/.../support/jvalidation/JValidationTest.java → .../support/jvalidation/JValidationTest.java b/.../support/jvalidation/JValidationTest.java → .../support/jvalidation/JValidationTest.java
diff --git a/...n/support/jvalidation/JValidatorTest.java → ...n/support/jvalidation/JValidatorTest.java b/...n/support/jvalidation/JValidatorTest.java → ...n/support/jvalidation/JValidatorTest.java
diff --git a/...validation/mock/JValidatorTestTarget.java → ...validation/mock/JValidatorTestTarget.java b/...validation/mock/JValidatorTestTarget.java → ...validation/mock/JValidatorTestTarget.java
diff --git a/...jvalidation/mock/ValidationParameter.java → ...jvalidation/mock/ValidationParameter.java b/...jvalidation/mock/ValidationParameter.java → ...jvalidation/mock/ValidationParameter.java
diff --git a/dubbo-plugin/pom.xml b/dubbo-plugin/pom.xml
@@ -51,6 +51,8 @@
         <module>dubbo-plugin-classloader-filter</module>
         <module>dubbo-plugin-proxy-bytebuddy</module>
         <module>dubbo-plugin-qos-trace</module>
+        <module>dubbo-filter-cache</module>
+        <module>dubbo-filter-validation</module>
     </modules>
     <properties>
         <skip_maven_deploy>false</skip_maven_deploy>

diff --git a/pom.xml b/pom.xml
@@ -151,7 +151,6 @@
         <module>dubbo-registry</module>
         <module>dubbo-monitor</module>
         <module>dubbo-config</module>
-        <module>dubbo-filter</module>
         <module>dubbo-demo</module>
         <module>dubbo-plugin</module>
         <module>dubbo-serialization</module>