Skip to content

Commit 65d94c1

Browse files
committed
Stop Deploying JavaDoc Outside of Antora
Closes gh-1298
1 parent 8bbf477 commit 65d94c1

File tree

5 files changed

+2
-100
lines changed

5 files changed

+2
-100
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ jobs:
3838
with:
3939
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
4040
secrets: inherit
41-
deploy-docs:
42-
name: Deploy Docs
43-
needs: [ build ]
44-
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1
45-
with:
46-
should-deploy-docs: ${{ needs.build.outputs.should-deploy-artifacts }}
47-
secrets: inherit
4841
deploy-schema:
4942
name: Deploy Schema
5043
needs: [ build ]
@@ -54,7 +47,7 @@ jobs:
5447
secrets: inherit
5548
perform-release:
5649
name: Perform Release
57-
needs: [ deploy-artifacts, deploy-docs, deploy-schema ]
50+
needs: [ deploy-artifacts, deploy-schema ]
5851
uses: spring-io/spring-security-release-tools/.github/workflows/perform-release.yml@v1
5952
with:
6053
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
@@ -72,7 +72,7 @@ springRelease {
7272
weekOfMonth = 2
7373
dayOfWeek = 4
7474
referenceDocUrl = "https://docs.spring.io/spring-ldap/reference/{version}/index.html"
75-
apiDocUrl = "https://docs.spring.io/spring-ldap/docs/{version}/api/"
75+
apiDocUrl = "https://docs.spring.io/spring-ldap/reference/{version}/api/java/index.html"
7676
replaceSnapshotVersionInReferenceDocUrl = true
7777
}
7878

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

Lines changed: 0 additions & 80 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
@@ -20,7 +20,6 @@ public class DocsPlugin implements Plugin<Project> {
2020
PluginManager pluginManager = project.getPluginManager();
2121
pluginManager.apply(BasePlugin);
2222
pluginManager.apply("org.asciidoctor.jvm.convert");
23-
pluginManager.apply(DeployDocsPlugin);
2423
pluginManager.apply(JavadocApiPlugin);
2524

2625
project.getGradle().afterProject(new Action<Project>() {

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

Lines changed: 0 additions & 10 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 {

0 commit comments

Comments
 (0)