Merge pull request #712 from gsmet/quarkus-2.14.2

Upgrade to Quarkus 2.14.2.Final
quarkusio · Nov 25, 2022 · 7832c22 · 7832c22
2 parents 082be15 + 714c4f0
commit 7832c22
Show file tree

Hide file tree

Showing 7 changed files with 1,249 additions and 1,249 deletions.
diff --git a/...rated-platform-project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/BuildMojo.java b/...rated-platform-project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/BuildMojo.java
@@ -29,6 +29,7 @@
 import io.quarkus.bootstrap.app.AugmentResult;
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.util.IoUtils;
+import io.quarkus.maven.dependency.ArtifactCoords;
 
 /**
  * Builds the Quarkus application.
@@ -77,11 +78,11 @@ protected boolean beforeExecute() throws MojoExecutionException {
             getLog().info("Skipping Quarkus build");
             return false;
         }
-        if (mavenProject().getPackaging().equals("pom")) {
+        if (mavenProject().getPackaging().equals(ArtifactCoords.TYPE_POM)) {
             getLog().info("Type of the artifact is POM, skipping build goal");
             return false;
         }
-        if (!mavenProject().getArtifact().getArtifactHandler().getExtension().equals("jar")) {
+        if (!mavenProject().getArtifact().getArtifactHandler().getExtension().equals(ArtifactCoords.TYPE_JAR)) {
             throw new MojoExecutionException(
                     "The project artifact's extension is '" + mavenProject().getArtifact().getArtifactHandler().getExtension()
                             + "' while this goal expects it be 'jar'");

diff --git a/generated-platform-project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/DevMojo.java b/generated-platform-project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/DevMojo.java
@@ -391,6 +391,11 @@ public void setLog(Log log) {
     @Override
     public void execute() throws MojoFailureException, MojoExecutionException {
 
+        if (project.getPackaging().equals(ArtifactCoords.TYPE_POM)) {
+            getLog().info("Type of the artifact is POM, skipping dev goal");
+            return;
+        }
+
         mavenVersionEnforcer.ensureMavenVersion(getLog(), session);
 
         initToolchain();
@@ -1268,7 +1273,7 @@ private void addQuarkusDevModeDeps(MavenDevModeLauncher.Builder builder, Applica
             final List<Exclusion> exclusions;
             if (!d.getExclusions().isEmpty()) {
                 exclusions = new ArrayList<>(d.getExclusions().size());
-                d.getExclusions().forEach(e -> exclusions.add(new Exclusion(e.getGroupId(), e.getArtifactId(), null, null)));
+                d.getExclusions().forEach(e -> exclusions.add(new Exclusion(e.getGroupId(), e.getArtifactId(), "*", "*")));
             } else {
                 exclusions = List.of();
             }