From bf0a9974b862df1ab3f957d966af28bdac624a63 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 28 May 2025 13:15:34 -0700 Subject: [PATCH 1/6] Release using Central Portal --- CHANGELOG.md | 5 +++++ dev-bin/release.sh | 41 ++++++++++++++++++++--------------------- pom.xml | 20 +++++--------------- 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25eded9c..1e3229b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +3.2.0 (2025-05-28) +------------------ + +* First release using Central Portal instead of Legacy OSSRH. + 3.1.1 (2024-09-19) ------------------ diff --git a/dev-bin/release.sh b/dev-bin/release.sh index 497c346e..46dc2673 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -60,6 +60,15 @@ if [ "$should_continue" != "y" ]; then exit 1 fi +mvn test + +read -r -n 1 -p "Continue given above tests? (y/n) " should_continue + +if [ "$should_continue" != "y" ]; then + echo "Aborting" + exit 1 +fi + page=.gh-pages/index.md cat < $page --- @@ -71,35 +80,26 @@ version: $tag EOF -read -r -n 1 -p "Continue given above dependencies? (y/n) " should_continue - -if [ "$should_continue" != "y" ]; then - echo "Aborting" - exit 1 -fi +mvn versions:set -DnewVersion="$version" perl -pi -e "s/(?<=)[^<]*/$version/" README.md perl -pi -e "s/(?<=com\.maxmind\.db\:maxmind-db\:)\d+\.\d+\.\d+([\w\-]+)?/$version/" README.md cat README.md >> $page -if [ -n "$(git status --porcelain)" ]; then - git diff - - read -r -n 1 -p "Commit README.md changes? " should_commit - if [ "$should_commit" != "y" ]; then - echo "Aborting" - exit 1 - fi - git add README.md - git commit -m 'update version number in README.md' +git diff + +read -r -n 1 -p "Commit changes? " should_commit +if [ "$should_commit" != "y" ]; then + echo "Aborting" + exit 1 fi +git add README.md pom.xml +git commit -m "Preparing for $version" + +mvn clean deploy -# could be combined with the primary build -mvn release:clean -mvn release:prepare -DreleaseVersion="$version" -Dtag="$tag" -mvn release:perform rm -fr ".gh-pages/doc/$tag" cp -r target/checkout/target/reports/apidocs ".gh-pages/doc/$tag" rm .gh-pages/doc/latest @@ -127,6 +127,5 @@ git push popd git push -git push --tags gh release create --target "$(git branch --show-current)" -t "$version" -n "$notes" "$tag" diff --git a/pom.xml b/pom.xml index dfd4557b..c5f0b999 100644 --- a/pom.xml +++ b/pom.xml @@ -163,24 +163,14 @@ 2.18.0 - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - sonatype-nexus-staging - https://oss.sonatype.org/ - true + central + true - - - default-deploy - deploy - - deploy - - - From ad00b413fed6457a2c5f1ac3bb57e733435dad2e Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 28 May 2025 13:17:38 -0700 Subject: [PATCH 2/6] Add release notes for code-cleanup PRs --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e3229b0..9f650c70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ CHANGELOG ------------------ * First release using Central Portal instead of Legacy OSSRH. +* Improve internal uses of types and other code cleanups. Pull requests + by Philippe Marschall. GitHub #246, #247, #248, and #249. 3.1.1 (2024-09-19) ------------------ From eae028a80cc3a7976caebf4858926946091472a3 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 28 May 2025 13:19:35 -0700 Subject: [PATCH 3/6] Preparing for 3.2.0 --- README.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8e8c4532..941a4494 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ To do this, add the dependency to your pom.xml: com.maxmind.db maxmind-db - 3.1.1 + 3.2.0 ``` @@ -29,7 +29,7 @@ repositories { mavenCentral() } dependencies { - compile 'com.maxmind.db:maxmind-db:3.1.1' + compile 'com.maxmind.db:maxmind-db:3.2.0' } ``` diff --git a/pom.xml b/pom.xml index c5f0b999..01a98d22 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.maxmind.db maxmind-db - 3.1.2-SNAPSHOT + 3.2.0 jar MaxMind DB Reader Reader for MaxMind DB From 9b790278c0899d68570516e8517ff37e16d9778e Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 28 May 2025 13:22:10 -0700 Subject: [PATCH 4/6] Fix directory for apidocs --- dev-bin/release.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-bin/release.sh b/dev-bin/release.sh index 46dc2673..5e55c254 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -97,11 +97,10 @@ fi git add README.md pom.xml git commit -m "Preparing for $version" - mvn clean deploy rm -fr ".gh-pages/doc/$tag" -cp -r target/checkout/target/reports/apidocs ".gh-pages/doc/$tag" +cp -r target/reports/apidocs ".gh-pages/doc/$tag" rm .gh-pages/doc/latest ln -fs "$tag" .gh-pages/doc/latest From 6d6f224eec114b1d089cd07151e938a54ee0e0ce Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 28 May 2025 13:47:57 -0700 Subject: [PATCH 5/6] Link to minFraud README.dev.md --- README.dev.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.dev.md diff --git a/README.dev.md b/README.dev.md new file mode 100644 index 00000000..bdfd83c6 --- /dev/null +++ b/README.dev.md @@ -0,0 +1 @@ +See the [`README.dev.md` in `minfraud-api-java`](https://github.com/maxmind/minfraud-api-java/blob/main/README.dev.md). From 18b763b28c382257e5aa0d2e08036a2d215ce4b7 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 28 May 2025 14:22:33 -0700 Subject: [PATCH 6/6] Set copyright year --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 941a4494..c55f0f87 100644 --- a/README.md +++ b/README.md @@ -220,6 +220,6 @@ The MaxMind DB Reader API uses [Semantic Versioning](https://semver.org/). ## Copyright and License ## -This software is Copyright (c) 2014-2022 by MaxMind, Inc. +This software is Copyright (c) 2014-2025 by MaxMind, Inc. This is free software, licensed under the Apache License, Version 2.0.