Upgrade to JDK 17 + add PR workflow

Author: ledoyen

.editorconfig

@@ -8,3 +8,6 @@ charset = utf-8
 
 indent_style = space
 indent_size = 4
+
+[.github/workflows/*.yml]
+indent_size = 2

.github/workflows/pr.yml

@@ -0,0 +1,22 @@
+name: 🏗️ Build & test
+
+on:
+  pull_request:
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+          cache: maven
+
+      - name: 🏗️ Build & test
+        run: |
+          mvn -version
+          export MAVEN_HOME="$(whereis mvn)"
+          mvn clean verify -Dorg.slf4j.simpleLogger.showDateTime=true "-Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss"

pom.xml

@@ -14,8 +14,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
 
         <maven-core.version>3.8.1</maven-core.version>
         <maven-invoker.version>3.1.0</maven-invoker.version>

src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildToolResolver.java

@@ -1,10 +1,10 @@
 package com.github.fridujo.classpath.junit.extension.buildtool;
 
+import com.github.fridujo.classpath.junit.extension.PathElement;
+
 import java.util.Optional;
 import java.util.Set;
 
-import com.github.fridujo.classpath.junit.extension.PathElement;
-
 public interface BuildToolResolver {
 
     Optional<BuildTool> resolve(Set<PathElement> classpath);

src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenResolver.java

@@ -1,6 +1,10 @@
 package com.github.fridujo.classpath.junit.extension.buildtool.maven;
 
-import static java.util.Optional.empty;
+import com.github.fridujo.classpath.junit.extension.PathElement;
+import com.github.fridujo.classpath.junit.extension.buildtool.BuildTool;
+import com.github.fridujo.classpath.junit.extension.buildtool.BuildToolResolver;
+import com.github.fridujo.classpath.junit.extension.utils.Processes;
+import com.github.fridujo.classpath.junit.extension.utils.SystemVariables;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -10,24 +14,28 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.github.fridujo.classpath.junit.extension.PathElement;
-import com.github.fridujo.classpath.junit.extension.buildtool.BuildTool;
-import com.github.fridujo.classpath.junit.extension.buildtool.BuildToolResolver;
-import com.github.fridujo.classpath.junit.extension.utils.Processes;
-import com.github.fridujo.classpath.junit.extension.utils.SystemVariables;
+import static java.util.Optional.empty;
 
 public class MavenResolver implements BuildToolResolver {
     static final String M2_HOME = "M2_HOME";
+    static final String MAVEN_HOME = "MAVEN_HOME";
     static final String USER_HOME = "user.home";
 
     private static final Pattern MAVEN_HOME_LINE_PATTERN = Pattern.compile("^" + Pattern.quote("Maven home: ") + "(?<home>.+)$", Pattern.MULTILINE);
     private static final Pattern LOCAL_REPOSITORY_PATTERN = Pattern.compile(Pattern.quote("<localRepository>") + "(?<localRepo>.+)" + Pattern.quote("</localRepository>"));
 
     private final SystemVariables systemVariables = new SystemVariables();
 
+    private void declareMavenHomeIfNeeded(Optional<Path> mavenHome) {
+        if (mavenHome.isPresent() && System.getProperty("maven.home") == null) {
+            System.setProperty("maven.home", mavenHome.get().toString());
+        }
+    }
+
     @Override
     public Optional<BuildTool> resolve(Set<PathElement> classpath) {
         Optional<Path> mavenHome = getMavenHome();
+        declareMavenHomeIfNeeded(mavenHome);
         Optional<Path> localRepository = getLocalRepository();
 
         if (mavenHome.isPresent() && localRepository.isPresent()) {
@@ -39,6 +47,7 @@ public Optional<BuildTool> resolve(Set<PathElement> classpath) {
 
     Optional<Path> getMavenHome() {
         Optional<Path> mavenHomeFromSysProps = Optional.ofNullable(systemVariables.get(M2_HOME))
+            .or(() -> Optional.ofNullable(systemVariables.get(MAVEN_HOME)))
             .map(Paths::get)
             .filter(Files::exists)
             .filter(Files::isDirectory);

src/test/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenResolverTest.java

@@ -1,27 +1,30 @@
 package com.github.fridujo.classpath.junit.extension.buildtool.maven;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import com.github.fridujo.classpath.junit.extension.utils.Reflections;
+import com.github.fridujo.classpath.junit.extension.utils.SystemVariables;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
 
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import com.github.fridujo.classpath.junit.extension.utils.Reflections;
-import com.github.fridujo.classpath.junit.extension.utils.SystemVariables;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
 
 class MavenResolverTest {
 
     @Test
     void gather_maven_home_from_sys_props() {
-        assertThat(new SystemVariables().get(MavenResolver.M2_HOME)).as(MavenResolver.M2_HOME + " system property must be set on the build system (not required for users)").isNotBlank();
-
         Optional<Path> mavenHome = new MavenResolver().getMavenHome();
 
+        assertThat(
+            Optional.ofNullable(new SystemVariables().get(MavenResolver.M2_HOME))
+                .orElseGet(() -> new SystemVariables().get(MavenResolver.MAVEN_HOME))
+        )
+            .as(MavenResolver.M2_HOME + " or " + MavenResolver.MAVEN_HOME + " system property must be set on the build system (not required for users)")
+            .isNotBlank();
         assertThat(mavenHome).isPresent();
         assertThat(mavenHome.get()).isDirectoryContaining(p -> Files.isDirectory(p) && p.getFileName().toString().equals("bin"));
     }