Skip to content

Commit f043971

Browse files
aloubyanskygsmet
aloubyansky
authored and
gsmet
committed
Devmode: filter out modules that aren't application's compile or runtime dependencies
1 parent 8219a43 commit f043971

File tree

11 files changed

+382
-6
lines changed

11 files changed

+382
-6
lines changed

‎devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -831,12 +831,16 @@ private List<LocalProject> filterExtensionDependencies(LocalProject localProject
831831

832832
for (LocalProject project : localProject.getSelfWithLocalDeps()) {
833833
inProject.add(project.getKey());
834-
if (project.getClassesDir() != null &&
835-
//if this project also contains Quarkus extensions we do no want to include these in the discovery
836-
//a bit of an edge case, but if you try and include a sample project with your extension you will
837-
//run into problems without this
838-
(Files.exists(project.getClassesDir().resolve("META-INF/quarkus-extension.properties")) ||
839-
Files.exists(project.getClassesDir().resolve("META-INF/quarkus-build-steps.list")))) {
834+
final Artifact projectDep = this.project.getArtifactMap().get(project.getGroupId() + ':' + project.getArtifactId());
835+
if (project.getClassesDir() != null
836+
&& (
837+
// if it is not found among project.getArtifacts() it shouldn't be included (e.g. a local test dependency)
838+
(localProject != project && projectDep == null)
839+
//if this project also contains Quarkus extensions we do no want to include these in the discovery
840+
//a bit of an edge case, but if you try and include a sample project with your extension you will
841+
//run into problems without this
842+
|| (Files.exists(project.getClassesDir().resolve("META-INF/quarkus-extension.properties")) ||
843+
Files.exists(project.getClassesDir().resolve("META-INF/quarkus-build-steps.list"))))) {
840844
toRemove.add(project);
841845
extensionsAndDeps.add(project.getKey());
842846
} else {

‎integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static io.quarkus.maven.it.ApplicationNameAndVersionTestUtil.assertApplicationPropertiesSetCorrectly;
44
import static org.assertj.core.api.Assertions.assertThat;
55
import static org.awaitility.Awaitility.await;
6+
import static org.junit.Assert.assertEquals;
67

78
import java.io.File;
89
import java.io.IOException;
@@ -254,6 +255,16 @@ public void testMultiModuleProjectWithRevisionVersion() throws MavenInvocationEx
254255
.until(source::isFile);
255256
}
256257

258+
@Test
259+
public void testTestScopedLocalProjectDependency() throws MavenInvocationException, IOException {
260+
testDir = initProject("projects/test-module-dependency");
261+
final String projectVersion = System.getProperty("project.version");
262+
run(true, "-Dquarkus.platform.version=" + projectVersion,
263+
"-Dquarkus-plugin.version=" + projectVersion);
264+
265+
assertEquals("class not found", DevModeTestUtils.getHttpResponse("/hello"));
266+
}
267+
257268
@Test
258269
public void testThatTheApplicationIsReloadedOnNewResource() throws MavenInvocationException, IOException {
259270
testDir = initProject("projects/classic", "projects/project-classic-run-new-resource");

‎integration-tests/maven/src/test/resources/projects/test-module-dependency/app/pom.xml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.acme</groupId>
7+
<artifactId>quarkus-app-parent</artifactId>
8+
<version>1.0-SNAPSHOT</version>
9+
</parent>
10+
<artifactId>quarkus-app</artifactId>
11+
<dependencies>
12+
<dependency>
13+
<groupId>org.acme</groupId>
14+
<artifactId>quarkus-app-test</artifactId>
15+
<scope>test</scope>
16+
</dependency>
17+
<dependency>
18+
<groupId>io.quarkus</groupId>
19+
<artifactId>quarkus-resteasy</artifactId>
20+
</dependency>
21+
<dependency>
22+
<groupId>io.quarkus</groupId>
23+
<artifactId>quarkus-junit5</artifactId>
24+
<scope>test</scope>
25+
</dependency>
26+
<dependency>
27+
<groupId>io.rest-assured</groupId>
28+
<artifactId>rest-assured</artifactId>
29+
<scope>test</scope>
30+
</dependency>
31+
</dependencies>
32+
<build>
33+
<plugins>
34+
<plugin>
35+
<groupId>io.quarkus</groupId>
36+
<artifactId>quarkus-maven-plugin</artifactId>
37+
<executions>
38+
<execution>
39+
<goals>
40+
<goal>build</goal>
41+
</goals>
42+
</execution>
43+
</executions>
44+
</plugin>
45+
</plugins>
46+
</build>
47+
<profiles>
48+
<profile>
49+
<id>native</id>
50+
<activation>
51+
<property>
52+
<name>native</name>
53+
</property>
54+
</activation>
55+
<build>
56+
<plugins>
57+
<plugin>
58+
<artifactId>maven-failsafe-plugin</artifactId>
59+
<version>${surefire-plugin.version}</version>
60+
<executions>
61+
<execution>
62+
<goals>
63+
<goal>integration-test</goal>
64+
<goal>verify</goal>
65+
</goals>
66+
<configuration>
67+
<systemProperties>
68+
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
69+
</systemProperties>
70+
</configuration>
71+
</execution>
72+
</executions>
73+
</plugin>
74+
</plugins>
75+
</build>
76+
<properties>
77+
<quarkus.package.type>native</quarkus.package.type>
78+
</properties>
79+
</profile>
80+
</profiles>
81+
</project>

‎integration-tests/maven/src/test/resources/projects/test-module-dependency/app/src/main/java/org/acme/quarkus/HelloResource.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package org.acme.quarkus;
2+
3+
import javax.ws.rs.GET;
4+
import javax.ws.rs.Path;
5+
import javax.ws.rs.Produces;
6+
import javax.ws.rs.core.MediaType;
7+
8+
@Path("/hello")
9+
public class HelloResource {
10+
11+
@GET
12+
@Produces(MediaType.TEXT_PLAIN)
13+
public String hello() throws ClassNotFoundException {
14+
String result = "class not found";
15+
try {
16+
Class.forName("org.acme.quarkus.test.SomeTestSupport");
17+
result = "class found";
18+
} catch (ClassNotFoundException e) {
19+
// ignored
20+
}
21+
return result;
22+
}
23+
}

‎integration-tests/maven/src/test/resources/projects/test-module-dependency/app/src/main/resources/META-INF/resources/index.html‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>quarkus-app - 1.0-SNAPSHOT</title>
6+
<style>
7+
h1, h2, h3, h4, h5, h6 {
8+
margin-bottom: 0.5rem;
9+
font-weight: 400;
10+
line-height: 1.5;
11+
}
12+
13+
h1 {
14+
font-size: 2.5rem;
15+
}
16+
17+
h2 {
18+
font-size: 2rem
19+
}
20+
21+
h3 {
22+
font-size: 1.75rem
23+
}
24+
25+
h4 {
26+
font-size: 1.5rem
27+
}
28+
29+
h5 {
30+
font-size: 1.25rem
31+
}
32+
33+
h6 {
34+
font-size: 1rem
35+
}
36+
37+
.lead {
38+
font-weight: 300;
39+
font-size: 2rem;
40+
}
41+
42+
.banner {
43+
font-size: 2.7rem;
44+
margin: 0;
45+
padding: 2rem 1rem;
46+
background-color: #00A1E2;
47+
color: white;
48+
}
49+
50+
body {
51+
margin: 0;
52+
font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
53+
}
54+
55+
code {
56+
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
57+
font-size: 87.5%;
58+
color: #e83e8c;
59+
word-break: break-word;
60+
}
61+
62+
.left-column {
63+
padding: .75rem;
64+
max-width: 75%;
65+
min-width: 55%;
66+
}
67+
68+
.right-column {
69+
padding: .75rem;
70+
max-width: 25%;
71+
}
72+
73+
.container {
74+
display: flex;
75+
width: 100%;
76+
}
77+
78+
li {
79+
margin: 0.75rem;
80+
}
81+
82+
.right-section {
83+
margin-left: 1rem;
84+
padding-left: 0.5rem;
85+
}
86+
87+
.right-section h3 {
88+
padding-top: 0;
89+
font-weight: 200;
90+
}
91+
92+
.right-section ul {
93+
border-left: 0.3rem solid #00A1E2;
94+
list-style-type: none;
95+
padding-left: 0;
96+
}
97+
98+
</style>
99+
</head>
100+
<body>
101+
102+
<div class="banner lead">
103+
Your new Cloud-Native application is ready!
104+
</div>
105+
106+
<div class="container">
107+
<div class="left-column">
108+
<p class="lead"> Congratulations, you have created a new Quarkus application.</p>
109+
110+
<h2>Why do you see this?</h2>
111+
112+
<p>This page is served by Quarkus. The source is in
113+
<code>src/main/resources/META-INF/resources/index.html</code>.</p>
114+
115+
<h2>What can I do from here?</h2>
116+
117+
<p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
118+
</p>
119+
<ul>
120+
<li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
121+
<li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
122+
<li>Configure your application in <code>src/main/resources/application.properties</code>.
123+
</li>
124+
</ul>
125+
126+
<h2>How do I get rid of this page?</h2>
127+
<p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
128+
</div>
129+
<div class="right-column">
130+
<div class="right-section">
131+
<h3>Application</h3>
132+
<ul>
133+
<li>GroupId: org.acme</li>
134+
<li>ArtifactId: quarkus-app</li>
135+
<li>Version: 1.0-SNAPSHOT</li>
136+
<li>Quarkus Version: @project.version@</li>
137+
</ul>
138+
</div>
139+
<div class="right-section">
140+
<h3>Next steps</h3>
141+
<ul>
142+
<li><a href="https://quarkus.io/guides/maven-tooling.html" target="_blank">Setup your IDE</a></li>
143+
<li><a href="https://quarkus.io/guides/getting-started.html" target="_blank">Getting started</a></li>
144+
<li><a href="https://quarkus.io" target="_blank">Quarkus Web Site</a></li>
145+
</ul>
146+
</div>
147+
</div>
148+
</div>
149+
150+
151+
</body>
152+
</html>

‎integration-tests/maven/src/test/resources/projects/test-module-dependency/app/src/main/resources/application.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Configuration file
2+
# key = value

‎integration-tests/maven/src/test/resources/projects/test-module-dependency/app/src/test/java/com/github/famod/modmono_quarkus/dist/HelloResourceTest.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.github.famod.modmono_quarkus.dist;
2+
3+
import io.quarkus.test.junit.QuarkusTest;
4+
import org.junit.jupiter.api.Test;
5+
6+
import static io.restassured.RestAssured.given;
7+
import static org.hamcrest.CoreMatchers.is;
8+
9+
@QuarkusTest
10+
public class HelloResourceTest {
11+
12+
@Test
13+
public void testHelloEndpoint() {
14+
given()
15+
.when().get("/hello")
16+
.then()
17+
.statusCode(200)
18+
.body(is("class not found"));
19+
}
20+
21+
}

‎integration-tests/maven/src/test/resources/projects/test-module-dependency/app/src/test/java/com/github/famod/modmono_quarkus/dist/NativeHelloResourceIT.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.github.famod.modmono_quarkus.dist;
2+
3+
import io.quarkus.test.junit.NativeImageTest;
4+
5+
@NativeImageTest
6+
public class NativeHelloResourceIT extends HelloResourceTest {
7+
8+
// Execute the same tests but in native mode.
9+
}

0 commit comments

Comments
 (0)