diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 6c85747b0..bc52f1a1a 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -20,12 +20,6 @@ inputs: description: 'Java version to compile and test with' required: false default: '17' - opensource-repository-password: - description: 'Password for authentication with the open-source repository' - required: false - opensource-repository-username: - description: 'Username for authentication with the open-source repository' - required: false publish: description: 'Whether to publish artifacts ready for deployment to Artifactory' required: false @@ -52,17 +46,11 @@ runs: id: build if: ${{ inputs.publish == 'false' }} shell: bash - env: - SPRING_REPOSITORY_PASSWORD: ${{ inputs.opensource-repository-password }} - SPRING_REPOSITORY_USERNAME: ${{ inputs.opensource-repository-username }} run: ./gradlew check - name: Publish id: publish if: ${{ inputs.publish == 'true' }} shell: bash - env: - SPRING_REPOSITORY_PASSWORD: ${{ inputs.opensource-repository-password }} - SPRING_REPOSITORY_USERNAME: ${{ inputs.opensource-repository-username }} run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository build dist publishAllPublicationsToDeploymentRepository - name: Read Version From gradle.properties id: read-version diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 73c2a65be..47d1b83a7 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -19,8 +19,6 @@ jobs: uses: ./.github/actions/build with: develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - opensource-repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }} - opensource-repository-username: ${{ secrets.ARTIFACTORY_USERNAME }} publish: true - name: Deploy uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1 diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index bde1f85fd..6c778ffcf 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -22,8 +22,6 @@ jobs: env: CI: 'true' GRADLE_ENTERPRISE_URL: 'https://ge.spring.io' - SPRING_REPOSITORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - SPRING_REPOSITORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} run: ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --no-parallel --continue build - name: Print JVM Thread Dumps When Cancelled if: cancelled() diff --git a/README.md b/README.md index e750c0cf3..e04d28cab 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,6 @@ Compile and test, build all jars, distribution zips and docs: ./gradlew build ```` -Access to https://repo.spring.io/plugins-release requires authetication. -The `SPRING_REPOSITORY_USERNAME` and `SPRING_REPOSITORY_PASSWORD` environment variables should be exposed to the build. - Install into your local Maven repository: ```` ./gradlew install diff --git a/build.gradle b/build.gradle index 1ab2e9908..57d06e27e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { id 'io.spring.dependency-management' version '1.1.3' apply false id 'org.asciidoctor.jvm.pdf' version '3.3.2' - id 'org.asciidoctor.jvm.gems' version '3.3.2' id 'org.asciidoctor.jvm.convert' version '3.3.2' id 'de.undercouch.download' version '4.1.2' } diff --git a/settings.gradle b/settings.gradle index 46e1442ac..b5007bda3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,14 +1,7 @@ pluginManagement { repositories { gradlePluginPortal() - maven { - name "spring-plugins" - url "https://repo.spring.io/plugins-release/" - credentials { - username System.env.SPRING_REPOSITORY_USERNAME - password System.env.SPRING_REPOSITORY_PASSWORD - } - } + mavenCentral() } }