Skip to content

Commit

Permalink
update to 3.41.3 baseline
Browse files Browse the repository at this point in the history
  • Loading branch information
hgschmie committed Oct 3, 2023
1 parent ea3c5ca commit 818ca1c
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 27 deletions.
46 changes: 24 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 8 additions & 2 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -9,7 +16,6 @@
* synced back to mainline
* deploy javadoc for linking from main site


# 2.0
* matches Jdbi 3.38.0

Expand Down
4 changes: 1 addition & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.jdbi</groupId>
<artifactId>jdbi3-build-parent</artifactId>
<version>3.41.2</version>
<version>3.41.3</version>
</parent>

<groupId>org.jdbi</groupId>
Expand Down Expand Up @@ -141,8 +141,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<legacyMode>true</legacyMode>
<release>${project.build.targetJdk}</release>
<links combine.children="append">
<link>https://jdbi.org/releases/${dep.jdbi3.version}/apidocs</link>
</links>
Expand Down

0 comments on commit 818ca1c

Please sign in to comment.