Merge pull request #32342 from aloubyansky/avoid-deprecated-maven-api

quarkusio · Apr 2, 2023 · 4fca0d7 · 4fca0d7
2 parents 95e97b0 + 42ac5ba
commit 4fca0d7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
@@ -789,10 +789,17 @@ private void addProject(MavenDevModeLauncher.Builder builder, ResolvedDependency
         Set<Path> testResourcePaths;
         List<Profile> activeProfiles = Collections.emptyList();
 
-        final MavenProject mavenProject = module.getClassifier().isEmpty()
-                ? session.getProjectMap()
-                        .get(String.format("%s:%s:%s", module.getGroupId(), module.getArtifactId(), module.getVersion()))
-                : null;
+        MavenProject mavenProject = null;
+        if (module.getClassifier().isEmpty()) {
+            for (MavenProject p : session.getAllProjects()) {
+                if (module.getArtifactId().equals(p.getArtifactId())
+                        && module.getGroupId().equals(p.getGroupId())
+                        && module.getVersion().equals(p.getVersion())) {
+                    mavenProject = p;
+                    break;
+                }
+            }
+        }
         final ArtifactSources sources = module.getSources();
         if (mavenProject == null) {
             if (sources == null) {

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/UpdateMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/UpdateMojo.java
@@ -77,7 +77,7 @@ public class UpdateMojo extends QuarkusProjectStateMojoBase {
     @Parameter(property = "stream", required = false)
     private String stream;
 
-    @Component
+    @Parameter(defaultValue = "${session}", readonly = true)
     private MavenSession mavenSession;
 
     @Component