diff --git a/CHANGELOG.md b/CHANGELOG.md index 25eded9c..9f650c70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG ========= +3.2.0 (2025-05-28) +------------------ + +* 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) ------------------ 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). diff --git a/README.md b/README.md index 8e8c4532..c55f0f87 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' } ``` @@ -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. diff --git a/dev-bin/release.sh b/dev-bin/release.sh index 497c346e..5e55c254 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,37 +80,27 @@ 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" +cp -r target/reports/apidocs ".gh-pages/doc/$tag" rm .gh-pages/doc/latest ln -fs "$tag" .gh-pages/doc/latest @@ -127,6 +126,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..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 @@ -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 - - -