Skip to content

Commit ad71f57

Browse files
committed
Add spring-security-release-plugin
Issue gh-14242
1 parent b5bd621 commit ad71f57

Some content is hidden

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

44 files changed

+10
-5209
lines changed

build.gradle

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ 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-version'
23-
apply plugin: 'org.springframework.security.sagan'
24-
apply plugin: 'org.springframework.github.milestone'
25-
apply plugin: 'org.springframework.github.changelog'
26-
apply plugin: 'org.springframework.github.release'
2722
apply plugin: 'org.springframework.security.versions.verify-dependencies-versions'
23+
apply plugin: 'io.spring.security.release'
2824

2925
group = 'org.springframework.security'
3026
description = 'Spring Security'
@@ -37,53 +33,12 @@ repositories {
3733
mavenCentral()
3834
}
3935

40-
tasks.named("saganCreateRelease") {
41-
referenceDocUrl = "https://docs.spring.io/spring-security/reference/{version}/index.html"
42-
apiDocUrl = "https://docs.spring.io/spring-security/site/docs/{version}/api/"
43-
}
44-
45-
tasks.named("gitHubCheckMilestoneHasNoOpenIssues") {
46-
repository {
47-
owner = "spring-projects"
48-
name = "spring-security"
49-
}
50-
}
51-
52-
tasks.named("gitHubNextReleaseMilestone") {
53-
repository {
54-
owner = "spring-projects"
55-
name = "spring-security"
56-
}
57-
}
58-
59-
tasks.named("gitHubCheckNextVersionDueToday") {
60-
repository {
61-
owner = "spring-projects"
62-
name = "spring-security"
63-
}
64-
}
65-
66-
tasks.named("scheduleNextRelease") {
67-
repository {
68-
owner = "spring-projects"
69-
name = "spring-security"
70-
}
36+
springRelease {
7137
weekOfMonth = 3
7238
dayOfWeek = 1
73-
}
74-
75-
tasks.named("createGitHubRelease") {
76-
repository {
77-
owner = "spring-projects"
78-
name = "spring-security"
79-
}
80-
}
81-
82-
tasks.named("dispatchGitHubWorkflow") {
83-
repository {
84-
owner = "spring-projects"
85-
name = "spring-security"
86-
}
39+
referenceDocUrl = "https://docs.spring.io/spring-security/reference/{version}/index.html"
40+
apiDocUrl = "https://docs.spring.io/spring-security/docs/{version}/api/"
41+
replaceSnapshotVersionInReferenceDocUrl = true
8742
}
8843

8944
subprojects {

buildSrc/build.gradle

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ sourceSets {
2626

2727
gradlePlugin {
2828
plugins {
29-
checkAntoraVersion {
30-
id = "org.springframework.antora.check-version"
31-
implementationClass = "org.springframework.gradle.antora.AntoraVersionPlugin"
32-
}
3329
trang {
3430
id = "trang"
3531
implementationClass = "trang.TrangPlugin"
@@ -42,26 +38,6 @@ gradlePlugin {
4238
id = "io.spring.convention.management-configuration"
4339
implementationClass = "io.spring.gradle.convention.ManagementConfigurationPlugin"
4440
}
45-
updateProjectVersion {
46-
id = "org.springframework.security.update-version"
47-
implementationClass = "org.springframework.security.convention.versions.UpdateProjectVersionPlugin"
48-
}
49-
sagan {
50-
id = "org.springframework.security.sagan"
51-
implementationClass = "org.springframework.gradle.sagan.SaganPlugin"
52-
}
53-
githubMilestone {
54-
id = "org.springframework.github.milestone"
55-
implementationClass = "org.springframework.gradle.github.milestones.GitHubMilestonePlugin"
56-
}
57-
githubChangelog {
58-
id = "org.springframework.github.changelog"
59-
implementationClass = "org.springframework.gradle.github.changelog.GitHubChangelogPlugin"
60-
}
61-
githubRelease {
62-
id = "org.springframework.github.release"
63-
implementationClass = "org.springframework.gradle.github.release.GitHubReleasePlugin"
64-
}
6541
s101 {
6642
id = "s101"
6743
implementationClass = "s101.S101Plugin"
@@ -95,11 +71,14 @@ dependencies {
9571
implementation libs.com.github.spullara.mustache.java.compiler
9672
implementation libs.io.spring.javaformat.spring.javaformat.gradle.plugin
9773
implementation libs.io.spring.nohttp.nohttp.gradle
98-
implementation libs.net.sourceforge.htmlunit
74+
implementation (libs.net.sourceforge.htmlunit) {
75+
exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
76+
}
9977
implementation libs.org.hidetake.gradle.ssh.plugin
10078
implementation libs.org.jfrog.buildinfo.build.info.extractor.gradle
10179
implementation libs.org.sonarsource.scanner.gradle.sonarqube.gradle.plugin
10280
implementation libs.com.squareup.okhttp3.okhttp
81+
implementation libs.io.spring.security.release.plugin
10382

10483
testImplementation platform(libs.org.junit.junit.bom)
10584
testImplementation platform(libs.org.mockito.mockito.bom)

buildSrc/src/main/java/org/springframework/gradle/antora/AntoraVersionPlugin.java

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

buildSrc/src/main/java/org/springframework/gradle/antora/AntoraVersionUtils.java

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

buildSrc/src/main/java/org/springframework/gradle/antora/CheckAntoraVersionTask.java

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

0 commit comments

Comments
 (0)