deps: Fixed conflicting dependencies

Author: Julien Ruaux

build.gradle

@@ -73,13 +73,6 @@ subprojects {
 	test {
 	    maxHeapSize = "1024m"
 	}
-	bootJar {
-		enabled = false
-	}
-	jar {
-		enabled = true
-		archiveClassifier = ''
-	}
 
 	sourceCompatibility = 8
     targetCompatibility = 8

gradle.properties

@@ -1,20 +1,28 @@
 group=com.redis
 
-bootPluginVersion=2.6.7
-dependencyPluginVersion=1.0.11.RELEASE
 dockerPluginVersion=0.32.0
 kordampBuildVersion=2.6.0
 kordampPluginVersion=0.47.0
 
 airliftVersion=215
 antlrVersion=4.9.3
+annotationVersion=1.3.2
+awaitilityVersion=4.2.0
+errorproneVersion=2.12.0
+fastutilVersion=8.3.0
 guavaVersion=31.1-jre
 guiceVersion=5.1.0
 injectVersion=1
 jacksonVersion=2.13.1
+jnaVersion=5.10.0
+jodaVersion=2.10.13
 lettucemodVersion=2.19.3
 testcontainersRedisVersion=1.5.5
+servletVersion=4.0.1
+slf4jVersion=1.7.32
 sliceVersion=0.42
 trinoVersion=380
 ulidVersion=4.2.1
-unitsVersion=1.6
+unitsVersion=1.6
+validationVersion=2.0.1.Final
+wsVersion=2.1.1

settings.gradle

@@ -7,8 +7,6 @@ buildscript {
     dependencies {
         classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion"
         classpath "org.kordamp.gradle:java-project-gradle-plugin:$kordampPluginVersion"
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:$bootPluginVersion"
-        classpath "io.spring.gradle:dependency-management-plugin:$dependencyPluginVersion"
         classpath "com.palantir.gradle.docker:gradle-docker:$dockerPluginVersion"
     }
 }
@@ -30,12 +28,47 @@ projects {
         dirs(['subprojects']) {
             id 'java-library'
             id 'java-library-distribution'
-            id 'org.springframework.boot'
-            id 'io.spring.dependency-management'
         }
     }
 }
 
 enforce {
-    enabled = false
+    rule(enforcer.rules.ForceDependencies) { r ->
+        r.dependencies.addAll "com.google.guava:guava:$guavaVersion",
+        "com.google.inject:guice:$guiceVersion",
+        "com.google.errorprone:error_prone_annotations:$errorproneVersion",
+        "io.airlift:units:$unitsVersion",
+		"io.airlift:bootstrap:$airliftVersion",
+		"io.airlift:configuration:$airliftVersion",
+		"io.airlift:json:$airliftVersion",
+		"io.airlift:concurrent:$airliftVersion",
+		"io.airlift:log:$airliftVersion",
+		"io.airlift:slice:$sliceVersion",
+		"io.airlift:discovery:$airliftVersion",
+		"io.airlift:event:$airliftVersion",
+		"io.airlift:http-client:$airliftVersion",
+		"io.airlift:http-server:$airliftVersion",
+		"io.airlift:jaxrs:$airliftVersion",
+		"io.airlift:jmx:$airliftVersion",
+		"io.airlift:node:$airliftVersion",
+		"io.airlift:trace-token:$airliftVersion",
+		"javax.servlet:javax.servlet-api:$servletVersion",
+        "org.slf4j:slf4j-api:$slf4jVersion",
+        "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion",
+        "com.fasterxml.jackson.core:jackson-core:$jacksonVersion",
+        "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
+        "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:$jacksonVersion",
+        "javax.validation:validation-api:$validationVersion",
+        "javax.annotation:javax.annotation-api:$annotationVersion",
+        "joda-time:joda-time:$jodaVersion",
+        "org.awaitility:awaitility:$awaitilityVersion",
+        "org.antlr:antlr4-runtime:$antlrVersion",
+        "it.unimi.dsi:fastutil:$fastutilVersion",
+        "net.java.dev.jna:jna:$jnaVersion",
+        "javax.ws.rs:javax.ws.rs-api:$wsVersion"
+    }
+    rule(enforcer.rules.BanDuplicateClasses) { r ->
+        // ignore all classes under the following package
+        r.ignore('org.hamcrest.*')
+    }
 }

subprojects/trino-redisearch/src/test/java/com/redis/trino/RediSearchQueryRunner.java

@@ -1,11 +1,10 @@
 package com.redis.trino;
 
-import static io.airlift.testing.Closeables.closeAllSuppress;
-import static io.airlift.units.Duration.nanosSince;
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
+import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import java.util.Map;
@@ -15,6 +14,8 @@
 
 import io.airlift.log.Logger;
 import io.airlift.log.Logging;
+import io.airlift.testing.Closeables;
+import io.airlift.units.Duration;
 import io.trino.Session;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.plugin.tpch.TpchPlugin;
@@ -57,14 +58,34 @@ public static DistributedQueryRunner createRediSearchQueryRunner(RediSearchServe
 			for (TpchTable<?> table : tables) {
 				loadTpchTopic(server, trinoClient, table);
 			}
-			LOG.info("Loading complete in %s", nanosSince(startTime).toString(SECONDS));
+			LOG.info("Loading complete in %s", Duration.nanosSince(startTime).toString(SECONDS));
 			return queryRunner;
 		} catch (Throwable e) {
-			closeAllSuppress(e, queryRunner);
+			Closeables.closeAllSuppress(e, queryRunner);
 			throw e;
 		}
 	}
 
+	public static <T extends Throwable> T closeAllSuppress(T rootCause, AutoCloseable... closeables) {
+		requireNonNull(rootCause, "rootCause is null");
+		if (closeables == null) {
+			return rootCause;
+		}
+		for (AutoCloseable closeable : closeables) {
+			try {
+				if (closeable != null) {
+					closeable.close();
+				}
+			} catch (Throwable e) {
+				// Self-suppression not permitted
+				if (rootCause != e) {
+					rootCause.addSuppressed(e);
+				}
+			}
+		}
+		return rootCause;
+	}
+
 	private static void installRediSearchPlugin(RediSearchServer server, QueryRunner queryRunner,
 			RediSearchConnectorFactory factory, Map<String, String> extraConnectorProperties) {
 		queryRunner.installPlugin(new RediSearchPlugin(factory));
@@ -81,7 +102,7 @@ private static void loadTpchTopic(RediSearchServer server, TestingTrinoClient tr
 				table.getTableName().toLowerCase(ENGLISH), trinoClient.getServer(), trinoClient.getDefaultSession());
 		loader.execute(format("SELECT * from %s",
 				new QualifiedObjectName(TPCH_SCHEMA, TINY_SCHEMA_NAME, table.getTableName().toLowerCase(ENGLISH))));
-		LOG.info("Imported %s in %s", table.getTableName(), nanosSince(start).convertToMostSuccinctTimeUnit());
+		LOG.info("Imported %s in %s", table.getTableName(), Duration.nanosSince(start).convertToMostSuccinctTimeUnit());
 	}
 
 	public static Session createSession() {

subprojects/trino-redisearch/trino-redisearch.gradle

@@ -10,12 +10,16 @@ dependencies {
     implementation group: 'io.airlift', name: 'json', version: airliftVersion
     implementation group: 'com.redis', name: 'lettucemod', version: lettucemodVersion
     implementation group: 'com.github.f4b6a3', name: 'ulid-creator', version: ulidVersion
-    implementation 'javax.validation:validation-api'
-    testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis-junit', version: testcontainersRedisVersion
+    implementation group: 'javax.validation', name: 'validation-api', version: validationVersion
     testImplementation group: 'com.redis', name: 'lettucemod', version: lettucemodVersion, classifier: 'tests'
+    testImplementation(group: 'com.redis.testcontainers', name: 'testcontainers-redis-junit', version: testcontainersRedisVersion) {
+        exclude group: 'com.redis', module: 'lettucemod'
+        exclude group: 'org.junit.jupiter', module: 'junit-jupiter-api'
+    }
+    testImplementation group: 'io.airlift', name: 'testing', version: airliftVersion
     testImplementation(group: 'io.trino', name: 'trino-testing', version: trinoVersion) {
     	exclude group: 'org.testcontainers', module: 'testcontainers-java'
-    }
+    }    
 }
 
 test {