From 306cf54a9e61940beab2cf4093c4d4a3948251c5 Mon Sep 17 00:00:00 2001
From: Julian Hyde <jhyde@apache.org>
Date: Wed, 3 Jan 2024 18:22:29 -0800
Subject: [PATCH] Bump build-helper-maven-plugin to 3.5.0, checkstyle to
 10.12.7, guava to 33.0.0-jre, javacc to 7.0.13, jline to 3.25.0,
 maven-compiler-plugin to 3.12.1, maven-javadoc-plugin to 3.6.3,
 maven-project-info-reports-plugin to 3.5.0, maven-surefire-plugin to 3.2.3,
 slfj to 2.1.0-alpha1, versions-maven-plugin to 2.16.2

Revert maven-scm-provider-gitexe, maven-site-plugin, and
maven-source-plugin to their versions as of release 0.3.0.
---
 .github/workflows/main.yml | 13 ++++---------
 HISTORY.md                 |  3 ---
 pom.xml                    | 30 +++++++++++++++---------------
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 80f9c69a6..7f88645db 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,7 +34,7 @@ jobs:
     strategy:
       matrix:
         java-version: [ "11" ]
-        guava-version: [ "" ]
+        guava-version: [ "33.0.0-jre" ]
         hsqldb-version: [ "" ]
         checkstyle-version: [ "" ]
         javadoc: [ false ]
@@ -43,17 +43,12 @@ jobs:
             guava-version: "21.0"
             hsqldb-version: "2.5.1"
             checkstyle-version: "9.3"
-            javadoc: false
+          - java-version: "11"
           - java-version: "17"
-            guava-version: "23.0"
             javadoc: true
-          - java-version: "17"
-            guava-version: "32.0.1-jre"
-            javadoc: false
-            checkstyle-version: ""
           - java-version: "21"
-            guava-version: "32.1.3-jre"
-            javadoc: false
+            guava-version: "23.0"
+          - java-version: "21"
 
     steps:
       - uses: actions/checkout@v1
diff --git a/HISTORY.md b/HISTORY.md
index 56fce4fe4..bf42518be 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -240,8 +240,6 @@ Sergey Nuyanzin
 ### Build and tests
 
 * Bump `slf4j-api` from 2.0.2 to 2.0.3
-* Bump `maven-release-plugin` from 2.4.2 to 3.0.0-M6,
-  `maven-scm-provider-gitexe` from 1.9.1 to 2.0.0-M2
 * Bump `hsqldb` from 2.5.1 to 2.7.0
 * Add `hsqldb-version` parameter to CI
 * Add `interface Tracer`, so that tests can check for several events during the
@@ -265,7 +263,6 @@ Sergey Nuyanzin
 * Test Guava versions 19.0 to 31.1-jre in CI
 * Bump `guava` from 21.0 to 23.0
 * Bump `jline` from 3.16.0 to 3.21.0
-* Bump `maven-site-plugin` from 3.7.1 to 4.0.0-M3
 * Bump `maven-surefire-plugin` from 3.0.0-M3 to 3.0.0-M7
 * Bump `jsr305` from 1.3.9 to 3.0.2
 * Bump `slf4j-api` from 1.7.25 to 2.0.2
diff --git a/pom.xml b/pom.xml
index 153954c0e..33c1349ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,17 +76,17 @@ License.
     <top.dir>${project.basedir}</top.dir>
 
     <!-- Component and plugin versions, in alphabetical order. -->
-    <build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
+    <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
     <calcite.version>1.36.0</calcite.version>
     <!-- We support (and test) Checkstyle as low as 9.3.
          In JDK 8, you must add '-Dcheckstyle.version=9.3' because
          Checkstyle 10 requires JDK 11 or higher. -->
-    <checkstyle.version>10.12.4</checkstyle.version>
+    <checkstyle.version>10.12.7</checkstyle.version>
     <findbugs.version>3.0.2</findbugs.version>
     <foodmart-data-hsqldb.version>0.5</foodmart-data-hsqldb.version>
     <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
     <!-- We support (and test) Guava as low as 21. -->
-    <guava.version>32.1.3-jre</guava.version>
+    <guava.version>33.0.0-jre</guava.version>
     <hamcrest.version>2.2</hamcrest.version>
     <!-- We support (and test) HSQLDB as low as 2.5.1.
          In JDK 8, you must add '-Dhsqldb.version=2.5.1' because
@@ -94,22 +94,22 @@ License.
     <hsqldb.version>2.7.2</hsqldb.version>
     <java-diff.version>1.1.2</java-diff.version>
     <javacc-maven-plugin.version>3.0.3</javacc-maven-plugin.version>
-    <javacc.version>7.0.12</javacc.version>
-    <jline.version>3.24.1</jline.version>
+    <javacc.version>7.0.13</javacc.version>
+    <jline.version>3.25.0</jline.version>
     <junit-jupiter.version>5.10.1</junit-jupiter.version>
     <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
-    <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
     <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
-    <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
-    <maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version>
-    <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
-    <maven-scm-provider-gitexe.version>2.0.1</maven-scm-provider-gitexe.version>
-    <maven-site-plugin.version>4.0.0-M11</maven-site-plugin.version>
-    <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-    <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
+    <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
+    <maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>
+    <maven-release-plugin.version>2.4.2</maven-release-plugin.version>
+    <maven-scm-provider-gitexe.version>1.9.1</maven-scm-provider-gitexe.version>
+    <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
+    <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+    <maven-surefire-plugin.version>3.2.3</maven-surefire-plugin.version>
     <scott-data-hsqldb.version>0.2</scott-data-hsqldb.version>
-    <slf4j.version>2.0.9</slf4j.version>
-    <versions-maven-plugin.version>2.16.1</versions-maven-plugin.version>
+    <slf4j.version>2.1.0-alpha1</slf4j.version>
+    <versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
 
     <maven-javadoc-plugin.additionalOptions>-html5</maven-javadoc-plugin.additionalOptions>
     <maven-javadoc-plugin.excludePackageNames>net.hydromatic.morel.parse</maven-javadoc-plugin.excludePackageNames>