Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
It turns out the repository is required for a plugin that the project
does not use. This commit removes the declaration and adapt CI
accordingly.

Closes gh-1813
  • Loading branch information
snicoll committed Oct 11, 2024
1 parent 6151be4 commit bedb949
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 28 deletions.
12 changes: 0 additions & 12 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-and-deploy-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down
9 changes: 1 addition & 8 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -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()
}
}

Expand Down

0 comments on commit bedb949

Please sign in to comment.