Skip to content

Commit be88fc1

Browse files
committed
Stop Deploying JavaDoc Outside of Antora
Closes gh-1298
1 parent e221e21 commit be88fc1

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
@@ -39,13 +39,6 @@ jobs:
3939
with:
4040
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
4141
secrets: inherit
42-
deploy-docs:
43-
name: Deploy Docs
44-
needs: [ build ]
45-
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1
46-
with:
47-
should-deploy-docs: ${{ needs.build.outputs.should-deploy-artifacts }}
48-
secrets: inherit
4942
deploy-schema:
5043
name: Deploy Schema
5144
needs: [ build ]
@@ -55,7 +48,7 @@ jobs:
5548
secrets: inherit
5649
perform-release:
5750
name: Perform Release
58-
needs: [ deploy-artifacts, deploy-docs, deploy-schema ]
51+
needs: [ deploy-artifacts, deploy-schema ]
5952
uses: spring-io/spring-security-release-tools/.github/workflows/perform-release.yml@v1
6053
with:
6154
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)