diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6a6de5..7cc39ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,22 +38,6 @@ jobs: distribution: 'temurin' cache: maven - - name: Configure Maven settings - uses: s4u/maven-settings-action@v3.0.0 - with: - servers: | - [{ - "id": "github", - "username": "${{ github.actor }}", - "password": "${{ secrets.GITHUB_TOKEN }}" - }] - repositories: | - [{ - "id": "github", - "url": "https://maven.pkg.github.com/codice/*", - "snapshots": {"enabled": true} - }] - - name: Build run: mvn clean install $MAVEN_CLI_OPTS -DskipTests -pl '!docker' @@ -72,22 +56,6 @@ jobs: distribution: 'temurin' cache: maven - - name: Configure Maven settings - uses: s4u/maven-settings-action@v3.0.0 - with: - servers: | - [{ - "id": "github", - "username": "${{ github.actor }}", - "password": "${{ secrets.GITHUB_TOKEN }}" - }] - repositories: | - [{ - "id": "github", - "url": "https://maven.pkg.github.com/codice/*", - "snapshots": {"enabled": true} - }] - - name: Build run: mvn clean install $MAVEN_CLI_OPTS -DskipTests -pl '!docker' @@ -98,8 +66,6 @@ jobs: (github.ref == 'refs/heads/master' || contains(github.ref, '.x')) runs-on: ubuntu-latest environment: production - permissions: - packages: write steps: - name: Checkout uses: actions/checkout@v4 @@ -111,31 +77,13 @@ jobs: distribution: 'temurin' cache: maven - - name: Configure Maven settings - uses: s4u/maven-settings-action@v3.0.0 - with: - servers: | - [{ - "id": "releases", - "username": "${{ github.actor }}", - "password": "${{ secrets.GITHUB_TOKEN }}" - }, - { - "id": "snapshots", - "username": "${{ github.actor }}", - "password": "${{ secrets.GITHUB_TOKEN }}" - }, - { - "id": "github", - "username": "${{ github.actor }}", - "password": "${{ secrets.GITHUB_TOKEN }}" - }] - repositories: | - [{ - "id": "github", - "url": "https://maven.pkg.github.com/codice/*", - "snapshots": {"enabled": true} - }] + - name: Create Maven Settings + env: + NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} + NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + run: | + mkdir -p ~/.m2 + printf '\n \n \n releases\n %s\n %s\n \n \n snapshots\n %s\n %s\n \n \n\n' "$NEXUS_USERNAME" "$NEXUS_PASSWORD" "$NEXUS_USERNAME" "$NEXUS_PASSWORD" > ~/.m2/settings.xml - name: Deploy run: | @@ -143,5 +91,5 @@ jobs: -DskipTests=true \ -DretryFailedDeploymentCount=10 \ -pl '!docker' \ - -DaltReleaseDeploymentRepository=releases::https://maven.pkg.github.com/codice/acdebugger \ - -DaltSnapshotDeploymentRepository=snapshots::https://maven.pkg.github.com/codice/acdebugger + -DaltReleaseDeploymentRepository=releases::https://repo.codice.org/repository/maven-releases/ \ + -DaltSnapshotDeploymentRepository=snapshots::https://repo.codice.org/repository/maven-snapshots/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cdf8d81..4f99059 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,9 @@ on: workflow_dispatch: permissions: contents: read - packages: write jobs: deploy: uses: codice/release-pipelines/.github/workflows/maven-manual-deploy.yml@main + secrets: + nexus_username: ${{ secrets.NEXUS_USERNAME }} + nexus_password: ${{ secrets.NEXUS_PASSWORD }} diff --git a/pom.xml b/pom.xml index aebbf16..42baadd 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ codice Codice Repository - https://artifacts.codice.org/content/groups/public/ + https://repo.codice.org/repository/maven-public/ @@ -487,7 +487,7 @@ codice Codice Repository - https://artifacts.codice.org/content/groups/public/ + https://repo.codice.org/repository/maven-public/