backports from 3.38.3 release

jdbi · Jun 6, 2023 · 29d4dfe · 29d4dfe
1 parent 7895751
commit 29d4dfe
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -25,6 +25,6 @@ jobs:
       env:
         NEXUS_REPO_USER: ${{ secrets.NEXUS_REPO_USER }}
         NEXUS_REPO_PASSWORD: ${{ secrets.NEXUS_REPO_PASSWORD }}
-        JDBI_MAVEN_OPTS: "-B -fae"
+        MAVEN_CONFIG: "-B -fae"
       run: |
           make deploy
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,9 @@ jobs:
       matrix:
         java-version: [ 8, 11, 17, 19 ]
         distribution: [ temurin ]
+        include:
+          - java-version: 20
+            distribution: oracle
 
     steps:
     - uses: actions/checkout@v3
@@ -42,10 +45,8 @@ jobs:
     - name: build distribution
       env:
         JAVA_HOME: ${{ steps.build_jdk.outputs.path }}
-        JDBI_MAVEN_OPTS: "-DskipTests -Dbasepom.check.skip-all=true -Dbasepom.check.skip-enforcer=false -B -fae"
+        MAVEN_CONFIG: "-Pfast -Dbasepom.check.skip-enforcer=false -B -fae"
       run: |
-        ./mvnw --version
-        echo $PATH
         make install
 
     - name: set test_jdk
@@ -57,8 +58,6 @@ jobs:
     - name: run tests
       env:
         JAVA_HOME: ${{ steps.test_jdk.outputs.path }}
-        JDBI_MAVEN_OPTS: "-B -fae"
+        MAVEN_CONFIG: "-B -fae"
       run: |
-        ./mvnw --version
-        echo $PATH
         make tests
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -23,8 +23,6 @@ jobs:
 
     - name: run code checkers
       env:
-        JDBI_MAVEN_OPTS: "-DskipTests=true -B -fae"
+        MAVEN_CONFIG: "-Dbasepom.test.skip=true -Dbasepom.it.skip=true -B -fae"
       run: |
-        ./mvnw --version
-        echo $PATH
         make install
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/pom.xml b/pom.xml
@@ -12,13 +12,13 @@
 ~   See the License for the specific language governing permissions and
 ~   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jdbi.internal</groupId>
+        <groupId>org.jdbi</groupId>
         <artifactId>jdbi3-build-parent</artifactId>
-        <version>3.38.0</version>
+        <version>3.38.3</version>
     </parent>
 
     <groupId>org.jdbi</groupId>
@@ -38,7 +38,7 @@
     <properties>
         <!-- run with -Dbasepom.it.skip=false to run tests using the guava cache plugin -->
         <basepom.it.skip>true</basepom.it.skip>
-        <dep.jdbi3.version>3.38.0</dep.jdbi3.version>
+        <dep.jdbi3.version>3.38.3</dep.jdbi3.version>
         <moduleName>org.jdbi.v3.cache.guava</moduleName>
     </properties>
 

diff --git a/src/it/test-guava-cache/pom.xml b/src/it/test-guava-cache/pom.xml
@@ -11,13 +11,11 @@
 ~   See the License for the specific language governing permissions and
 ~   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jdbi.internal</groupId>
+        <groupId>org.jdbi</groupId>
         <artifactId>jdbi3-build-parent</artifactId>
         <version>@dep.jdbi3.version@</version>
     </parent>