jlengrand/quarkus
1
0
Fork 0
mirror of https://github.com/jlengrand/quarkus.git synced 2026-03-10 08:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1379 from cescoffier/features/detect-maven-version

Browse Source 
Detect Maven version in the dev mojo
This commit is contained in:
Guillaume Smet
2019-03-13 12:27:43 +01:00
committed by GitHub
parent cede2f1f79 7965b19672
commit 1dc489fdc3
5 changed files with 117 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build-parent/pom.xml
View File

@@ -44,6 +44,11 @@
<!-- Enable APT by default for Eclipse -->
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
<!--
Supported Maven versions, interpreted as a version range
-->
<supported-maven-versions>[3.5.3,)</supported-maven-versions>
</properties>
<dependencyManagement>
@@ -631,7 +636,7 @@
<rules>
<dependencyConvergence/>
<requireMavenVersion>
<version>3.5.3</version>
<version>${supported-maven-versions}</version>
</requireMavenVersion>
<bannedDependencies>
<excludes>

2
devtools/common/src/main/filtered/quarkus.properties
View File

@@ -27,3 +27,5 @@ kotlin-version=${kotlin.version}
plugin-groupId=${project.groupId}
plugin-artifactId=quarkus-maven-plugin
plugin-version=${project.version}
supported-maven-versions=${supported-maven-versions}

8
devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java
View File

@@ -39,6 +39,7 @@ import org.fusesource.jansi.Ansi;
import io.quarkus.SourceType;
import io.quarkus.cli.commands.AddExtensions;
import io.quarkus.cli.commands.CreateProject;
import io.quarkus.maven.components.MavenVersionEnforcer;
import io.quarkus.maven.components.Prompter;
import io.quarkus.maven.utilities.MojoUtils;
@@ -79,8 +80,15 @@ public class CreateProjectMojo extends AbstractMojo {
@Component
private Prompter prompter;
@Component
private MavenVersionEnforcer mavenVersionEnforcer;
@Override
public void execute() throws MojoExecutionException {
// We detect the Maven version during the project generation to indicate the user immediately that the installed
// version may not be supported.
mavenVersionEnforcer.ensureMavenVersion(getLog(), session);
File projectRoot = new File(".");
File pom = new File(projectRoot, "pom.xml");

26
devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
View File

@@ -19,15 +19,10 @@ package io.quarkus.maven;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.Socket;
import java.net.URI;
import java.net.URL;
import java.net.*;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.jar.Attributes;
@@ -36,19 +31,20 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.*;
import org.apache.maven.project.MavenProject;
import io.quarkus.dev.ClassLoaderCompiler;
import io.quarkus.dev.DevModeMain;
import io.quarkus.maven.components.MavenVersionEnforcer;
import io.quarkus.maven.utilities.MojoUtils;
/**
@@ -107,6 +103,12 @@ public class DevMojo extends AbstractMojo {
@Parameter(defaultValue = "${jvm.args}")
private String jvmArgs;
@Parameter(defaultValue = "${session}")
private MavenSession session;
@Component
private MavenVersionEnforcer mavenVersionEnforcer;
/**
* This value is intended to be set to true when some generated bytecode
* is erroneous causing the JVM to crash when the verify:none option is set (which is on by default)
@@ -115,8 +117,8 @@ public class DevMojo extends AbstractMojo {
private boolean preventnoverify = false;
@Override
public void execute() throws MojoFailureException {
public void execute() throws MojoFailureException, MojoExecutionException {
mavenVersionEnforcer.ensureMavenVersion(getLog(), session);
boolean found = false;
for (Plugin i : project.getBuildPlugins()) {
if (i.getGroupId().equals(MojoUtils.getPluginGroupId())

87
devtools/maven/src/main/java/io/quarkus/maven/components/MavenVersionEnforcer.java Normal file
View File

@@ -0,0 +1,87 @@
package io.quarkus.maven.components;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.versioning.*;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.component.annotations.Component;
import io.quarkus.maven.utilities.MojoUtils;
@Component(role = MavenVersionEnforcer.class, instantiationStrategy = "per-lookup")
public class MavenVersionEnforcer {
public void ensureMavenVersion(Log log, MavenSession session) throws MojoExecutionException {
String supported = MojoUtils.get("supported-maven-versions");
String mavenVersion = session.getSystemProperties().getProperty("maven.version");
log.debug("Detected Maven Version: " + mavenVersion);
DefaultArtifactVersion detectedVersion = new DefaultArtifactVersion(mavenVersion);
enforce(log, supported, detectedVersion);
}
/**
* Compares the specified Maven version to see if it is allowed by the defined version range.
*
* @param log the log
* @param requiredMavenVersionRange range of allowed versions for Maven.
* @param actualMavenVersion the version to be checked.
* @throws MojoExecutionException the given version fails the enforcement rule
*/
private void enforce(Log log,
String requiredMavenVersionRange, ArtifactVersion actualMavenVersion)
throws MojoExecutionException {
if (StringUtils.isBlank(requiredMavenVersionRange)) {
throw new MojoExecutionException("Maven version can't be empty.");
} else {
VersionRange vr;
String msg = "Detected Maven Version (" + actualMavenVersion + ") ";
if (actualMavenVersion.toString().equals(requiredMavenVersionRange)) {
log.debug(msg + " is allowed in " + requiredMavenVersionRange + ".");
} else {
try {
vr = VersionRange.createFromVersionSpec(requiredMavenVersionRange);
if (containsVersion(vr, actualMavenVersion)) {
log.debug(msg + " is allowed in " + requiredMavenVersionRange + ".");
} else {
String message = msg + " is not supported, it must be in " + vr + ".";
throw new MojoExecutionException(message);
}
} catch (InvalidVersionSpecificationException e) {
throw new MojoExecutionException("The requested Maven version "
+ requiredMavenVersionRange + " is invalid.", e);
}
}
}
}
/**
* Copied from Artifact.VersionRange. This is tweaked to handle singular ranges properly. Currently the default
* containsVersion method assumes a singular version means allow everything.
*
* @param allowedRange range of allowed versions.
* @param theVersion the version to be checked.
* @return {@code true} if the version is contained by the range.
*/
private static boolean containsVersion(VersionRange allowedRange, ArtifactVersion theVersion) {
boolean matched = false;
ArtifactVersion recommendedVersion = allowedRange.getRecommendedVersion();
if (recommendedVersion == null) {
List<Restriction> restrictions = allowedRange.getRestrictions();
for (Restriction restriction : restrictions) {
if (restriction.containsVersion(theVersion)) {
matched = true;
break;
}
}
} else {
// only singular versions ever have a recommendedVersion
int compareTo = recommendedVersion.compareTo(theVersion);
matched = (compareTo <= 0);
}
return matched;
}
}