diff --git a/pom.xml b/pom.xml index 1807049e..53fbb437 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.vegardit.maven vegardit-maven-parent - 6.1.5 + 6.1.6-SNAPSHOT pom @@ -53,7 +53,7 @@ https://github.com/vegardit/vegardit-maven-parent scm:git:https://github.com/vegardit/vegardit-maven-parent.git scm:git:https://github.com/vegardit/vegardit-maven-parent.git - 6.1.5 + HEAD @@ -89,7 +89,7 @@ Use the Maven Build Timestamp as modification timestamp for all entries in the produced JAR file. See https://maven.apache.org/guides/mini/guide-reproducible-builds.html --> - 2024-12-18T21:40:04Z + 2024-12-18T21:40:34Z 17 default @@ -291,8 +291,7 @@ */ def javaVersion = getProjectProp("java.version"); def javaMajorVersion = Integer.parseInt(javaVersion.indexOf(".") > -1 ? javaVersion.substring(0, javaVersion.indexOf(".")) : javaVersion); - def ecjVersion = javaMajorVersion < 17 ? "3.33.0" : project.properties["eclipse-java-compiler.version"]; def ecjArtifactMeta = artifactFactory.createArtifactWithClassifier("org.eclipse.jdt", "ecj", ecjVersion, "jar", null); - def ecjArtifact = artifactResolver.resolve(new org.apache.maven.artifact.resolver.ArtifactResolutionRequest() + def ecjVersion = javaMajorVersion < 17 ? "3.33.0" : project.properties["eclipse-java-compiler.version"]; def ecjArtifactMeta = artifactFactory.createArtifactWithClassifier("org.eclipse.jdt", "ecj", ecjVersion, "jar", null); def ecjArtifact = artifactResolver.resolve(new org.apache.maven.artifact.resolver.ArtifactResolutionRequest() .setArtifact(ecjArtifactMeta) .setLocalRepository(session.localRepository) .setRemoteRepositories(project.remoteArtifactRepositories) diff --git a/src/test/project/pom.xml b/src/test/project/pom.xml index 83c77a7e..3a34faee 100644 --- a/src/test/project/pom.xml +++ b/src/test/project/pom.xml @@ -11,7 +11,7 @@ com.vegardit.maven vegardit-maven-parent - 6.1.5 + 6.1.6-SNAPSHOT ../../../pom.xml