diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index c11c5e9..2b5bd87 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/README.md b/README.md index fdd4113..52c5f8b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://img.shields.io/github/release/ethauvin/bitly-shorten.svg)](https://github.com/ethauvin/bitly-shorten/releases/latest) [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/bitly-shorten.svg?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/bitly-shorten) -[![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/bitly-shorten?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/bitly-shorten/) +[![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Fcentral.sonatype.com%2Frepository%2Fmaven-snapshots%2Fnet%2Fthauvin%2Ferik%2Fbitly-shorten%2Fmaven-metadata.xml&label=snapshot)](https://github.com/ethauvin/bitly-shorten/packages/2260734/versions) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_bitly-shorten&metric=alert_status)](https://sonarcloud.io/dashboard?id=ethauvin_bitly-shorten) @@ -60,7 +60,7 @@ BITLY_ACCESS_TOKEN=abc123def456ghi789jkl0 To use with [bld](https://rife2.com/bld), include the following dependency in your [build](https://github.com/ethauvin/bitly-shorten/blob/master/examples/bld/src/bld/java/com/example/ExampleBuild.java) file: ```java -repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY); +repositories = List.of(MAVEN_CENTRAL, CENTRAL_SNAPSHOTS); scope(compile) .include(dependency("net.thauvin.erik:bitly-shorten:2.0.0")); @@ -74,8 +74,11 @@ To use with [Gradle](https://gradle.org/), include the following dependency in y ```gradle repositories { + maven { + name = 'Central Portal Snapshots' + url = 'https://central.sonatype.com/repository/maven-snapshots/' + } mavenCentral() - maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") } // only needed for SNAPSHOT } dependencies { diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 9c4b27e..da7265b 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index e07ba97..5ac65f0 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -6,6 +6,6 @@ bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.4-SNAPSHOT bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.5 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.11-SNAPSHOT bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.1.0 -bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES +bld.repositories=CENTRAL_SNAPSHOTS,MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= -bld.version=2.2.1 +bld.version=2.2.2-SNAPSHOT diff --git a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java index 35e9abf..004c31b 100644 --- a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java +++ b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java @@ -93,10 +93,9 @@ public class BitlyShortenBuild extends Project { .include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 1))); publishOperation() - .repository(version.isSnapshot() ? repository(SONATYPE_SNAPSHOTS_LEGACY.location()) - .withCredentials(property("sonatype.user"), property("sonatype.password")) - : repository(SONATYPE_RELEASES_LEGACY.location()) - .withCredentials(property("sonatype.user"), property("sonatype.password"))) + .repository(version.isSnapshot() ? repository(CENTRAL_SNAPSHOTS.location()) + .withCredentials(property("central.user"), property("central.password")) + : repository(CENTRAL_RELEASES.location())) .repository(repository("github")) .info() .groupId(pkg)