Merge branch 'master' into dependabot/gradle/test-project-groovy/org.spockframework-spock-core-2.4-groovy-5.0

Author: big-andy-coates

build.gradle

@@ -33,7 +33,7 @@ configurations {
     compile.extendsFrom plugin
 }
 
-def jUnitVersion = '6.0.1'
+def jUnitVersion = '6.0.3'
 
 dependencies {
     implementation gradleApi()

src/main/java/org/javamodularity/moduleplugin/TestEngine.java

@@ -1,5 +1,6 @@
 package org.javamodularity.moduleplugin;
 
+import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.*;
 import org.gradle.api.logging.Logger;
@@ -115,17 +116,17 @@ private static Stream<GroupArtifact> getModuleIdentifiers(Configuration origCfg,
             return getDirectDependencies(origCfg);
         }
 
-        Configuration cfg = origCfg.copyRecursive();
-        cfg.setCanBeResolved(true);
         try {
+            Configuration cfg = origCfg.copyRecursive();
+            cfg.setCanBeResolved(true);
             cfg.resolve();
             Set<ResolvedDependency> flmDeps = cfg.getResolvedConfiguration().getFirstLevelModuleDependencies();
             return flmDeps.stream()
                     .flatMap(dep -> Stream.concat(getAllDeps(dep).stream(),Stream.of(dep)))
                     .filter(dep -> isDependencyPresent(dep, files))
                     .map(dep -> GroupArtifact.fromModuleIdentifier(dep.getModule().getId().getModule()));
-        } catch (ResolveException e) {
-            LOGGER.debug("Cannot resolve transitive dependencies of configuration " + cfg.getName(), e);
+        } catch (GradleException e) {
+            LOGGER.debug("Cannot resolve transitive dependencies of configuration " + origCfg.getName(), e);
             return getDirectDependencies(origCfg);
         }
     }

test-project-kotlin/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "2.0.0" apply false
+    kotlin("jvm") version "2.3.21" apply false
     id("org.javamodularity.moduleplugin") version "2.0.0" apply false
 }