Skip to content

Commit 8f09d93

Browse files
ngocnhan-tran1996ngocnhan-tran1996
committed
Resolve conflict
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2 parents f77e0b9 + 727f0e2 commit 8f09d93

1,834 files changed

Lines changed: 120530 additions & 4172 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ atlassian-ide-plugin.xml
2525
s101plugin.state
2626
.attach_pid*
2727
.~lock.*#
28+
.kotlin/
2829

2930
!.idea/checkstyle-idea.xml
3031
!.idea/externalDependencies.xml

‎access/spring-security-access.gradle‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
apply plugin: 'io.spring.convention.spring-module'
2+
3+
dependencies {
4+
management platform(project(":spring-security-dependencies"))
5+
api project(':spring-security-crypto')
6+
api project(':spring-security-core')
7+
api 'org.springframework:spring-aop'
8+
api 'org.springframework:spring-beans'
9+
api 'org.springframework:spring-context'
10+
api 'org.springframework:spring-core'
11+
api 'org.springframework:spring-expression'
12+
api 'io.micrometer:micrometer-observation'
13+
14+
optional project(':spring-security-acl')
15+
optional project(':spring-security-messaging')
16+
optional project(':spring-security-web')
17+
optional 'org.springframework:spring-websocket'
18+
optional 'com.fasterxml.jackson.core:jackson-databind'
19+
optional 'io.micrometer:context-propagation'
20+
optional 'io.projectreactor:reactor-core'
21+
optional 'jakarta.annotation:jakarta.annotation-api'
22+
optional 'org.aspectj:aspectjrt'
23+
optional 'org.springframework:spring-jdbc'
24+
optional 'org.springframework:spring-tx'
25+
optional 'org.jetbrains.kotlinx:kotlinx-coroutines-reactor'
26+
27+
provided 'jakarta.servlet:jakarta.servlet-api'
28+
29+
testImplementation project(path : ':spring-security-web', configuration : 'tests')
30+
testImplementation 'commons-collections:commons-collections'
31+
testImplementation 'io.projectreactor:reactor-test'
32+
testImplementation "org.assertj:assertj-core"
33+
testImplementation "org.junit.jupiter:junit-jupiter-api"
34+
testImplementation "org.junit.jupiter:junit-jupiter-params"
35+
testImplementation "org.junit.jupiter:junit-jupiter-engine"
36+
testImplementation "org.mockito:mockito-core"
37+
testImplementation "org.mockito:mockito-junit-jupiter"
38+
testImplementation "org.springframework:spring-core-test"
39+
testImplementation "org.springframework:spring-test"
40+
testImplementation 'org.skyscreamer:jsonassert'
41+
testImplementation 'org.springframework:spring-test'
42+
testImplementation 'org.jetbrains.kotlin:kotlin-reflect'
43+
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
44+
testImplementation 'io.mockk:mockk'
45+
46+
testRuntimeOnly 'org.hsqldb:hsqldb'
47+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
48+
}
49+

core/src/main/java/org/springframework/security/access/AccessDecisionManager.java renamed to access/src/main/java/org/springframework/security/access/AccessDecisionManager.java

File renamed without changes.

core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java renamed to access/src/main/java/org/springframework/security/access/AccessDecisionVoter.java

File renamed without changes.

core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java renamed to access/src/main/java/org/springframework/security/access/AfterInvocationProvider.java

File renamed without changes.

core/src/main/java/org/springframework/security/access/ConfigAttribute.java renamed to access/src/main/java/org/springframework/security/access/ConfigAttribute.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import java.io.Serializable;
2020

21+
import org.jspecify.annotations.NullUnmarked;
22+
2123
import org.springframework.security.access.intercept.RunAsManager;
2224
import org.springframework.security.authorization.AuthorizationManager;
2325
import org.springframework.security.core.annotation.SecurityAnnotationScanner;
@@ -45,6 +47,7 @@
4547
* {@link AuthorizationManager}.
4648
*/
4749
@Deprecated
50+
@NullUnmarked
4851
public interface ConfigAttribute extends Serializable {
4952

5053
/**

core/src/main/java/org/springframework/security/access/SecurityConfig.java renamed to access/src/main/java/org/springframework/security/access/SecurityConfig.java

File renamed without changes.

core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java renamed to access/src/main/java/org/springframework/security/access/SecurityMetadataSource.java

File renamed without changes.

core/src/main/java/org/springframework/security/access/annotation/AnnotationMetadataExtractor.java renamed to access/src/main/java/org/springframework/security/access/annotation/AnnotationMetadataExtractor.java

File renamed without changes.

core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java renamed to access/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java

File renamed without changes.

0 commit comments

Comments
 (0)