From 91a621dfeaee610052f5efee1e31da7de1a0ce37 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Thu, 3 Jul 2025 13:08:26 -0400 Subject: [PATCH] Added new sonatype central publishing repositories that replace the OOSRH repositories, called CENTRAL_RELEASED and CENTRAL_SNAPSHOTS. Updated bld to use the new snapshot repository instead. Worked around new sonatype publishing repositories not allowing signed Maven metadata files. --- .idea/libraries/bld.xml | 4 ++-- README.md | 2 +- core | 2 +- lib/bld/bld-wrapper.jar | Bin 30440 -> 30443 bytes lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/BldBuild.java | 2 +- .../rife/bld/dependencies/Repository.java | 4 ++++ .../rife/bld/operations/PublishOperation.java | 12 +++++++----- src/main/java/rife/bld/wrapper/Wrapper.java | 4 ++-- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index a203de8..fd3f0d0 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/README.md b/README.md index a603afc..0524535 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/rife2/bld.svg)](https://github.com/rife2/bld/releases/latest) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.uwyn.rife2/bld/badge.svg?color=blue)](https://maven-badges.herokuapp.com/maven-central/com.uwyn.rife2/bld) -[![Nexus Snapshot](https://img.shields.io/nexus/s/com.uwyn.rife2/bld?server=https%3A%2F%2Fs01.oss.sonatype.org%2F)](https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/bld/) +[![Nexus Snapshot](https://img.shields.io/nexus/s/com.uwyn.rife2/bld?server=https%3A%2F%2Fcentral.sonatype.com%2F)](https://central.sonatype.com/repository/maven-snapshots/com/uwyn/rife2/bld/) [![gradle-ci](https://github.com/rife2/bld/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld/actions/workflows/bld.yml) [![Tests](https://rife2.com/tests-badge/badge/com.uwyn.rife2/bld)](https://github.com/rife2/rife2/actions/workflows/bld.yml) diff --git a/core b/core index f8bde83..ac900b7 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f8bde83ca806403dd8f37294239ac77dba8ad010 +Subproject commit ac900b7496ced0a2a38b3ceeba6ad57155e4c508 diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index f7ccd28d58b00e553e78a9d6de228765a9b19d15..543dd094a2a71202bddce338a1da89b53e93a65b 100644 GIT binary patch delta 15664 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 delta 15598 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 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 657bddf..07c72b7 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -8,4 +8,4 @@ bld.javaOptions= bld.javacOptions= bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.sourceDirectories=core/src/bld/java -bld.version=2.2.1 \ No newline at end of file +bld.version=2.2.2-SNAPSHOT \ No newline at end of file diff --git a/src/bld/java/rife/BldBuild.java b/src/bld/java/rife/BldBuild.java index 9dc89af..7a91ebc 100644 --- a/src/bld/java/rife/BldBuild.java +++ b/src/bld/java/rife/BldBuild.java @@ -86,7 +86,7 @@ public class BldBuild extends AbstractRife2Build { publishOperation() .repository(version.isSnapshot() ? repository("rife2-snapshots") : repository("rife2-releases")) - .repository(version.isSnapshot() ? repository("sonatype-snapshots") : repository("sonatype-releases")) + .repository(version.isSnapshot() ? repository("central-snapshots") : repository("central-releases")) .repository(repository("github")) .info(new PublishInfo() .groupId("com.uwyn.rife2") diff --git a/src/main/java/rife/bld/dependencies/Repository.java b/src/main/java/rife/bld/dependencies/Repository.java index 42b020f..55ee6dc 100644 --- a/src/main/java/rife/bld/dependencies/Repository.java +++ b/src/main/java/rife/bld/dependencies/Repository.java @@ -32,6 +32,8 @@ public record Repository(String location, String username, String password) { public static final Repository SONATYPE_RELEASES_LEGACY = new Repository("https://oss.sonatype.org/service/local/staging/deploy/maven2/"); public static final Repository SONATYPE_SNAPSHOTS = new Repository("https://s01.oss.sonatype.org/content/repositories/snapshots/"); public static final Repository SONATYPE_SNAPSHOTS_LEGACY = new Repository("https://oss.sonatype.org/content/repositories/snapshots/"); + public static final Repository CENTRAL_RELEASES = new Repository("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"); + public static final Repository CENTRAL_SNAPSHOTS = new Repository("https://central.sonatype.com/repository/maven-snapshots/"); public static final Repository RIFE2_RELEASES = new Repository("https://repo.rife2.com/releases/"); public static final Repository RIFE2_SNAPSHOTS = new Repository("https://repo.rife2.com/snapshots/"); @@ -98,6 +100,8 @@ public record Repository(String location, String username, String password) { case "SONATYPE_RELEASES_LEGACY" -> Repository.SONATYPE_RELEASES_LEGACY; case "SONATYPE_SNAPSHOTS" -> Repository.SONATYPE_SNAPSHOTS; case "SONATYPE_SNAPSHOTS_LEGACY" -> Repository.SONATYPE_SNAPSHOTS_LEGACY; + case "CENTRAL_RELEASES" -> Repository.CENTRAL_RELEASES; + case "CENTRAL_SNAPSHOTS" -> Repository.CENTRAL_SNAPSHOTS; default -> new Repository(locationOrName); }; } diff --git a/src/main/java/rife/bld/operations/PublishOperation.java b/src/main/java/rife/bld/operations/PublishOperation.java index a527f65..90040a2 100644 --- a/src/main/java/rife/bld/operations/PublishOperation.java +++ b/src/main/java/rife/bld/operations/PublishOperation.java @@ -133,7 +133,11 @@ public class PublishOperation extends AbstractOperation { var resolution = new VersionResolution(properties()); var resolver = new DependencyResolver(resolution, artifactRetriever(), List.of(repository), new Dependency(info().groupId(), info().artifactId(), info().version())); var snapshot_meta = resolver.getSnapshotMavenMetadata(); - snapshot_build_number = snapshot_meta.getSnapshotBuildNumber() + 1; + var build_number_meta = snapshot_meta.getSnapshotBuildNumber(); + if (build_number_meta == null) { + throw new DependencyException("Snapshot metadata build number doesn't exist."); + } + snapshot_build_number = build_number_meta + 1; } catch (DependencyException e) { // start the build number from the beginning System.out.println("Unable to retrieve previous snapshot metadata, using first build number."); @@ -161,7 +165,7 @@ public class PublishOperation extends AbstractOperation { .info(info()) .updated(moment) .build(), - info().version() + "/" + repository.getMetadataName(), true); + info().version() + "/" + repository.getMetadataName(), false); return actual_version; } @@ -493,9 +497,7 @@ public class PublishOperation extends AbstractOperation { response.statusCode() < 300) { System.out.print("done"); } else { - System.out.println("failed"); - System.out.println(response.body()); - System.out.print(response.headers().toString()); + System.out.print("failed"); throw new UploadException(url, response.statusCode()); } } finally { diff --git a/src/main/java/rife/bld/wrapper/Wrapper.java b/src/main/java/rife/bld/wrapper/Wrapper.java index 4185020..3164b5d 100644 --- a/src/main/java/rife/bld/wrapper/Wrapper.java +++ b/src/main/java/rife/bld/wrapper/Wrapper.java @@ -45,9 +45,9 @@ public class Wrapper { public static final String WRAPPER_PROPERTIES = WRAPPER_PREFIX + ".properties"; static final String MAVEN_CENTRAL = "https://repo1.maven.org/maven2/"; - static final String SONATYPE_SNAPSHOTS = "https://s01.oss.sonatype.org/content/repositories/snapshots/"; + static final String CENTRAL_SNAPSHOTS = "https://central.sonatype.com/repository/maven-snapshots/"; static final String DOWNLOAD_LOCATION = MAVEN_CENTRAL + "com/uwyn/rife2/bld/${version}/"; - static final String DOWNLOAD_LOCATION_SNAPSHOT = SONATYPE_SNAPSHOTS + "com/uwyn/rife2/bld/${version}/"; + static final String DOWNLOAD_LOCATION_SNAPSHOT = CENTRAL_SNAPSHOTS + "com/uwyn/rife2/bld/${version}/"; static final String BLD_CACHE = "bld.cache"; static final String BLD_FILENAME = "bld-${version}.jar"; static final String BLD_SOURCES_FILENAME = "bld-${version}-sources.jar";