From ca21fd50f64370e444d43d865045a1a160b23640 Mon Sep 17 00:00:00 2001
From: Malte Meister <malte.meister@gmx.net>
Date: Tue, 5 Sep 2023 11:50:02 +0200
Subject: [PATCH] revert e5e3f0 because guava-gwt requires GWT 2.10.0 from
 32.0.0, but ...

... we're still on GWT 2.8.2 (see https://github.com/google/guava/releases/tag/v32.0.0); the security fixes made in guava 32.0.0 are not of concern as we don't use the affected classes and methods; oddly enough we were compiling without issues under guava 32.1.1, but compilation fails when attempting to run the dependency:analyze maven goal for example (with similar symptoms as https://github.com/google/guava/issues/6627)
---
 catma.iml | 14 ++++++++------
 pom.xml   |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/catma.iml b/catma.iml
index 195cd048..01981e36 100644
--- a/catma.iml
+++ b/catma.iml
@@ -54,7 +54,6 @@
     <orderEntry type="library" name="Maven: com.vaadin:vaadin-client:8.14.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.gwt:gwt-elemental:2.8.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.gwt:gwt-user:2.8.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:sources:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:sources:1.0.0.GA" level="project" />
@@ -91,13 +90,16 @@
     <orderEntry type="library" name="Maven: com.hazelcast:hazelcast:3.12.13" level="project" />
     <orderEntry type="library" name="Maven: com.hazelcast:hazelcast-client:3.12.13" level="project" />
     <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:32.1.1-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:31.1-jre" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.33.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.18.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:2.8" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava-gwt:32.1.1-jre" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava-gwt:31.1-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.elemental2:elemental2-promise:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.jsinterop:base:1.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.jgit:org.eclipse.jgit:4.11.8.201904181247-r" level="project" />
     <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" />
     <orderEntry type="library" name="Maven: com.jcraft:jzlib:1.1.1" level="project" />
diff --git a/pom.xml b/pom.xml
index 577a6b67..ea17a110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>32.1.1-jre</version>
+			<version>31.1-jre</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.google.code.findbugs</groupId>
@@ -189,7 +189,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava-gwt</artifactId>
-			<version>32.1.1-jre</version>
+			<version>31.1-jre</version>
 		</dependency>
 
 		<!-- JGit -->