Skip to content

Commit 736f1c2

Browse files
Remove updateDependencies plugin
Closes gh-13966
1 parent ec58bf0 commit 736f1c2

File tree

10 files changed

+1
-917
lines changed

10 files changed

+1
-917
lines changed

build.gradle

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ apply plugin: 'locks'
1919
apply plugin: 's101'
2020
apply plugin: 'io.spring.convention.root'
2121
apply plugin: 'org.jetbrains.kotlin.jvm'
22-
apply plugin: 'org.springframework.security.update-dependencies'
2322
apply plugin: 'org.springframework.security.update-version'
2423
apply plugin: 'org.springframework.security.sagan'
2524
apply plugin: 'org.springframework.github.milestone'
@@ -86,58 +85,6 @@ tasks.named("dispatchGitHubWorkflow") {
8685
}
8786
}
8887

89-
tasks.named("updateDependencies") {
90-
// we aren't Gradle 7 compatible yet
91-
checkForGradleUpdate = false
92-
}
93-
94-
updateDependenciesSettings {
95-
gitHub {
96-
organization = "spring-projects"
97-
repository = "spring-security"
98-
}
99-
addFiles({
100-
return [
101-
project.file("buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy")
102-
]
103-
})
104-
dependencyExcludes {
105-
majorVersionBump()
106-
minorVersionBump()
107-
releaseCandidatesVersions()
108-
alphaBetaVersions()
109-
snapshotVersions()
110-
addRule { components ->
111-
components.withModule("org.python:jython") { selection ->
112-
ModuleComponentIdentifier candidate = selection.getCandidate();
113-
if (!candidate.getVersion().equals(selection.getCurrentVersion())) {
114-
selection.reject("jython updates break integration tests");
115-
}
116-
}
117-
components.withModule("com.nimbusds:nimbus-jose-jwt") { selection ->
118-
ModuleComponentIdentifier candidate = selection.getCandidate();
119-
if (!candidate.getVersion().equals(selection.getCurrentVersion())) {
120-
selection.reject("nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency");
121-
}
122-
}
123-
components.withModule("io.mockk:mockk") { selection ->
124-
ModuleComponentIdentifier candidate = selection.getCandidate();
125-
if (!candidate.getVersion().equals(selection.getCurrentVersion())) {
126-
selection.reject("mockk updates break tests");
127-
}
128-
}
129-
components.all { selection ->
130-
ModuleComponentIdentifier candidate = selection.getCandidate();
131-
// Do not compare version due to multiple versions existing
132-
// will cause opensaml 3.x to be updated to 4.x
133-
if (candidate.getGroup().equals("org.opensaml")) {
134-
selection.reject("org.opensaml maintains two different versions, so it must be updated manually");
135-
}
136-
}
137-
}
138-
}
139-
}
140-
14188
subprojects {
14289
plugins.withType(JavaPlugin) {
14390
project.sourceCompatibility='1.8'

buildSrc/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
id "java-gradle-plugin"
33
id "java"
44
id "groovy"
5-
id 'com.apollographql.apollo' version '2.4.5'
65
}
76

87
sourceCompatibility = 1.8
@@ -41,10 +40,6 @@ gradlePlugin {
4140
id = "io.spring.convention.management-configuration"
4241
implementationClass = "io.spring.gradle.convention.ManagementConfigurationPlugin"
4342
}
44-
updateDependencies {
45-
id = "org.springframework.security.update-dependencies"
46-
implementationClass = "org.springframework.security.convention.versions.UpdateDependenciesPlugin"
47-
}
4843
updateProjectVersion {
4944
id = "org.springframework.security.update-version"
5045
implementationClass = "org.springframework.security.convention.versions.UpdateProjectVersionPlugin"
@@ -90,7 +85,6 @@ dependencies {
9085
implementation libs.io.github.gradle.nexus.publish.plugin
9186
implementation 'io.projectreactor:reactor-core'
9287
implementation libs.org.gretty.gretty
93-
implementation libs.com.apollographql.apollo.apollo.runtime
9488
implementation libs.com.github.ben.manes.gradle.versions.plugin
9589
implementation libs.com.github.spullara.mustache.java.compiler
9690
implementation libs.io.spring.javaformat.spring.javaformat.gradle.plugin
@@ -99,6 +93,7 @@ dependencies {
9993
implementation libs.org.hidetake.gradle.ssh.plugin
10094
implementation libs.org.jfrog.buildinfo.build.info.extractor.gradle
10195
implementation libs.org.sonarsource.scanner.gradle.sonarqube.gradle.plugin
96+
implementation libs.com.squareup.okhttp3.okhttp
10297

10398
testImplementation platform(libs.org.junit.junit.bom)
10499
testImplementation platform(libs.org.mockito.mockito.bom)

buildSrc/src/main/java/org/springframework/security/convention/versions/CommandLineUtils.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

buildSrc/src/main/java/org/springframework/security/convention/versions/GitHubApi.java

Lines changed: 0 additions & 179 deletions
This file was deleted.

0 commit comments

Comments
 (0)