Merge pull request ehcache#3307 from myronkscott/slf4j2

myronkscott · web-flow · commit bb022ec0d79d · 2026-01-07T08:37:47.000-08:00
update core and platform moving to slf4j2
diff --git a/build-logic/src/main/java/org/ehcache/build/conventions/JavaConvention.java b/build-logic/src/main/java/org/ehcache/build/conventions/JavaConvention.java
@@ -1,8 +1,10 @@
 package org.ehcache.build.conventions;
 
+import java.util.Map;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
+import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.plugins.JavaPlugin;
 
 public class JavaConvention implements Plugin<Project> {
@@ -22,7 +24,10 @@ public void apply(Project project) {
     dependencies.add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.assertj:assertj-core:" + project.property("assertjVersion"));
     dependencies.add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.hamcrest:hamcrest:" + project.property("hamcrestVersion"));
     dependencies.add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.mockito:mockito-core:" + project.property("mockitoVersion"));
-    dependencies.add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.terracotta:terracotta-utilities-test-tools:" + project.property("terracottaUtilitiesVersion"));
+    ModuleDependency md = (ModuleDependency)dependencies.add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.terracotta:terracotta-utilities-test-tools:" + project.property("terracottaUtilitiesVersion"));
+    if (md != null) {
+      md.exclude(Map.of("group", "org.slf4j"));
+    }
 
     project.getConfigurations().all(config -> {
       config.getResolutionStrategy().dependencySubstitution(subs -> {
diff --git a/build-logic/src/main/java/org/ehcache/build/plugins/VoltronPlugin.java b/build-logic/src/main/java/org/ehcache/build/plugins/VoltronPlugin.java
@@ -35,8 +35,8 @@ public void apply(Project project) {
       config.exclude(Map.of("group", "ch.qos.logback"));
 
       DependencyHandler dependencyHandler = project.getDependencies();
-      String terracottaApisVersion = project.property("terracottaApisVersion").toString();
-      config.getDependencies().add(dependencyHandler.create("org.terracotta:server-api:" + terracottaApisVersion));
+      String terracottaCoreVersion = project.property("terracottaCoreVersion").toString();
+      config.getDependencies().add(dependencyHandler.create("org.terracotta:server-api:" + terracottaCoreVersion));
     });
 
     NamedDomainObjectProvider<Configuration> service = project.getConfigurations().register(SERVICE_CONFIGURATION_NAME, config -> {
diff --git a/clustered/ehcache-client/build.gradle b/clustered/ehcache-client/build.gradle
@@ -32,15 +32,17 @@ dependencies {
   compileOnlyApi project(':ehcache-xml:ehcache-xml-spi')
 
   api project(':clustered:ehcache-common')
-  compileOnly "org.terracotta:client-api:$terracottaApisVersion"
+  compileOnly "org.terracotta:client-api:$terracottaCoreVersion"
   implementation "org.terracotta:terracotta-runnel:$terracottaPlatformVersion"
   implementation "org.terracotta:terracotta-lease-client:$terracottaPlatformVersion"
   implementation "org.terracotta:terracotta-dynamic-config-entities-topology-client:$terracottaPlatformVersion"
-  implementation "org.terracotta:terracotta-utilities-tools:$terracottaUtilitiesVersion"
+  implementation ("org.terracotta:terracotta-utilities-tools:$terracottaUtilitiesVersion") {
+    exclude group: 'org.slf4j'
+  }
 
   compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0'
 
-  testImplementation "org.terracotta:client-api:$terracottaApisVersion"
+  testImplementation "org.terracotta:client-api:$terracottaCoreVersion"
   testImplementation "org.terracotta:terracotta-resources-offheap:$terracottaPlatformVersion"
   testImplementation "org.terracotta:terracotta-management-server-api:$terracottaPlatformVersion"
   testImplementation project(':clustered:server:ehcache-service-api')
@@ -56,15 +58,17 @@ dependencies {
   testImplementation project(':clustered:server:ehcache-service')
   testImplementation "org.terracotta:terracotta-client-message-tracker:$terracottaPlatformVersion"
   testImplementation project(':clustered:test-utils')
-  testImplementation ("org.terracotta:passthrough-server:$terracottaRuntimeVersion") {
+  testImplementation ("org.terracotta:passthrough-server:$terracottaCoreVersion") {
       exclude group: "ch.qos.logback"
   }
   testImplementation "org.terracotta:terracotta-lease-testing-passthrough:$terracottaPlatformVersion"
   testImplementation (group: 'org.codehaus.btm', name: 'btm', version: '2.1.4') {
     exclude group:'org.slf4j', module:'slf4j-api'
   }
   testImplementation testFixtures(project(':ehcache-xml'))
-  testImplementation ("org.terracotta:statistics:$parent.statisticVersion")
+  testImplementation ("org.terracotta:statistics:$parent.statisticVersion") {
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
   testImplementation ("org.terracotta:terracotta-structures:$terracottaPlatformVersion") {
     exclude group: 'org.slf4j', module: 'slf4j-api'
   }
diff --git a/clustered/ehcache-clustered/build.gradle b/clustered/ehcache-clustered/build.gradle
@@ -57,7 +57,7 @@ configurations {
 
 dependencies {
   contents project(':clustered:ehcache-client')
-  contents "org.terracotta.internal:client-runtime:$terracottaRuntimeVersion"
+  contents "org.terracotta.internal:client-runtime:$terracottaCoreVersion"
 
   implementation "org.slf4j:slf4j-api:$parent.slf4jVersion"
   implementation project(':ehcache')
@@ -87,7 +87,7 @@ configurations {
 }
 
 dependencies {
-  serverRuntime "org.terracotta.internal:server-runtime:$terracottaRuntimeVersion"
+  serverRuntime "org.terracotta.internal:server-runtime:$terracottaCoreVersion"
   serverApis project(':clustered:server:ehcache-service-api')
   serverLibs project(':clustered:server:ehcache-entity')
   serverLibs project(':clustered:server:ehcache-service')
diff --git a/clustered/ehcache-common-api/build.gradle b/clustered/ehcache-common-api/build.gradle
@@ -27,5 +27,5 @@ publishing.publications.withType(MavenPublication) {
 }
 
 dependencies {
-  compileOnlyApi "org.terracotta:common-api:$terracottaApisVersion"
+  compileOnlyApi "org.terracotta:common-api:$terracottaCoreVersion"
 }
diff --git a/clustered/ehcache-common/build.gradle b/clustered/ehcache-common/build.gradle
@@ -30,10 +30,12 @@ dependencies {
   api project(':ehcache-api')
   api project(':clustered:ehcache-common-api')
 
-  compileOnly "org.terracotta:common-api:$terracottaApisVersion"
+  compileOnly "org.terracotta:common-api:$terracottaCoreVersion"
   implementation "org.terracotta:terracotta-runnel:$terracottaPlatformVersion"
-  implementation "org.terracotta:terracotta-utilities-tools:$terracottaUtilitiesVersion"
+  implementation ("org.terracotta:terracotta-utilities-tools:$terracottaUtilitiesVersion") {
+    exclude group: 'org.slf4j'
+  }
 
-  testImplementation "org.terracotta:client-api:$terracottaApisVersion"
+  testImplementation "org.terracotta:client-api:$terracottaCoreVersion"
   testImplementation project(':clustered:test-utils')
 }
diff --git a/clustered/integration-test/build.gradle b/clustered/integration-test/build.gradle
@@ -25,7 +25,7 @@ dependencies {
   testImplementation project(':ehcache-impl')
   testImplementation project(':ehcache-xml')
   testImplementation project(':ehcache-107')
-  testImplementation "org.terracotta.internal:client-runtime:$terracottaRuntimeVersion"
+  testImplementation "org.terracotta.internal:client-runtime:$terracottaCoreVersion"
   testImplementation "org.terracotta:terracotta-runnel:$terracottaPlatformVersion"
   testImplementation "org.terracotta:terracotta-lease-client:$terracottaPlatformVersion"
   testImplementation("javax.cache:cache-tests:$jcacheTckVersion") {
@@ -38,7 +38,9 @@ dependencies {
   testImplementation project(':ehcache-management')
   testImplementation "org.terracotta:terracotta-management-entities-nms-client:$terracottaPlatformVersion"
   testImplementation "org.terracotta:terracotta-management-entities-nms-agent-client:$terracottaPlatformVersion"
-  testImplementation "org.terracotta:terracotta-utilities-port-chooser:$terracottaUtilitiesVersion"
+  testImplementation ("org.terracotta:terracotta-utilities-port-chooser:$terracottaUtilitiesVersion") {
+    exclude group: 'org.slf4j'
+  }
   testImplementation("org.terracotta:terracotta-dynamic-config-testing-galvan:$terracottaPlatformVersion") {
     exclude group: 'org.terracotta', module: 'terracotta-utilities-port-chooser'
     exclude group: 'org.slf4j'
@@ -47,9 +49,6 @@ dependencies {
     exclude group: 'org.slf4j'
   }
   testImplementation "javax.cache:cache-api:$jcacheVersion"
-  testImplementation ("ch.qos.logback:logback-classic:1.2.13") {
-    exclude group: 'org.slf4j'
-  }
   testImplementation("org.terracotta:terracotta-dynamic-config-cli-upgrade-tool-oss:$terracottaPlatformVersion") {
     exclude group: 'org.slf4j'
   }
diff --git a/clustered/integration-test/src/test/java/org/ehcache/testing/StandardCluster.java b/clustered/integration-test/src/test/java/org/ehcache/testing/StandardCluster.java
@@ -46,11 +46,11 @@ static String offheapResources(Map<String, Long> resources) {
   }
 
   static BasicExternalClusterBuilder newCluster() {
-    return BasicExternalClusterBuilder.newCluster().startupBuilder(ConfigRepoStartupBuilder::new);
+    return BasicExternalClusterBuilder.newCluster().startupBuilder(org.terracotta.testing.config.ConfigRepoStartupBuilder::new);
   }
 
   static BasicExternalClusterBuilder newCluster(int size) {
-    return BasicExternalClusterBuilder.newCluster(size).startupBuilder(ConfigRepoStartupBuilder::new);
+    return BasicExternalClusterBuilder.newCluster(size).startupBuilder(org.terracotta.testing.config.ConfigRepoStartupBuilder::new);
   }
 
   static String leaseLength(Duration leaseLength) {
diff --git a/clustered/osgi-test/build.gradle b/clustered/osgi-test/build.gradle
@@ -35,9 +35,14 @@ dependencies {
   osgiModule project(':ehcache')
   osgiModule project(':clustered:ehcache-clustered')
   osgiModule "javax.cache:cache-api:$parent.jcacheVersion"
+  osgiModule 'org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.7'
   osgiModule "org.slf4j:slf4j-simple:$parent.slf4jVersion"
-  osgiModule "org.terracotta:terracotta-utilities-test-tools:$terracottaUtilitiesVersion"
-  osgiModule "org.terracotta:terracotta-utilities-port-chooser:$terracottaUtilitiesVersion"
+  osgiModule ("org.terracotta:terracotta-utilities-test-tools:$terracottaUtilitiesVersion") {
+    exclude group: 'org.slf4j'
+  }
+  osgiModule ("org.terracotta:terracotta-utilities-port-chooser:$terracottaUtilitiesVersion") {
+    exclude group: 'org.slf4j'
+  }
   osgiModule 'org.apache.felix:org.apache.felix.scr:2.2.0'
   osgiModule 'com.sun.activation:javax.activation:1.2.0'
   osgiModule 'org.osgi:org.osgi.util.promise:1.2.0'
diff --git a/clustered/osgi-test/src/test/java/org/ehcache/osgi/ClusteredOsgiTest.java b/clustered/osgi-test/src/test/java/org/ehcache/osgi/ClusteredOsgiTest.java
@@ -99,7 +99,15 @@ public Option[] individualModules() {
 
       baseConfiguration("ClusteredOsgiTest", "individualModules"),
       gradleBundle("org.terracotta:terracotta-utilities-test-tools"),
-      gradleBundle("org.terracotta:terracotta-utilities-port-chooser")
+      gradleBundle("org.terracotta:terracotta-utilities-port-chooser"),
+      // ASM bundles required by SPI Fly
+      gradleBundle("org.ow2.asm:asm"),
+      gradleBundle("org.ow2.asm:asm-commons"),
+      gradleBundle("org.ow2.asm:asm-tree"),
+      gradleBundle("org.ow2.asm:asm-analysis"),
+      gradleBundle("org.ow2.asm:asm-util"),
+      // SPI Fly for SLF4J 2.x ServiceLoader support
+      gradleBundle("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle")
     );
   }
 
diff --git a/clustered/server/ehcache-entity/build.gradle b/clustered/server/ehcache-entity/build.gradle
@@ -33,16 +33,20 @@ dependencies {
 
   api project(':clustered:ehcache-common')
   implementation "org.terracotta:terracotta-runnel:$terracottaPlatformVersion"
-  implementation "org.terracotta:offheap-store:$offheapVersion"
+  implementation ("org.terracotta:offheap-store:$offheapVersion") {
+    exclude group:'org.slf4j'
+  }
   implementation "org.terracotta:terracotta-client-message-tracker:$terracottaPlatformVersion"
 
   testImplementation project(':clustered:server:ehcache-service')
   testImplementation project(':clustered:test-utils')
-  testImplementation ("org.terracotta:passthrough-server:$terracottaRuntimeVersion") {
+  testImplementation ("org.terracotta:passthrough-server:$terracottaCoreVersion") {
     exclude group:'org.slf4j'
   }
 
   testImplementation project(':clustered:server:ehcache-service-api')
   testImplementation "org.terracotta:terracotta-resources-offheap:$terracottaPlatformVersion"
-  testImplementation "org.terracotta:statistics:$statisticVersion"
+  testImplementation ("org.terracotta:statistics:$statisticVersion") {
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
 }
diff --git a/clustered/server/ehcache-service/build.gradle b/clustered/server/ehcache-service/build.gradle
@@ -29,14 +29,18 @@ publishing.publications.withType(MavenPublication) {
 dependencies {
   service project(':clustered:server:ehcache-service-api')
   service "org.terracotta:terracotta-resources-offheap:$terracottaPlatformVersion"
-  service "org.terracotta:statistics:$statisticVersion"
+  service ("org.terracotta:statistics:$statisticVersion") {
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
 
   implementation project(':clustered:ehcache-common')
-  implementation "org.terracotta:offheap-store:$offheapVersion"
+  implementation ("org.terracotta:offheap-store:$offheapVersion") {
+    exclude group:'org.slf4j'
+  }
 
   testImplementation project(':clustered:test-utils')
   testImplementation "org.terracotta:terracotta-management-server-api:$terracottaPlatformVersion"
-  testImplementation ("org.terracotta:passthrough-server:$terracottaRuntimeVersion") {
+  testImplementation ("org.terracotta:passthrough-server:$terracottaCoreVersion") {
       exclude group: "ch.qos.logback"
   }
 }
diff --git a/ehcache-107/build.gradle b/ehcache-107/build.gradle
@@ -66,7 +66,9 @@ dependencies {
   commonApi "javax.cache:cache-api:$parent.jcacheVersion"
 
   commonImplementation project(':ehcache-impl')
-  commonImplementation "org.terracotta:statistics:$statisticVersion"
+  commonImplementation ("org.terracotta:statistics:$statisticVersion")  {
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
 
   implementation project(':ehcache-xml')
   jakartaImplementation(project(':ehcache-xml')) {
diff --git a/ehcache-core/build.gradle b/ehcache-core/build.gradle
@@ -29,7 +29,9 @@ publishing.publications.withType(MavenPublication) {
 
 dependencies {
   api project(':ehcache-api')
-  implementation "org.terracotta:statistics:$parent.statisticVersion"
+  implementation ("org.terracotta:statistics:$parent.statisticVersion") {
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
   compileOnly 'org.osgi:osgi.core:6.0.0'
   compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0'
   testImplementation project(':spi-tester')
diff --git a/ehcache-core/src/test/java/org/ehcache/core/PrefixLoggerTest.java b/ehcache-core/src/test/java/org/ehcache/core/PrefixLoggerTest.java
@@ -20,9 +20,11 @@
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
+import org.slf4j.spi.LoggingEventBuilder;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.Arrays;
 
 import static org.mockito.Mockito.*;
@@ -88,22 +90,24 @@ public void testAllMethodsDelegationWithEnrichment() throws InvocationTargetExce
     PrefixLogger prefixLogger = new PrefixLogger(mockLogger, prefix);
 
     for (Method prefixLogMethod : Logger.class.getDeclaredMethods()) {
-
-      Class<?>[] parameterTypes = prefixLogMethod.getParameterTypes();
-      Object[] parameters = new Object[parameterTypes.length];
-      for (int j = 0; j < parameterTypes.length; j++) {
-        if (String.class.equals(parameterTypes[j])) {
-          parameters[j] = "log-msg";
-        } else if (parameterTypes[j].isArray()) {
-          parameters[j] = new Object[]{};
-        } else {
-          parameters[j] = mock(parameterTypes[j]);
+      if ((prefixLogMethod.getModifiers() & Modifier.PUBLIC) != 0 &&
+              !prefixLogMethod.getReturnType().equals(LoggingEventBuilder.class) &&
+              !prefixLogMethod.getReturnType().equals(boolean.class)) {
+        Class<?>[] parameterTypes = prefixLogMethod.getParameterTypes();
+        Object[] parameters = new Object[parameterTypes.length];
+        for (int j = 0; j < parameterTypes.length; j++) {
+          if (String.class.equals(parameterTypes[j])) {
+            parameters[j] = "log-msg";
+          } else if (parameterTypes[j].isArray()) {
+            parameters[j] = new Object[]{};
+          } else {
+            parameters[j] = mock(parameterTypes[j]);
+          }
         }
-      }
-
-      prefixLogMethod.invoke(prefixLogger, parameters);
-      prefixLogMethod.invoke(verify(mockLogger, times(1)), enrichStringParamValues(parameters, isMsgParameter(prefixLogMethod)));
 
+        prefixLogMethod.invoke(prefixLogger, parameters);
+        prefixLogMethod.invoke(verify(mockLogger, times(1)), enrichStringParamValues(parameters, isMsgParameter(prefixLogMethod)));
+      }
     }
   }
 
diff --git a/ehcache-impl/build.gradle b/ehcache-impl/build.gradle
@@ -51,15 +51,23 @@ task slowTest(type: Test) {
 
 dependencies {
   api project(':ehcache-core')
-  implementation group: 'org.terracotta', name: 'offheap-store', version: parent.offheapVersion
-  implementation group: 'org.ehcache', name: 'sizeof', version: parent.sizeofVersion
-  implementation group: 'org.terracotta', name: 'terracotta-utilities-tools', version: parent.terracottaUtilitiesVersion
+  implementation (group: 'org.terracotta', name: 'offheap-store', version: parent.offheapVersion) {
+    exclude group:'org.slf4j'
+  }
+  implementation (group: 'org.ehcache', name: 'sizeof', version: parent.sizeofVersion) {
+    exclude group: 'org.slf4j'
+  }
+  implementation (group: 'org.terracotta', name: 'terracotta-utilities-tools', version: parent.terracottaUtilitiesVersion) {
+    exclude group: 'org.slf4j'
+  }
   compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0'
   testImplementation testFixtures(project(':ehcache-core'))
   testImplementation project(':core-spi-test')
   testImplementation 'org.ow2.asm:asm:9.7.1'
   testImplementation 'org.ow2.asm:asm-commons:9.7.1'
-  testImplementation ("org.terracotta:statistics:$parent.statisticVersion")
+  testImplementation ("org.terracotta:statistics:$parent.statisticVersion") {
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
 }
 
 jar {
diff --git a/ehcache-management/build.gradle b/ehcache-management/build.gradle
@@ -29,14 +29,16 @@ publishing.publications.withType(MavenPublication) {
 dependencies {
   api project(':ehcache-core')
   implementation project(':ehcache-impl')
-  implementation "org.terracotta:statistics:$statisticVersion"
+  implementation ("org.terracotta:statistics:$statisticVersion") {
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
 
   // optional: if we want xml config
   compileOnlyApi project(':ehcache-xml:ehcache-xml-spi')
 
   // optional: if we want to use the clustered management layer
   compileOnly project(':clustered:ehcache-client')
-  compileOnly "org.terracotta:client-api:$terracottaApisVersion"
+  compileOnly "org.terracotta:client-api:$terracottaCoreVersion"
   compileOnlyApi ("org.terracotta:terracotta-management-entities-nms-agent-client:$terracottaPlatformVersion") {
     // This is to avoid stats lib being directly used.
     exclude group:'org.terracotta', module:'statistics'
diff --git a/ehcache-transactions/build.gradle b/ehcache-transactions/build.gradle
@@ -119,7 +119,9 @@ dependencies {
   jakartaTestRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"
   jakartaTestImplementation "junit:junit:$junitVersion"
   jakartaTestImplementation "org.hamcrest:hamcrest-library:$hamcrestVersion"
-  jakartaTestImplementation "org.terracotta:terracotta-utilities-test-tools:$terracottaUtilitiesVersion"
+  jakartaTestImplementation ("org.terracotta:terracotta-utilities-test-tools:$terracottaUtilitiesVersion") {
+    exclude group: 'org.slf4j'
+  }
 }
 
 configurations {
diff --git a/gradle.properties b/gradle.properties
@@ -5,13 +5,12 @@ ehcacheVersion = 3.12-SNAPSHOT
 offheapVersion = 2.5.6
 statisticVersion = 2.1.3
 jcacheVersion = 1.1.0
-slf4jVersion = 1.7.36
+slf4jVersion = 2.0.17
 sizeofVersion = 0.4.4
 
 # Terracotta clustered
-terracottaPlatformVersion = 5.11.4
-terracottaApisVersion = 5.12.+
-terracottaRuntimeVersion = 5.12.14
+terracottaPlatformVersion = 5.11.5
+terracottaCoreVersion = 5.12.15
 terracottaUtilitiesVersion = 0.0.19
 
 # Test lib versions
diff --git a/integration-test/build.gradle b/integration-test/build.gradle
@@ -31,5 +31,7 @@ dependencies {
   testImplementation (group: 'org.codehaus.btm', name: 'btm', version: '2.1.4') {
     exclude group:'org.slf4j', module:'slf4j-api'
   }
-  testImplementation "org.terracotta:statistics:$parent.statisticVersion"
+  testImplementation ("org.terracotta:statistics:$parent.statisticVersion") {
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
 }
diff --git a/osgi-test/build.gradle b/osgi-test/build.gradle
diff --git a/osgi-test/src/main/java/org/ehcache/osgi/OsgiTestUtils.java b/osgi-test/src/main/java/org/ehcache/osgi/OsgiTestUtils.java

Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ publishing.publications.withType(MavenPublication) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`dependencies {`
`30`		`- compileOnlyApi "org.terracotta:common-api:$terracottaApisVersion"`
	`30`	`+ compileOnlyApi "org.terracotta:common-api:$terracottaCoreVersion"`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,11 @@ static String offheapResources(Map<String, Long> resources) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`static BasicExternalClusterBuilder newCluster() {`
`49`		`- return BasicExternalClusterBuilder.newCluster().startupBuilder(ConfigRepoStartupBuilder::new);`
	`49`	`+ return BasicExternalClusterBuilder.newCluster().startupBuilder(org.terracotta.testing.config.ConfigRepoStartupBuilder::new);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`static BasicExternalClusterBuilder newCluster(int size) {`
`53`		`- return BasicExternalClusterBuilder.newCluster(size).startupBuilder(ConfigRepoStartupBuilder::new);`
	`53`	`+ return BasicExternalClusterBuilder.newCluster(size).startupBuilder(org.terracotta.testing.config.ConfigRepoStartupBuilder::new);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`static String leaseLength(Duration leaseLength) {`