Skip to content

Commit abd54a1

Browse files
committed
Stop Deploying JavaDoc Outside of Antora
Closes gh-3509
1 parent 255c92c commit abd54a1

File tree

5 files changed

+3
-104
lines changed

5 files changed

+3
-104
lines changed

.github/workflows/continuous-integration-workflow.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,9 @@ jobs:
2828
with:
2929
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
3030
secrets: inherit
31-
deploy-docs:
32-
name: Deploy Docs
33-
needs: [ build ]
34-
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1
35-
with:
36-
should-deploy-docs: ${{ needs.build.outputs.should-deploy-artifacts }}
37-
secrets: inherit
3831
perform-release:
3932
name: Perform Release
40-
needs: [ deploy-artifacts, deploy-docs ]
33+
needs: [ deploy-artifacts ]
4134
uses: spring-io/spring-security-release-tools/.github/workflows/perform-release.yml@v1
4235
with:
4336
should-perform-release: ${{ needs.deploy-artifacts.outputs.artifacts-deployed }}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ springRelease {
6363
weekOfMonth = 3
6464
dayOfWeek = 2
6565
referenceDocUrl = "https://docs.spring.io/spring-session/reference/{version}/index.html"
66-
apiDocUrl = "https://docs.spring.io/spring-session/docs/{version}/api/"
66+
apiDocUrl = "https://docs.spring.io/spring-session/reference/{version}/api/java/index.html"
6767
replaceSnapshotVersionInReferenceDocUrl = true
6868
}

buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy

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

buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class DocsPlugin implements Plugin<Project> {
1717

1818
PluginManager pluginManager = project.getPluginManager();
1919
pluginManager.apply(BasePlugin);
20-
pluginManager.apply(DeployDocsPlugin);
2120
pluginManager.apply(JavadocApiPlugin);
2221

2322
Task docsZip = project.tasks.create('docsZip', Zip) {

buildSrc/src/test/resources/samples/showcase/Jenkinsfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@ ossrh: {
3030
}
3131
}
3232
},
33-
docs: {
34-
stage('Deploy Docs') {
35-
node {
36-
checkout scm
37-
withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
38-
sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
39-
}
40-
}
41-
}
42-
},
4333
schema: {
4434
stage('Deploy Schema') {
4535
node {
@@ -49,4 +39,4 @@ schema: {
4939
}
5040
}
5141
}
52-
}
42+
}

0 commit comments

Comments
 (0)