From 534893f3569bca20c7bfe5f437893b92c873336e Mon Sep 17 00:00:00 2001
From: crazyhzm <crazyhzm@gmail.com>
Date: Thu, 28 Sep 2023 16:03:56 +0800
Subject: [PATCH] Move dubbo-filter module to dubbo-plugin

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
---
 .artifacts                                    |  1 -
 dubbo-filter/pom.xml                          | 45 -------------------
 .../dubbo-filter-cache/pom.xml                |  4 +-
 .../java/org/apache/dubbo/cache/Cache.java    |  0
 .../org/apache/dubbo/cache/CacheFactory.java  |  0
 .../dubbo/cache/filter/CacheFilter.java       |  0
 .../cache/support/AbstractCacheFactory.java   |  0
 .../cache/support/expiring/ExpiringCache.java |  0
 .../expiring/ExpiringCacheFactory.java        |  0
 .../cache/support/expiring/ExpiringMap.java   |  0
 .../dubbo/cache/support/jcache/JCache.java    |  0
 .../cache/support/jcache/JCacheFactory.java   |  0
 .../dubbo/cache/support/lfu/LfuCache.java     |  0
 .../cache/support/lfu/LfuCacheFactory.java    |  0
 .../dubbo/cache/support/lru/LruCache.java     |  0
 .../cache/support/lru/LruCacheFactory.java    |  0
 .../support/threadlocal/ThreadLocalCache.java |  0
 .../threadlocal/ThreadLocalCacheFactory.java  |  0
 .../org.apache.dubbo.cache.CacheFactory       |  0
 .../internal/org.apache.dubbo.rpc.Filter      |  0
 .../dubbo/cache/filter/CacheFilterTest.java   |  0
 .../support/AbstractCacheFactoryTest.java     |  0
 .../expiring/ExpiringCacheFactoryTest.java    |  0
 .../support/jcache/JCacheFactoryTest.java     |  0
 .../support/lru/LruCacheFactoryTest.java      |  0
 .../ThreadLocalCacheFactoryTest.java          |  0
 .../src/test/resources/dubbo.properties       |  0
 .../dubbo-filter-validation/pom.xml           |  4 +-
 .../dubbo/validation/MethodValidated.java     |  0
 .../apache/dubbo/validation/Validation.java   |  0
 .../apache/dubbo/validation/Validator.java    |  0
 .../validation/filter/ValidationFilter.java   |  0
 .../support/AbstractValidation.java           |  0
 .../support/jvalidation/JValidation.java      |  0
 .../support/jvalidation/JValidationNew.java   |  0
 .../support/jvalidation/JValidator.java       |  0
 .../support/jvalidation/JValidatorNew.java    |  0
 .../internal/org.apache.dubbo.rpc.Filter      |  0
 .../org.apache.dubbo.validation.Validation    |  0
 .../filter/ValidationFilterTest.java          |  0
 .../support/jvalidation/JValidationTest.java  |  0
 .../support/jvalidation/JValidatorTest.java   |  0
 .../mock/JValidatorTestTarget.java            |  0
 .../jvalidation/mock/ValidationParameter.java |  0
 dubbo-plugin/pom.xml                          |  2 +
 pom.xml                                       |  1 -
 46 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 dubbo-filter/pom.xml
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/pom.xml (97%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/Cache.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/AbstractCacheFactory.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCache.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCache.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCacheFactory.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCache.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCache.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/AbstractCacheFactoryTest.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/jcache/JCacheFactoryTest.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/lru/LruCacheFactoryTest.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-cache/src/test/resources/dubbo.properties (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/pom.xml (98%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/MethodValidated.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidationNew.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidatorNew.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.validation.Validation (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/filter/ValidationFilterTest.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidatorTest.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java (100%)
 rename {dubbo-filter => dubbo-plugin}/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/ValidationParameter.java (100%)

diff --git a/.artifacts b/.artifacts
index a5f400f416d..03270a0f31a 100644
--- 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
deleted file mode 100644
index 4da7c40f595..00000000000
--- a/dubbo-filter/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-  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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-parent</artifactId>
-        <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>dubbo-filter</artifactId>
-    <packaging>pom</packaging>
-    <name>${project.artifactId}</name>
-    <description>The filter module of dubbo project</description>
-    <properties>
-        <skip_maven_deploy>false</skip_maven_deploy>
-    </properties>
-    <modules>
-        <module>dubbo-filter-cache</module>
-        <module>dubbo-filter-validation</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-test-check</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/dubbo-filter/dubbo-filter-cache/pom.xml b/dubbo-plugin/dubbo-filter-cache/pom.xml
similarity index 97%
rename from dubbo-filter/dubbo-filter-cache/pom.xml
rename to dubbo-plugin/dubbo-filter-cache/pom.xml
index 8241d23f457..a00c2e9041c 100644
--- a/dubbo-filter/dubbo-filter-cache/pom.xml
+++ b/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>
\ No newline at end of file
+</project>
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/Cache.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/Cache.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/Cache.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/Cache.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/AbstractCacheFactory.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/AbstractCacheFactory.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/AbstractCacheFactory.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/AbstractCacheFactory.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCache.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCache.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCache.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCache.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCache.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCache.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCache.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCache.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCacheFactory.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCacheFactory.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCacheFactory.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCacheFactory.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCache.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCache.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCache.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCache.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCache.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCache.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCache.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCache.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java b/dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java
rename to dubbo-plugin/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory b/dubbo-plugin/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory
rename to dubbo-plugin/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-plugin/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
rename to dubbo-plugin/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java b/dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java
rename to dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/AbstractCacheFactoryTest.java b/dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/AbstractCacheFactoryTest.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/AbstractCacheFactoryTest.java
rename to dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/AbstractCacheFactoryTest.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java b/dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java
rename to dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/jcache/JCacheFactoryTest.java b/dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/jcache/JCacheFactoryTest.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/jcache/JCacheFactoryTest.java
rename to dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/jcache/JCacheFactoryTest.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/lru/LruCacheFactoryTest.java b/dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/lru/LruCacheFactoryTest.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/lru/LruCacheFactoryTest.java
rename to dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/lru/LruCacheFactoryTest.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java b/dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java
rename to dubbo-plugin/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java
diff --git a/dubbo-filter/dubbo-filter-cache/src/test/resources/dubbo.properties b/dubbo-plugin/dubbo-filter-cache/src/test/resources/dubbo.properties
similarity index 100%
rename from dubbo-filter/dubbo-filter-cache/src/test/resources/dubbo.properties
rename to dubbo-plugin/dubbo-filter-cache/src/test/resources/dubbo.properties
diff --git a/dubbo-filter/dubbo-filter-validation/pom.xml b/dubbo-plugin/dubbo-filter-validation/pom.xml
similarity index 98%
rename from dubbo-filter/dubbo-filter-validation/pom.xml
rename to dubbo-plugin/dubbo-filter-validation/pom.xml
index e3027062a91..48ff349ad9d 100644
--- a/dubbo-filter/dubbo-filter-validation/pom.xml
+++ b/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>
\ No newline at end of file
+</project>
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/MethodValidated.java b/dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/MethodValidated.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/MethodValidated.java
rename to dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/MethodValidated.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java b/dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java
rename to dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java b/dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java
rename to dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java b/dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java
rename to dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java b/dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java
rename to dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java b/dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java
rename to dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidationNew.java b/dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidationNew.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidationNew.java
rename to dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidationNew.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java b/dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java
rename to dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidatorNew.java b/dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidatorNew.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidatorNew.java
rename to dubbo-plugin/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidatorNew.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-plugin/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
rename to dubbo-plugin/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.validation.Validation b/dubbo-plugin/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.validation.Validation
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.validation.Validation
rename to dubbo-plugin/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.validation.Validation
diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/filter/ValidationFilterTest.java b/dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/filter/ValidationFilterTest.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/filter/ValidationFilterTest.java
rename to dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/filter/ValidationFilterTest.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java b/dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java
rename to dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidatorTest.java b/dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidatorTest.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidatorTest.java
rename to dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidatorTest.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java b/dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java
rename to dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java
diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/ValidationParameter.java b/dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/ValidationParameter.java
similarity index 100%
rename from dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/ValidationParameter.java
rename to dubbo-plugin/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/ValidationParameter.java
diff --git a/dubbo-plugin/pom.xml b/dubbo-plugin/pom.xml
index 932b9567bcc..3d38c11f9e9 100644
--- 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
index 3d65a78e033..5673976ccfb 100644
--- 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>