fixies

Signed-off-by: Adrian Cole <[email protected]>
openzipkin · Dec 5, 2023 · 671d1b3 · 671d1b3
1 parent 14bd5c4
commit 671d1b3
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 92 deletions.
diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,7 @@
     <HikariCP.version>5.1.0</HikariCP.version>
     <slf4j.version>1.7.36</slf4j.version>
     <auto-value.version>1.10.4</auto-value.version>
-    <git-commit-id.version>7.0.0</git-commit-id.version>
+    <git-commit-id.version>4.9.10</git-commit-id.version>
 
     <!-- Test only dependencies -->
     <junit.version>4.13.2</junit.version>

diff --git a/zipkin-collector/rabbitmq/pom.xml b/zipkin-collector/rabbitmq/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/../..</main.basedir>
+    <!-- TODO: this version is abandoned: we have to rewrite for 5.x to avoid CVEs -->
     <amqp-client.version>4.12.0</amqp-client.version>
   </properties>
 

diff --git a/zipkin-storage/mysql-v1/pom.xml b/zipkin-storage/mysql-v1/pom.xml
@@ -29,7 +29,9 @@
   <properties>
     <main.basedir>${project.basedir}/../..</main.basedir>
 
-    <jooq.version>3.18.7</jooq.version>
+    <!-- TODO: upgrade when we make floor JDK 11 or 17
+         3.16 is the last to compile with JDK <17; 3.14 last for Java 8 -->
+    <jooq.version>3.14.16</jooq.version>
 
     <!-- jOOQ doesn't add the Generated annotation, so we have to explicitly disable rules -->
     <errorprone.args>-Xep:InconsistentCapitalization:OFF</errorprone.args>

diff --git a/...ge/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/DefaultCatalog.java b/...ge/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/DefaultCatalog.java
diff --git a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Keys.java b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Keys.java
diff --git a/...in-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Zipkin.java b/...in-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Zipkin.java
diff --git a/...1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinAnnotations.java b/...1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinAnnotations.java
diff --git a/.../src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinDependencies.java b/.../src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinDependencies.java
diff --git a/...ysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinSpans.java b/...ysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinSpans.java