mirror of https://github.com/google/oss-fuzz.git
138 lines
5.0 KiB
Diff
138 lines
5.0 KiB
Diff
diff --git a/acl/spring-security-acl.gradle b/acl/spring-security-acl.gradle
|
|
index 976d8d4..f01b423 100644
|
|
--- a/acl/spring-security-acl.gradle
|
|
+++ b/acl/spring-security-acl.gradle
|
|
@@ -1,3 +1,4 @@
|
|
+apply plugin: "com.github.johnrengelman.shadow"
|
|
apply plugin: 'io.spring.convention.spring-module'
|
|
|
|
dependencies {
|
|
diff --git a/build.gradle b/build.gradle
|
|
diff --git a/build.gradle b/build.gradle
|
|
index 21893a7..faf7dff 100644
|
|
--- a/build.gradle
|
|
+++ b/build.gradle
|
|
@@ -2,6 +2,7 @@ import io.spring.gradle.IncludeRepoTask
|
|
|
|
buildscript {
|
|
dependencies {
|
|
+ classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
|
|
classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion"
|
|
classpath 'io.spring.nohttp:nohttp-gradle:0.0.10'
|
|
classpath "io.freefair.gradle:aspectj-plugin:6.5.1"
|
|
@@ -14,6 +15,7 @@ buildscript {
|
|
}
|
|
}
|
|
|
|
+apply plugin: 'com.github.johnrengelman.shadow'
|
|
apply plugin: 'io.spring.nohttp'
|
|
apply plugin: 'locks'
|
|
apply plugin: 's101'
|
|
diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle
|
|
index 7818f34..4ef9150 100644
|
|
--- a/config/spring-security-config.gradle
|
|
+++ b/config/spring-security-config.gradle
|
|
@@ -1,5 +1,6 @@
|
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|
|
|
+apply plugin: 'com.github.johnrengelman.shadow'
|
|
apply plugin: 'io.spring.convention.spring-module'
|
|
apply plugin: 'trang'
|
|
apply plugin: 'kotlin'
|
|
diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle
|
|
index 2968d3d..9a1be67 100644
|
|
--- a/core/spring-security-core.gradle
|
|
+++ b/core/spring-security-core.gradle
|
|
@@ -1,5 +1,6 @@
|
|
import java.util.concurrent.Callable
|
|
|
|
+apply plugin: 'com.github.johnrengelman.shadow'
|
|
apply plugin: 'io.spring.convention.spring-module'
|
|
|
|
dependencies {
|
|
diff --git a/data/spring-security-data.gradle b/data/spring-security-data.gradle
|
|
index 3e915ef..1b4d55b 100644
|
|
--- a/data/spring-security-data.gradle
|
|
+++ b/data/spring-security-data.gradle
|
|
@@ -1,3 +1,4 @@
|
|
+apply plugin: 'com.github.johnrengelman.shadow'
|
|
apply plugin: 'io.spring.convention.spring-module'
|
|
|
|
dependencies {
|
|
diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle
|
|
index fb306f6..b27cd44 100644
|
|
--- a/dependencies/spring-security-dependencies.gradle
|
|
+++ b/dependencies/spring-security-dependencies.gradle
|
|
@@ -6,6 +6,8 @@ javaPlatform {
|
|
allowDependencies()
|
|
}
|
|
|
|
+apply plugin: "com.github.johnrengelman.shadow"
|
|
+
|
|
dependencies {
|
|
api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
|
|
api platform("io.projectreactor:reactor-bom:$reactorVersion")
|
|
diff --git a/ldap/spring-security-ldap.gradle b/ldap/spring-security-ldap.gradle
|
|
index c4f6c08..39023ed 100644
|
|
--- a/ldap/spring-security-ldap.gradle
|
|
+++ b/ldap/spring-security-ldap.gradle
|
|
@@ -1,3 +1,4 @@
|
|
+apply plugin: 'com.github.johnrengelman.shadow'
|
|
apply plugin: 'io.spring.convention.spring-module'
|
|
|
|
dependencies {
|
|
@@ -10,7 +11,7 @@ dependencies {
|
|
|
|
optional 'com.fasterxml.jackson.core:jackson-databind'
|
|
optional 'ldapsdk:ldapsdk'
|
|
- optional "com.unboundid:unboundid-ldapsdk"
|
|
+ api "com.unboundid:unboundid-ldapsdk"
|
|
optional "org.apache.directory.server:apacheds-core"
|
|
optional "org.apache.directory.server:apacheds-core-entry"
|
|
optional "org.apache.directory.server:apacheds-protocol-shared"
|
|
diff --git a/messaging/spring-security-messaging.gradle b/messaging/spring-security-messaging.gradle
|
|
index 64435e6..9f8526f 100644
|
|
--- a/messaging/spring-security-messaging.gradle
|
|
+++ b/messaging/spring-security-messaging.gradle
|
|
@@ -1,3 +1,4 @@
|
|
+apply plugin: 'com.github.johnrengelman.shadow'
|
|
apply plugin: 'io.spring.convention.spring-module'
|
|
|
|
dependencies {
|
|
diff --git a/oauth2/oauth2-core/spring-security-oauth2-core.gradle b/oauth2/oauth2-core/spring-security-oauth2-core.gradle
|
|
index 9fb4449..101532c 100644
|
|
--- a/oauth2/oauth2-core/spring-security-oauth2-core.gradle
|
|
+++ b/oauth2/oauth2-core/spring-security-oauth2-core.gradle
|
|
@@ -1,3 +1,4 @@
|
|
+apply plugin: 'com.github.johnrengelman.shadow'
|
|
apply plugin: 'io.spring.convention.spring-module'
|
|
|
|
dependencies {
|
|
diff --git a/test/spring-security-test.gradle b/test/spring-security-test.gradle
|
|
index 92b3868..b24d835 100644
|
|
--- a/test/spring-security-test.gradle
|
|
+++ b/test/spring-security-test.gradle
|
|
@@ -1,3 +1,4 @@
|
|
+apply plugin: "com.github.johnrengelman.shadow"
|
|
apply plugin: 'io.spring.convention.spring-module'
|
|
|
|
dependencies {
|
|
diff --git a/web/spring-security-web.gradle b/web/spring-security-web.gradle
|
|
index ca63924..45aea6f 100644
|
|
--- a/web/spring-security-web.gradle
|
|
+++ b/web/spring-security-web.gradle
|
|
@@ -1,3 +1,4 @@
|
|
+apply plugin: 'com.github.johnrengelman.shadow'
|
|
apply plugin: 'io.spring.convention.spring-module'
|
|
|
|
dependencies {
|
|
@@ -17,7 +18,7 @@ dependencies {
|
|
optional 'org.springframework:spring-webflux'
|
|
optional 'org.springframework:spring-webmvc'
|
|
|
|
- provided 'jakarta.servlet:jakarta.servlet-api'
|
|
+ api 'jakarta.servlet:jakarta.servlet-api'
|
|
|
|
testImplementation project(path: ':spring-security-core', configuration: 'tests')
|
|
testImplementation 'io.projectreactor:reactor-test'
|