diff --git a/Makefile b/Makefile index 3774d0d..a45009b 100644 --- a/Makefile +++ b/Makefile @@ -15,54 +15,56 @@ # SHELL = /bin/sh .SUFFIXES: -.PHONY: help clean install install-notests install-nodocker install-fast tests run-tests run-tests-nodocker deploy release deploy-site release-site MAVEN = ./mvnw ${JDBI_MAVEN_OPTS} export MAVEN_OPTS MAVEN_CONFIG -default: help +# must be the first target +default:: help -clean: +Makefile:: ; + +clean:: ${MAVEN} clean -install: +install:: ${MAVEN} clean install -tests: install-notests run-tests +tests:: install-notests run-tests -install-notests: MAVEN_CONFIG += -Dbasepom.test.skip=true -install-notests: install +install-notests:: MAVEN_CONFIG += -Dbasepom.test.skip=true +install-notests:: install -install-nodocker: MAVEN_CONFIG += -Dno-docker=true -install-nodocker: install +install-nodocker:: MAVEN_CONFIG += -Dno-docker=true +install-nodocker:: install -install-fast: MAVEN_CONFIG += -Pfast -install-fast: install +install-fast:: MAVEN_CONFIG += -Pfast +install-fast:: install -run-tests: MAVEN_CONFIG += -Dbasepom.it.skip=false -run-tests: +run-tests:: MAVEN_CONFIG += -Dbasepom.it.skip=false +run-tests:: ${MAVEN} surefire:test invoker:install invoker:integration-test invoker:verify -run-tests-nodocker: MAVEN_CONFIG += -Dno-docker=true -run-tests-nodocker: tests +run-tests-nodocker:: MAVEN_CONFIG += -Dno-docker=true +run-tests-nodocker:: tests -deploy: MAVEN_CONFIG += -Dbasepom.it.skip=false -deploy: +deploy:: MAVEN_CONFIG += -Dbasepom.it.skip=false +deploy:: ${MAVEN} clean deploy # run install b/c https://issues.apache.org/jira/browse/MJAVADOC-701 -deploy-site: +deploy-site:: ${MAVEN} clean install site-deploy -release: +release:: ${MAVEN} clean release:clean release:prepare release:perform -release-site: MAVEN_CONFIG += -Pjdbi-release -release-site: +release-site:: MAVEN_CONFIG += -Pjdbi-release +release-site:: ${MAVEN} clean install site-deploy -help: +help:: @echo " * clean - clean local build tree" @echo " * install - build, run static analysis and unit tests, then install in the local repository" @echo " * install-notests - same as 'install', but skip unit tests" diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 00ce650..7da37d1 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,13 @@ # Unreleased -# Unreleased +# 3.41.3 +* synced with mainline 3.41.3 release + +# 3.41.2 +* synced with mainline 3.41.2 release + +# 3.41.1 +* synced with mainline 3.41.1 release # 3.41.0 * synced with mainline 3.41.0 release @@ -9,7 +16,6 @@ * synced back to mainline * deploy javadoc for linking from main site - # 2.0 * matches Jdbi 3.38.0 diff --git a/pom.xml b/pom.xml index 45eb4c3..f4f9ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.jdbi jdbi3-build-parent - 3.41.2 + 3.41.3 org.jdbi @@ -141,8 +141,6 @@ org.apache.maven.plugins maven-javadoc-plugin - true - ${project.build.targetJdk} https://jdbi.org/releases/${dep.jdbi3.version}/apidocs