[3.3] Add dubbo-spring6-security plugin by splitting dubbo-spring-security (#15494)

* Add dubbo-spring6-security plugin by splitting dubbo-spring-security

* Fix FileTest to support dubbo-spring6-security

* Add dubbo-spring6-security and dubbo-plugin-loom to bom

Author: zrlw

.artifacts

@@ -107,6 +107,7 @@ dubbo-zookeeper-curator5-spring-boot-starter
 dubbo-sentinel-spring-boot-starter
 dubbo-seata-spring-boot-starter
 dubbo-spring-security
+dubbo-spring6-security
 dubbo-tracing
 dubbo-xds
 dubbo-plugin-loom

dubbo-distribution/dubbo-all-shaded/pom.xml

@@ -513,6 +513,7 @@
                   <include>org.apache.dubbo:dubbo-security</include>
                   <include>org.apache.dubbo:dubbo-reactive</include>
                   <include>org.apache.dubbo:dubbo-spring-security</include>
+                  <include>org.apache.dubbo:dubbo-spring6-security</include>
                   <include>org.apache.dubbo:dubbo-registry-api</include>
                   <include>org.apache.dubbo:dubbo-registry-multicast</include>
                   <include>org.apache.dubbo:dubbo-registry-multiple</include>
@@ -989,6 +990,21 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>spring6-security</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.dubbo</groupId>
+          <artifactId>dubbo-spring6-security</artifactId>
+          <version>${project.version}</version>
+          <scope>compile</scope>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
     <profile>
       <id>loom</id>
       <activation>
@@ -1007,6 +1023,13 @@
     <profile>
       <id>release</id>
       <dependencies>
+        <dependency>
+          <groupId>org.apache.dubbo</groupId>
+          <artifactId>dubbo-spring6-security</artifactId>
+          <version>${project.version}</version>
+          <scope>compile</scope>
+          <optional>true</optional>
+        </dependency>
         <dependency>
           <groupId>org.apache.dubbo</groupId>
           <artifactId>dubbo-plugin-loom</artifactId>

dubbo-distribution/dubbo-all/pom.xml

@@ -512,6 +512,7 @@
                   <include>org.apache.dubbo:dubbo-security</include>
                   <include>org.apache.dubbo:dubbo-reactive</include>
                   <include>org.apache.dubbo:dubbo-spring-security</include>
+                  <include>org.apache.dubbo:dubbo-spring6-security</include>
                   <include>org.apache.dubbo:dubbo-registry-api</include>
                   <include>org.apache.dubbo:dubbo-registry-multicast</include>
                   <include>org.apache.dubbo:dubbo-registry-multiple</include>
@@ -974,6 +975,21 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>spring6-security</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.dubbo</groupId>
+          <artifactId>dubbo-spring6-security</artifactId>
+          <version>${project.version}</version>
+          <scope>compile</scope>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
     <profile>
       <id>loom</id>
       <activation>
@@ -992,6 +1008,13 @@
     <profile>
       <id>release</id>
       <dependencies>
+        <dependency>
+          <groupId>org.apache.dubbo</groupId>
+          <artifactId>dubbo-spring6-security</artifactId>
+          <version>${project.version}</version>
+          <scope>compile</scope>
+          <optional>true</optional>
+        </dependency>
         <dependency>
           <groupId>org.apache.dubbo</groupId>
           <artifactId>dubbo-plugin-loom</artifactId>

dubbo-distribution/dubbo-bom/pom.xml

@@ -291,6 +291,18 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.dubbo</groupId>
+        <artifactId>dubbo-spring6-security</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.dubbo</groupId>
+        <artifactId>dubbo-plugin-loom</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-rest-jaxrs</artifactId>

dubbo-plugin/dubbo-spring-security/pom.xml

@@ -29,7 +29,6 @@
 
   <properties>
     <skip_maven_deploy>false</skip_maven_deploy>
-    <spring.oauth2.server>1.5.1</spring.oauth2.server>
   </properties>
 
   <dependencies>
@@ -59,26 +58,12 @@
       <artifactId>spring-security-core</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-oauth2-core</artifactId>
-      <optional>true</optional>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-oauth2-client</artifactId>
       <scope>test</scope>
       <optional>true</optional>
     </dependency>
-
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-oauth2-authorization-server</artifactId>
-      <version>${spring.oauth2.server}</version>
-      <scope>test</scope>
-      <optional>true</optional>
-    </dependency>
     <!-- spring security -->
 
     <!-- jackson -->

dubbo-plugin/dubbo-spring-security/src/main/java/org/apache/dubbo/spring/security/jackson/ObjectMapperCodec.java

@@ -21,19 +21,16 @@
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.utils.ClassUtils;
 import org.apache.dubbo.common.utils.StringUtils;
-import org.apache.dubbo.spring.security.oauth2.OAuth2SecurityModule;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.security.jackson2.CoreJackson2Module;
-import org.springframework.security.jackson2.SecurityJackson2Modules;
 
 public class ObjectMapperCodec {
 
@@ -104,10 +101,6 @@ public ObjectMapperCodec configureMapper(Consumer<ObjectMapper> objectMapperConf
     private void registerDefaultModule() {
         mapper.registerModule(new CoreJackson2Module());
         mapper.registerModule(new JavaTimeModule());
-        mapper.registerModule(new OAuth2SecurityModule());
-        List<Module> securityModules =
-                SecurityJackson2Modules.getModules(this.getClass().getClassLoader());
-        mapper.registerModules(securityModules);
 
         List<String> jacksonModuleClassNameList = new ArrayList<>();
         jacksonModuleClassNameList.add(

dubbo-plugin/dubbo-spring-security/src/test/java/org/apache/dubbo/spring/security/jackson/ObjectMapperCodecTest.java

@@ -29,7 +29,7 @@
 
 public class ObjectMapperCodecTest {
 
-    private ObjectMapperCodec mapper = new ObjectMapperCodec();
+    private final ObjectMapperCodec mapper = new ObjectMapperCodec();
 
     @Test
     public void testOAuth2AuthorizedClientCodec() {