build: pin transitive dependencies

Make sure we don't duplicate dependency versions.

org.ow2.asm:asm is still duplicated, because Xtext needs 9.7 but JaCoCo needs
9.6 instead. This only affects the jacocoAnt configuration of our Java projects.

3 files changed, 13 insertions, 13 deletions

diff --git a/subprojects/gradle-plugins/src/main/java/tools/refinery/gradle/plugins/RefineryJavaPlugin.java b/subprojects/gradle-plugins/src/main/java/tools/refinery/gradle/plugins/RefineryJavaPlugin.java
index 434010d5..4107695e 100644
--- a/subprojects/gradle-plugins/src/main/java/tools/refinery/gradle/plugins/RefineryJavaPlugin.java
+++ b/subprojects/gradle-plugins/src/main/java/tools/refinery/gradle/plugins/RefineryJavaPlugin.java
@@ -7,6 +7,7 @@ package tools.refinery.gradle.plugins;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.component.AdhocComponentWithVariants;
 import org.gradle.api.component.ConfigurationVariantDetails;
 import org.gradle.api.internal.tasks.JvmConstants;
@@ -24,6 +25,7 @@ import tools.refinery.gradle.plugins.internal.Versions;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Map;
 
 public class RefineryJavaPlugin implements Plugin<Project> {
         private static final String JUNIT_API = "org.junit.jupiter:junit-jupiter-api";
@@ -97,15 +99,17 @@ public class RefineryJavaPlugin implements Plugin<Project> {
                                         dependencies.enforcedPlatform(artifact) : dependencies.platform(artifact);
                 }));
 
+                RefineryPluginUtils.addConditionalDependency(dependencies, JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME,
+                                SLF4J_LOG4J, extension.getUseSlf4JLog4J());
                 RefineryPluginUtils.addConditionalDependency(dependencies, JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME,
                                 SLF4J_LOG4J, extension.getUseSlf4JLog4J());
                 RefineryPluginUtils.addConditionalDependency(dependencies, JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME,
                                 SLF4J_LOG4J, extension.getUseSlf4JLog4J().map(value ->
                                                 Boolean.TRUE.equals(value) && target.getPlugins().hasPlugin(ApplicationPlugin.class)));
 
-                RefineryPluginUtils.addConditionalDependency(dependencies, JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME,
+                RefineryPluginUtils.addConditionalDependency(dependencies, JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME,
                                 SLF4J_SIMPLE, extension.getUseSlf4JSimple());
-                RefineryPluginUtils.addConditionalDependency(dependencies, JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME,
+                RefineryPluginUtils.addConditionalDependency(dependencies, JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME,
                                 SLF4J_SIMPLE, extension.getUseSlf4JSimple().map(value ->
                                                 Boolean.TRUE.equals(value) && target.getPlugins().hasPlugin(ApplicationPlugin.class)));
 
@@ -197,10 +201,12 @@ public class RefineryJavaPlugin implements Plugin<Project> {
         }
 
         private static void excludeLog4J(Project project) {
-                RefineryPluginUtils.excludeLog4J(project, JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME);
-                if (project.getPlugins().hasPlugin(ApplicationPlugin.class)) {
-                        RefineryPluginUtils.excludeLog4J(project, JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME);
-                }
+                project.getConfigurations().withType(Configuration.class, configuration -> {
+                        if (configuration.getName().endsWith("Classpath")) {
+                                configuration.exclude(Map.of("group", "log4j", "module", "log4j"));
+                                configuration.exclude(Map.of("group", "ch.qos.reload4j", "module", "reload4j"));
+                        }
+                });
         }
 
         private static void configureJunitPlatform(Project project) {
diff --git a/subprojects/gradle-plugins/src/main/java/tools/refinery/gradle/plugins/internal/RefineryPluginUtils.java b/subprojects/gradle-plugins/src/main/java/tools/refinery/gradle/plugins/internal/RefineryPluginUtils.java
index 35ebdae4..0004f249 100644
--- a/subprojects/gradle-plugins/src/main/java/tools/refinery/gradle/plugins/internal/RefineryPluginUtils.java
+++ b/subprojects/gradle-plugins/src/main/java/tools/refinery/gradle/plugins/internal/RefineryPluginUtils.java
@@ -12,7 +12,6 @@ import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.provider.Provider;
 
 import java.util.List;
-import java.util.Map;
 
 public final class RefineryPluginUtils {
         public static final String VERSION_PROPERTY = "tools.refinery.version";
@@ -26,11 +25,6 @@ public final class RefineryPluginUtils {
                 throw new IllegalArgumentException("This is a static utility class and should not be instantiated directly.");
         }
 
-        public static void excludeLog4J(Project project, String configurationName) {
-                var testRuntimeClasspath = project.getConfigurations().getByName(configurationName);
-                testRuntimeClasspath.exclude(Map.of("group", "log4j", "module", "log4j"));
-        }
-
         public static void withShadowPlugin(Project project, Action<? super Project> action) {
                 // Method parameter in Gradle API uses raw type.
                 @SuppressWarnings("rawtypes")
diff --git a/subprojects/versions/build.gradle.kts b/subprojects/versions/build.gradle.kts
index 8137a32d..054158cb 100644
--- a/subprojects/versions/build.gradle.kts
+++ b/subprojects/versions/build.gradle.kts
@@ -17,7 +17,7 @@ mavenArtifact {
 }
 
 val refineryVersion = "refinery"
-val interpreterVersion = "refineryInterpreter"
+val interpreterVersion = "refinery-interpreter"
 val interpreterGroup = property("tools.refinery.interpreter.group").toString()
 val shadowVersion = "shadow"