From a5039dccf8f6bab5cfc131a5e0f14b4fbfe7eae4 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:05:32 -0700 Subject: [PATCH 01/19] Split from otj * independent management of versions * still uses basepom * still needs some work to fix release/gpg --- pom.xml | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 114b4d8f..6c91692e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,9 +18,9 @@ 4.0.0 - com.opentable - otj-parent-spring - 328 + org.basepom + basepom-minimal + 55 @@ -36,9 +36,18 @@ Embedded PostgreSQL driver - - 1.16.3 - + true + 11 + ${project.build.targetJdk} + ${project.build.targetJdk} + 1.18.3 + 42.5.1 + 4.23.1 + 1.7.36 + 8.5.13 + 3.12.0 + 4.13.2 + 5.8.2 1800 true false @@ -58,28 +67,33 @@ org.slf4j slf4j-api + ${dep.slf4j.version} org.apache.commons commons-lang3 + ${dep.commons-lang.version} org.flywaydb flyway-core true + ${dep.flyway.version} org.liquibase liquibase-core + ${dep.liquibase.version} true org.postgresql postgresql + ${dep.postgres-jdbc.version} @@ -94,6 +108,7 @@ junit junit + ${dep.junit.version} provided true @@ -101,6 +116,7 @@ org.junit.jupiter junit-jupiter-api + ${dep.junit5.version} provided true @@ -108,6 +124,7 @@ org.slf4j slf4j-simple + ${dep.slf4j.version} test From fbf93d06f353d426ce83850099bda06fc1c0d558 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:29:22 -0700 Subject: [PATCH 02/19] add release profiles --- pom.xml | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/pom.xml b/pom.xml index 6c91692e..e4eb9711 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,13 @@ Embedded PostgreSQL driver + 4.2 + validate + true + basepom.oss-release,oss-build + + ${basepom.check.skip-extended} + ${basepom.check.fail-extended} true 11 ${project.build.targetJdk} @@ -144,4 +151,124 @@ + + + oss-build + + + .oss-build + + + + + + + opentable.snapshot + opentable-snapshots + true + https://artifactory.otenv.com/snapshots + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + + org.apache.maven.plugins + maven-release-plugin + + + ${basepom.release.profiles} + + + + + + com.mycila + license-maven-plugin + ${dep.plugin.license.version} + + + org.basepom + basepom-policy + ${dep.basepom-policy.version} + + + + ${basepom.check.skip-license} + ${basepom.license.skip-existing} + ${basepom.check.fail-license} +
license/basepom-apache-license-header.txt
+ + license/xml-prefix.xml + + + XML_PREFIX + SLASHSTAR_STYLE + SCRIPT_STYLE + + true + true + true + ${project.build.sourceEncoding} + + .*/** + **/*.md + **/*.rst + **/*.adoc + **/*.sh + **/*.txt + **/*.thrift + **/*.proto + **/*.g + **/*.releaseBackup + **/*.vm + **/*.st + **/*.raw + **/*.ser + **/src/license/** + + + src/** + **/pom.xml + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${dep.plugin.gpg.version} + + true + + + + + + + + + com.mycila + license-maven-plugin + + + basepom.default + ${basepom.check.phase-license} + + check + + + + + + + + + From ba22716db3f74e3cc9fefb6c244e9c5a78b77146 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:31:05 -0700 Subject: [PATCH 03/19] [maven-release-plugin] prepare release otj-pg-embedded-test-release-1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e4eb9711..6f3accff 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - HEAD + otj-pg-embedded-test-release-1 com.opentable.components otj-pg-embedded - 1.0.2-SNAPSHOT + test-release-1 Embedded PostgreSQL driver From 49bb5daca529336c531b93638dbe1fe52d9607c2 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:31:05 -0700 Subject: [PATCH 04/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6f3accff..a036856d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - otj-pg-embedded-test-release-1 + HEAD com.opentable.components otj-pg-embedded - test-release-1 + 1.1-SNAPSHOT Embedded PostgreSQL driver From 00079a3c9850cd62182be2dc216f1e98b788bed9 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:34:01 -0700 Subject: [PATCH 05/19] back rev version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a036856d..e4eb9711 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ com.opentable.components otj-pg-embedded - 1.1-SNAPSHOT + 1.0.2-SNAPSHOT Embedded PostgreSQL driver From 7a17439be28319a8c5634d7541e1365b40f1b79e Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:47:32 -0700 Subject: [PATCH 06/19] add missing profile --- pom.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/pom.xml b/pom.xml index e4eb9711..5929409a 100644 --- a/pom.xml +++ b/pom.xml @@ -269,6 +269,64 @@ + + + + basepom.oss-release + + + true + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + package + + jar + + + + + + + net.alchim31.maven + scala-maven-plugin + + + attach-scaladocs + package + + ${basepom.oss.skip-scala-doc} + + + doc-jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + basepom.sign-artifacts + verify + + sign + + + + + + + From c6fec415e6054a6ec2d790b5c4f433be8528a296 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:51:00 -0700 Subject: [PATCH 07/19] [maven-release-plugin] prepare release otj-pg-embedded-another-test-3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5929409a..b1bb38de 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - HEAD + otj-pg-embedded-another-test-3 com.opentable.components otj-pg-embedded - 1.0.2-SNAPSHOT + another-test-3 Embedded PostgreSQL driver From 7f2af2dc4fcb1a6609f0479740c180d9b5543810 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:51:01 -0700 Subject: [PATCH 08/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b1bb38de..5929409a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - otj-pg-embedded-another-test-3 + HEAD com.opentable.components otj-pg-embedded - another-test-3 + 1.0.2-SNAPSHOT Embedded PostgreSQL driver From c4026342e2ceae8be23ede22f3b7d0f1b73eb352 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:52:58 -0700 Subject: [PATCH 09/19] gpg version --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 5929409a..b6e97de9 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ Embedded PostgreSQL driver + 3.1.0 4.2 validate true From 6a7c0f4f537997fcf271336fd2db25327fdeef4d Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:54:31 -0700 Subject: [PATCH 10/19] [maven-release-plugin] prepare release otj-pg-embedded-another-test-4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b6e97de9..f16bef1a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - HEAD + otj-pg-embedded-another-test-4 com.opentable.components otj-pg-embedded - 1.0.2-SNAPSHOT + another-test-4 Embedded PostgreSQL driver From 17fb33d759a1a716f055f85209a21196efb78585 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:54:31 -0700 Subject: [PATCH 11/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f16bef1a..b6e97de9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - otj-pg-embedded-another-test-4 + HEAD com.opentable.components otj-pg-embedded - another-test-4 + 1.0.2-SNAPSHOT Embedded PostgreSQL driver From 2888b2229c489938d0587aec3f780d138622571a Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:57:07 -0700 Subject: [PATCH 12/19] comment out scala --- pom.xml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index b6e97de9..a1f0ef1e 100644 --- a/pom.xml +++ b/pom.xml @@ -295,22 +295,22 @@ - - net.alchim31.maven - scala-maven-plugin - - - attach-scaladocs - package - - ${basepom.oss.skip-scala-doc} - - - doc-jar - - - - + + + + + + + + + + + + + + + + org.apache.maven.plugins From 5b4758bc2ca0d28f19fe088f16dc92ddddb225b6 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:58:37 -0700 Subject: [PATCH 13/19] [maven-release-plugin] prepare release otj-pg-embedded-another-test-5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a1f0ef1e..1c6f393a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - HEAD + otj-pg-embedded-another-test-5 com.opentable.components otj-pg-embedded - 1.0.2-SNAPSHOT + another-test-5 Embedded PostgreSQL driver From 3a0568fad4a8e6fb80f1979bc0558a80b2516b72 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 23 Aug 2023 09:58:38 -0700 Subject: [PATCH 14/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1c6f393a..a1f0ef1e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - otj-pg-embedded-another-test-5 + HEAD com.opentable.components otj-pg-embedded - another-test-5 + 1.0.2-SNAPSHOT Embedded PostgreSQL driver From bf9b5762f18dcae9092f8b4709d20ad2a14c9804 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 20 Sep 2023 07:54:06 -0700 Subject: [PATCH 15/19] fix for javadoc generation --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a1f0ef1e..4008b311 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,7 @@ 4.13.2 5.8.2 1800 + false true false false From 72dc895b2375a34f6deb799a8ec8843429570a27 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 20 Sep 2023 07:56:09 -0700 Subject: [PATCH 16/19] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ebdacee..574eb9c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +1.0.2 +----- +* Internally split off from otj-parent to allow compatibility between different otj stacks and not pull as much otj-ness. + 1.0.1 ----- * Parent POM-328 [changes see here]( https://github.com/opentable/otj-parent/blob/master/CHANGELOG.md#328) From 5084f670d88e6bf2ed69a990bf5f8256152f3ca9 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 20 Sep 2023 07:58:17 -0700 Subject: [PATCH 17/19] [maven-release-plugin] prepare release otj-pg-embedded-1.0.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4008b311..33599f8c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - HEAD + otj-pg-embedded-1.0.2 com.opentable.components otj-pg-embedded - 1.0.2-SNAPSHOT + 1.0.2 Embedded PostgreSQL driver From 16ec812a5cccb5f8d32e1c917d4f4431023207f9 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 20 Sep 2023 07:58:17 -0700 Subject: [PATCH 18/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 33599f8c..52ba8d8a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ scm:git:git://github.com/opentable/otj-pg-embedded.git scm:git:git@github.com:opentable/otj-pg-embedded.git http://github.com/opentable/otj-pg-embedded - otj-pg-embedded-1.0.2 + HEAD com.opentable.components otj-pg-embedded - 1.0.2 + 1.0.3-SNAPSHOT Embedded PostgreSQL driver From a6d1ae1eb50cbd00106b2143e5b6c73c1af498e7 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Wed, 20 Sep 2023 08:12:22 -0700 Subject: [PATCH 19/19] dependencies --- CHANGELOG.md | 5 +++++ pom.xml | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 574eb9c9..db0ae7c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +1.0.3 (unreleased) +---- +* commons compress 1.24.0 (used by testcontainers) updated for a CVE. +* testcontainers 1.19.0 + 1.0.2 ----- * Internally split off from otj-parent to allow compatibility between different otj stacks and not pull as much otj-ness. diff --git a/pom.xml b/pom.xml index 52ba8d8a..01bfce8f 100644 --- a/pom.xml +++ b/pom.xml @@ -48,12 +48,13 @@ 11 ${project.build.targetJdk} ${project.build.targetJdk} - 1.18.3 + 1.19.0 42.5.1 4.23.1 1.7.36 8.5.13 3.12.0 + 1.24.0 4.13.2 5.8.2 1800 @@ -84,6 +85,12 @@ commons-lang3 ${dep.commons-lang.version} + + org.apache.commons + commons-compress + ${dep.commons-compress.version} + runtime + org.flywaydb