Switch Groovy script evaluation order

It makes more sense for the project one to be executed last in order to override

Author: erichaagdev

README.md

@@ -60,8 +60,8 @@ captured and under which conditions.
 You can apply additional configuration beyond what is contributed by the Common Custom User Data Maven extension by default.
 The extension evaluates Groovy scripts from two locations:
 
-1. A `.mvn/develocity-custom-user-data.groovy` or `.mvn/gradle-enterprise-custom-user-data.groovy` in your root project
-2. Any `*.groovy` files in the `custom-user-data` directory, located within the [Develocity storage directory](https://docs.gradle.com/develocity/maven-extension/current/#anatomy_of_the_develocity_directory), `${user.home}/.m2/.develocity` by default
+1. Any `*.groovy` files in the `custom-user-data` directory, located within the [Develocity storage directory](https://docs.gradle.com/develocity/maven-extension/current/#anatomy_of_the_develocity_directory), `${user.home}/.m2/.develocity` by default
+2. A `.mvn/develocity-custom-user-data.groovy` or `.mvn/gradle-enterprise-custom-user-data.groovy` in your root project
 
 All matching files are evaluated with the following bindings:
 

src/main/java/com/gradle/GroovyScriptUserData.java

@@ -17,8 +17,17 @@
 final class GroovyScriptUserData {
 
     static void evaluate(MavenSession session, DevelocityAdapter develocity, Logger logger, CustomConfigurationSpec customConfigurationSpec) throws MavenExecutionException {
-        evaluateGroovyScriptInRootProject(session, develocity, logger, customConfigurationSpec);
         evaluateGroovyScriptsInDevelocityStorageDirectory(session, develocity, logger, customConfigurationSpec);
+        evaluateGroovyScriptInRootProject(session, develocity, logger, customConfigurationSpec);
+    }
+
+    private static void evaluateGroovyScriptsInDevelocityStorageDirectory(MavenSession session, DevelocityAdapter develocity, Logger logger, CustomConfigurationSpec customConfigurationSpec) throws MavenExecutionException {
+        File customUserDataDirectory = develocity.getStorageDirectory().resolve("custom-user-data").toFile();
+        List<File> scripts = getGroovyScripts(customUserDataDirectory);
+        for (File script : scripts) {
+            logger.debug("Evaluating custom user data Groovy script: {}", script);
+            evaluateGroovyScript(session, develocity, logger, script, customConfigurationSpec.apiVariableName);
+        }
     }
 
     private static void evaluateGroovyScriptInRootProject(MavenSession session, DevelocityAdapter develocity, Logger logger, CustomConfigurationSpec customConfigurationSpec) throws MavenExecutionException {
@@ -40,15 +49,6 @@ private static void evaluateGroovyScriptInRootProject(MavenSession session, Deve
         }
     }
 
-    private static void evaluateGroovyScriptsInDevelocityStorageDirectory(MavenSession session, DevelocityAdapter develocity, Logger logger, CustomConfigurationSpec customConfigurationSpec) throws MavenExecutionException {
-        File customUserDataDirectory = develocity.getStorageDirectory().resolve("custom-user-data").toFile();
-        List<File> scripts = getGroovyScripts(customUserDataDirectory);
-        for (File script : scripts) {
-            logger.debug("Evaluating custom user data Groovy script: {}", script);
-            evaluateGroovyScript(session, develocity, logger, script, customConfigurationSpec.apiVariableName);
-        }
-    }
-
     private static File getGroovyScript(MavenSession session, String scriptName) {
         File rootDir = session.getRequest().getMultiModuleProjectDirectory();
         return new File(rootDir, ".mvn/" + scriptName + ".groovy");