Skip to content

Commit ea0976b

Browse files
zrlwzrlw
authored
[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
1 parent c8a8946 commit ea0976b

26 files changed

Lines changed: 555 additions & 35 deletions

File tree

‎.artifacts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ dubbo-zookeeper-curator5-spring-boot-starter
107107
dubbo-sentinel-spring-boot-starter
108108
dubbo-seata-spring-boot-starter
109109
dubbo-spring-security
110+
dubbo-spring6-security
110111
dubbo-tracing
111112
dubbo-xds
112113
dubbo-plugin-loom

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@
513513
<include>org.apache.dubbo:dubbo-security</include>
514514
<include>org.apache.dubbo:dubbo-reactive</include>
515515
<include>org.apache.dubbo:dubbo-spring-security</include>
516+
<include>org.apache.dubbo:dubbo-spring6-security</include>
516517
<include>org.apache.dubbo:dubbo-registry-api</include>
517518
<include>org.apache.dubbo:dubbo-registry-multicast</include>
518519
<include>org.apache.dubbo:dubbo-registry-multiple</include>
@@ -989,6 +990,21 @@
989990
</build>
990991

991992
<profiles>
993+
<profile>
994+
<id>spring6-security</id>
995+
<activation>
996+
<jdk>[17,)</jdk>
997+
</activation>
998+
<dependencies>
999+
<dependency>
1000+
<groupId>org.apache.dubbo</groupId>
1001+
<artifactId>dubbo-spring6-security</artifactId>
1002+
<version>${project.version}</version>
1003+
<scope>compile</scope>
1004+
<optional>true</optional>
1005+
</dependency>
1006+
</dependencies>
1007+
</profile>
9921008
<profile>
9931009
<id>loom</id>
9941010
<activation>
@@ -1007,6 +1023,13 @@
10071023
<profile>
10081024
<id>release</id>
10091025
<dependencies>
1026+
<dependency>
1027+
<groupId>org.apache.dubbo</groupId>
1028+
<artifactId>dubbo-spring6-security</artifactId>
1029+
<version>${project.version}</version>
1030+
<scope>compile</scope>
1031+
<optional>true</optional>
1032+
</dependency>
10101033
<dependency>
10111034
<groupId>org.apache.dubbo</groupId>
10121035
<artifactId>dubbo-plugin-loom</artifactId>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@
512512
<include>org.apache.dubbo:dubbo-security</include>
513513
<include>org.apache.dubbo:dubbo-reactive</include>
514514
<include>org.apache.dubbo:dubbo-spring-security</include>
515+
<include>org.apache.dubbo:dubbo-spring6-security</include>
515516
<include>org.apache.dubbo:dubbo-registry-api</include>
516517
<include>org.apache.dubbo:dubbo-registry-multicast</include>
517518
<include>org.apache.dubbo:dubbo-registry-multiple</include>
@@ -974,6 +975,21 @@
974975
</build>
975976

976977
<profiles>
978+
<profile>
979+
<id>spring6-security</id>
980+
<activation>
981+
<jdk>[17,)</jdk>
982+
</activation>
983+
<dependencies>
984+
<dependency>
985+
<groupId>org.apache.dubbo</groupId>
986+
<artifactId>dubbo-spring6-security</artifactId>
987+
<version>${project.version}</version>
988+
<scope>compile</scope>
989+
<optional>true</optional>
990+
</dependency>
991+
</dependencies>
992+
</profile>
977993
<profile>
978994
<id>loom</id>
979995
<activation>
@@ -992,6 +1008,13 @@
9921008
<profile>
9931009
<id>release</id>
9941010
<dependencies>
1011+
<dependency>
1012+
<groupId>org.apache.dubbo</groupId>
1013+
<artifactId>dubbo-spring6-security</artifactId>
1014+
<version>${project.version}</version>
1015+
<scope>compile</scope>
1016+
<optional>true</optional>
1017+
</dependency>
9951018
<dependency>
9961019
<groupId>org.apache.dubbo</groupId>
9971020
<artifactId>dubbo-plugin-loom</artifactId>

‎dubbo-distribution/dubbo-bom/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,18 @@
291291
<version>${project.version}</version>
292292
</dependency>
293293

294+
<dependency>
295+
<groupId>org.apache.dubbo</groupId>
296+
<artifactId>dubbo-spring6-security</artifactId>
297+
<version>${project.version}</version>
298+
</dependency>
299+
300+
<dependency>
301+
<groupId>org.apache.dubbo</groupId>
302+
<artifactId>dubbo-plugin-loom</artifactId>
303+
<version>${project.version}</version>
304+
</dependency>
305+
294306
<dependency>
295307
<groupId>org.apache.dubbo</groupId>
296308
<artifactId>dubbo-rest-jaxrs</artifactId>

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
<properties>
3131
<skip_maven_deploy>false</skip_maven_deploy>
32-
<spring.oauth2.server>1.5.1</spring.oauth2.server>
3332
</properties>
3433

3534
<dependencies>
@@ -59,26 +58,12 @@
5958
<artifactId>spring-security-core</artifactId>
6059
</dependency>
6160

62-
<dependency>
63-
<groupId>org.springframework.security</groupId>
64-
<artifactId>spring-security-oauth2-core</artifactId>
65-
<optional>true</optional>
66-
</dependency>
67-
6861
<dependency>
6962
<groupId>org.springframework.security</groupId>
7063
<artifactId>spring-security-oauth2-client</artifactId>
7164
<scope>test</scope>
7265
<optional>true</optional>
7366
</dependency>
74-
75-
<dependency>
76-
<groupId>org.springframework.security</groupId>
77-
<artifactId>spring-security-oauth2-authorization-server</artifactId>
78-
<version>${spring.oauth2.server}</version>
79-
<scope>test</scope>
80-
<optional>true</optional>
81-
</dependency>
8267
<!-- spring security -->
8368

8469
<!-- jackson -->

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,16 @@
2121
import org.apache.dubbo.common.logger.LoggerFactory;
2222
import org.apache.dubbo.common.utils.ClassUtils;
2323
import org.apache.dubbo.common.utils.StringUtils;
24-
import org.apache.dubbo.spring.security.oauth2.OAuth2SecurityModule;
2524

2625
import java.nio.charset.StandardCharsets;
2726
import java.util.ArrayList;
2827
import java.util.List;
2928
import java.util.function.Consumer;
3029

31-
import com.fasterxml.jackson.databind.Module;
3230
import com.fasterxml.jackson.databind.ObjectMapper;
3331
import com.fasterxml.jackson.databind.module.SimpleModule;
3432
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
3533
import org.springframework.security.jackson2.CoreJackson2Module;
36-
import org.springframework.security.jackson2.SecurityJackson2Modules;
3734

3835
public class ObjectMapperCodec {
3936

@@ -104,10 +101,6 @@ public ObjectMapperCodec configureMapper(Consumer<ObjectMapper> objectMapperConf
104101
private void registerDefaultModule() {
105102
mapper.registerModule(new CoreJackson2Module());
106103
mapper.registerModule(new JavaTimeModule());
107-
mapper.registerModule(new OAuth2SecurityModule());
108-
List<Module> securityModules =
109-
SecurityJackson2Modules.getModules(this.getClass().getClassLoader());
110-
mapper.registerModules(securityModules);
111104

112105
List<String> jacksonModuleClassNameList = new ArrayList<>();
113106
jacksonModuleClassNameList.add(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
public class ObjectMapperCodecTest {
3131

32-
private ObjectMapperCodec mapper = new ObjectMapperCodec();
32+
private final ObjectMapperCodec mapper = new ObjectMapperCodec();
3333

3434
@Test
3535
public void testOAuth2AuthorizedClientCodec() {

0 commit comments

Comments
 (0)