From ed58d202399cfefe8ff997ddea406643c5b53017 Mon Sep 17 00:00:00 2001 From: Markus Hoffrogge Date: Mon, 1 Sep 2025 21:04:49 +0200 Subject: [PATCH] Update Sonatype snapshot repository to new Central Portal (#389) * sonatype-snapshots.xml: Add Sonatype Central snapshots repo - Sonatype OSSRH URLs are deprecated since 30-Jun-2025 and will be decommissioned in future * sonatype-snapshots.xml: Remove deprecated Sonatype OSSRH snapshot repos - update tests accordingly - align README.md * prepare release 4.0.0 --- README.md | 34 ++++++++++++++++----------------- index.test.js | 28 ++++----------------------- package-lock.json | 4 ++-- package.json | 2 +- settings.test.js | 28 ++++----------------------- templates/sonatype-snapshot.xml | 28 ++++----------------------- 6 files changed, 32 insertions(+), 92 deletions(-) diff --git a/README.md b/README.md index b7255497..b6d8d0e2 100644 --- a/README.md +++ b/README.md @@ -31,14 +31,14 @@ See [action.yml](action.yml) ## default ```settings.xml``` ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 ``` ## ```settings.xml``` with servers section ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: servers: '[{"id": "serverId", "username": "username", "password": "password"}]' ``` @@ -62,7 +62,7 @@ Please refer to the [servers](http://maven.apache.org/settings.html#Servers) doc ``` yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: servers: | [{ @@ -96,7 +96,7 @@ result will be: ## ```settings.xml``` with mirrors section ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: mirrors: '[{"id": "mirrorId", "name": "mirrorName", "mirrorOf": "mirrorOf", "url": "mirrorUrl"}]' ``` @@ -104,7 +104,7 @@ steps: ## ```settings.xml``` with proxies section ```yml step: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: proxies: '[{"id": "proxyId", "active": "isActive", "protocol": "proxyProtocol", "host": "proxyHost", "port": "proxyPort", "nonProxyHosts": "nonProxyHost", "user": "proxUser", "password": "proxPassword"}]' ``` @@ -113,16 +113,16 @@ Note: Authentication details are optional. ## ```settings.xml``` with properties ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: properties: '[{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]' ``` -## ```settings.xml``` with https://oss.sonatype.org/content/repositories/snapshots in repository list +## ```settings.xml``` with https://central.sonatype.com/repository/maven-snapshots in repository list ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: sonatypeSnapshots: true ``` @@ -131,7 +131,7 @@ steps: ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: apacheSnapshots: true ``` @@ -139,7 +139,7 @@ steps: ## Do not override existing ```settings.xml```, from version **2.0** file is override by default : ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: override: false ``` @@ -147,7 +147,7 @@ steps: ## Do not add github to server in ```settings.xml```, by default is added: ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: githubServer: false ``` @@ -156,7 +156,7 @@ steps: ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: oracleServers: '[{"id": "serverId", "username": "username", "password": "password"}]' ``` @@ -164,7 +164,7 @@ steps: ## ```settings.xml``` with [Oracle Maven Repository](https://docs.oracle.com/middleware/1213/core/MAVEN/config_maven_repo.htm#MAVEN9017) ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: oracleRepo: true ``` @@ -172,7 +172,7 @@ steps: ## ```settings.xml``` with custom repositories ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: repositories: '[{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]' ``` @@ -180,7 +180,7 @@ steps: ## ```settings.xml``` with custom plugin repositories ```yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: pluginRepositories: '[{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]' ``` @@ -192,7 +192,7 @@ It is also possible pass in Github Secrets e.g. ``` yml steps: -- uses: s4u/maven-settings-action@v3.1.0 +- uses: s4u/maven-settings-action@v4.0.0 with: servers: | [{ @@ -222,7 +222,7 @@ steps: with: java-version: 8 - - uses: s4u/maven-settings-action@v3.1.0 + - uses: s4u/maven-settings-action@v4.0.0 - run: mvn verify ``` diff --git a/index.test.js b/index.test.js index eefa56ec..560a257b 100644 --- a/index.test.js +++ b/index.test.js @@ -130,18 +130,8 @@ test('run with all feature', () => { - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + central-snapshots + https://central.sonatype.com/repository/maven-snapshots false @@ -152,18 +142,8 @@ test('run with all feature', () => { - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + central-snapshots + https://central.sonatype.com/repository/maven-snapshots false diff --git a/package-lock.json b/package-lock.json index bb6d586e..7bc7d1bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "maven-settings-action", - "version": "3.1.0", + "version": "4.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "maven-settings-action", - "version": "3.1.0", + "version": "4.0.0", "license": "MIT", "dependencies": { "@actions/core": "^1.10.1", diff --git a/package.json b/package.json index f28642a0..ddb8f741 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "maven-settings-action", - "version": "3.1.0", + "version": "4.0.0", "description": "Prepare maven settings", "main": "index.js", "scripts": { diff --git a/settings.test.js b/settings.test.js index 0c0a4f4e..c44f54b4 100644 --- a/settings.test.js +++ b/settings.test.js @@ -592,18 +592,8 @@ test('addSonatypeSnapshots', () => { - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + central-snapshots + https://central.sonatype.com/repository/maven-snapshots false @@ -614,18 +604,8 @@ test('addSonatypeSnapshots', () => { - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + central-snapshots + https://central.sonatype.com/repository/maven-snapshots false diff --git a/templates/sonatype-snapshot.xml b/templates/sonatype-snapshot.xml index ba2607e1..284587e3 100644 --- a/templates/sonatype-snapshot.xml +++ b/templates/sonatype-snapshot.xml @@ -6,18 +6,8 @@ - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + central-snapshots + https://central.sonatype.com/repository/maven-snapshots false @@ -28,18 +18,8 @@ - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + central-snapshots + https://central.sonatype.com/repository/maven-snapshots false