Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/actions/deploy-schema/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Deploy Schema
description: Deploys the schema zip to the docs site

inputs:
java-version:
description: "The Java version to use"
required: false
default: "17"

runs:
using: composite
steps:
- name: Set up JDK ${{ inputs.java-version }}
uses: spring-io/spring-gradle-build-action@c8668747d7c264864c8c7f7026d0d277d14a78dc # v2.0.6
with:
java-version: ${{ inputs.java-version }}
distribution: temurin
- name: Deploy Schema
shell: bash
run: |
./gradlew deploySchema -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace --info
75 changes: 75 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: CI

on:
push:
branches:
- "*.x"
- "release/**"
schedule:
- cron: '0 10 * * *' # Once per day at 10am UTC
workflow_dispatch: # Manual trigger

permissions:
contents: read

jobs:
test:
name: Test Against Snapshots
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: spring-io/spring-security-actions/test@4386090bf7852faa1d61782f981811441757dbb8 # main
with:
java-version: '25'
gradle-args: -PisOverrideVersionCatalog -PtestToolchain=25 -PspringFrameworkVersion=7.+
compute-version:
name: Compute Version
runs-on: ubuntu-latest
outputs:
version: ${{ steps.project-version.outputs.version }}
snapshot: ${{ steps.project-version.outputs.snapshot }}
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- id: project-version
name: Extract Project Version
uses: spring-io/spring-release-actions/compute-version@a1f321783a0769dd2aea4fad6c2ae2f95a52b885 # 0.0.5
build-and-deploy:
name: Build and Deploy
needs: [ test, compute-version ]
if: needs.compute-version.outputs.snapshot == 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: spring-io/spring-security-actions/build@4386090bf7852faa1d61782f981811441757dbb8 # main
with:
java-version: '25'
- id: deploy-location
name: Compute Deploy Location
uses: spring-io/spring-release-actions/compute-artifact-repository@a1f321783a0769dd2aea4fad6c2ae2f95a52b885 # 0.0.5
with:
version: ${{ needs.compute-version.outputs.version }}
- name: Deploy Artifacts
uses: spring-io/spring-security-actions/ensure-artifacts@f8ef0d53fc61799c18f19bc6a4c42ccb9aa265de
with:
version: ${{ needs.compute-version.outputs.version }}
username: ${{ secrets.ARTIFACTORY_USERNAME }}
password: ${{ secrets.ARTIFACTORY_PASSWORD }}
repository-uri: ${{ steps.deploy-location.outputs.uri }}
repository-name: ${{ steps.deploy-location.outputs.name }}
project: ${{ steps.deploy-location.outputs.project }}
local-repository: build/publications/repos
artifact-path: org/springframework/ldap/spring-ldap-core
deploy-schema:
name: Deploy Schema
needs: [ test, compute-version ]
if: needs.compute-version.outputs.snapshot == 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: ./.github/actions/deploy-schema
with:
java-version: '25'
env:
DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
DOCS_HOST: ${{ secrets.DOCS_HOST }}
63 changes: 0 additions & 63 deletions .github/workflows/continuous-integration-workflow.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/pr-build-workflow.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/workflows/publish-release.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/pull-request-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Pull Request - Build

on: pull_request

permissions:
contents: read

jobs:
build:
name: Build
runs-on: ubuntu-latest
if: github.repository == 'spring-projects/spring-ldap'
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: spring-io/spring-security-actions/pr-build@4386090bf7852faa1d61782f981811441757dbb8 # main
with:
java-version: '25'
25 changes: 0 additions & 25 deletions .github/workflows/release-scheduler.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/update-scheduled-release-version.yml

This file was deleted.

6 changes: 0 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ buildscript {
dependencies {
classpath "com.github.ben-manes:gradle-versions-plugin:0.54.0"
classpath "io.spring.gradle:dependency-management-plugin:1.1.7"
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:6.0.4"
classpath 'org.hidetake:gradle-ssh-plugin:2.10.1'
classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0'
classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion"
}
}
Expand All @@ -33,10 +31,6 @@ description = "Spring LDAP"

ext.coreModules = subprojects.findAll { p-> (!p.name.contains("test") && !p.name.contains("sample") && !p.name.contains("sandbox")) || p.name.contains("spring-ldap-test") }

configure(subprojects - coreModules) {
tasks.findByPath("publishArtifacts")?.enabled = false
}

nohttp {
source.exclude "buildSrc/build/**"
}
Expand Down
14 changes: 0 additions & 14 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,6 @@ gradlePlugin {
id = "org.springframework.security.sagan"
implementationClass = "org.springframework.gradle.sagan.SaganPlugin"
}
githubMilestone {
id = "org.springframework.github.milestone"
implementationClass = "org.springframework.gradle.github.milestones.GitHubMilestonePlugin"
}
githubChangelog {
id = "org.springframework.github.changelog"
implementationClass = "org.springframework.gradle.github.changelog.GitHubChangelogPlugin"
}
githubRelease {
id = "org.springframework.github.release"
implementationClass = "org.springframework.gradle.github.release.GitHubReleasePlugin"
}
s101 {
id = "s101"
implementationClass = "s101.S101Plugin"
Expand All @@ -85,7 +73,6 @@ dependencies {
implementation 'org.yaml:snakeyaml:2.6'
implementation localGroovy()

implementation 'io.github.gradle-nexus:publish-plugin:2.0.0'
implementation 'io.projectreactor:reactor-core:3.8.6'
implementation ('org.gretty:gretty:5.0.2') {
exclude group: 'org.springframework.boot', module: 'spring-boot-loader-tools'
Expand All @@ -100,7 +87,6 @@ dependencies {
implementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
implementation 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.5'
implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:6.0.4'
implementation 'org.springframework:spring-core:7.0.8'
implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:7.3.1.8318'

Expand Down

This file was deleted.

This file was deleted.

Loading