-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10415 from gastaldi/ignore_entries
GeneratedResourceBuildItem may also be filtered and ignoredEntries from plugins is now used
- Loading branch information
Showing
11 changed files
with
366 additions
and
74 deletions.
There are no files selected for viewing
107 changes: 52 additions & 55 deletions
107
core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
integration-tests/maven/src/test/java/io/quarkus/maven/it/IgnoreEntriesIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package io.quarkus.maven.it; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.Enumeration; | ||
| import java.util.List; | ||
| import java.util.jar.JarEntry; | ||
| import java.util.jar.JarFile; | ||
|
|
||
| import org.apache.maven.shared.invoker.MavenInvocationException; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import io.quarkus.maven.it.verifier.MavenProcessInvocationResult; | ||
| import io.quarkus.maven.it.verifier.RunningInvoker; | ||
|
|
||
| @DisableForNative | ||
| public class IgnoreEntriesIT extends MojoTestBase { | ||
|
|
||
| @Test | ||
| public void testIgnoreEntries() | ||
| throws MavenInvocationException, IOException, InterruptedException { | ||
| File testDir = initProject("projects/ignore-entries-uber-jar"); | ||
|
|
||
| RunningInvoker running = new RunningInvoker(testDir, false); | ||
| MavenProcessInvocationResult result = running.execute(Arrays.asList("compile", "quarkus:build"), | ||
| Collections.emptyMap()); | ||
| assertThat(result.getProcess().waitFor()).isEqualTo(0); | ||
|
|
||
| final File targetDir = new File(testDir, "target"); | ||
| List<File> jars = getFilesEndingWith(targetDir, ".jar"); | ||
| assertThat(jars).hasSize(1); | ||
| assertThat(jars.get(0)).isFile(); | ||
| assertThat(jarContains(jars.get(0), "META-INF/swagger-ui-files/swagger-ui-bundle.js.map")).isFalse(); | ||
| } | ||
|
|
||
| private boolean jarContains(File jar, String name) throws IOException { | ||
| try (JarFile z = new JarFile(jar)) { | ||
| for (Enumeration<JarEntry> en = z.entries(); en.hasMoreElements();) { | ||
| String fileName = en.nextElement().getName(); | ||
| if (name.equalsIgnoreCase(fileName)) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
integration-tests/maven/src/test/resources/projects/ignore-entries-uber-jar/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <?xml version="1.0"?> | ||
| <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" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.acme</groupId> | ||
| <artifactId>acme</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <properties> | ||
| <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> | ||
| <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id> | ||
| <quarkus.platform.version>@project.version@</quarkus.platform.version> | ||
| <quarkus-plugin.version>@project.version@</quarkus-plugin.version> | ||
| <maven.compiler.source>1.8</maven.compiler.source> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <maven.compiler.target>1.8</maven.compiler.target> | ||
| </properties> | ||
| <dependencyManagement> | ||
| <dependencies> | ||
| <!-- insert managed dependencies here --> | ||
| <dependency> | ||
| <groupId>${quarkus.platform.group-id}</groupId> | ||
| <artifactId>${quarkus.platform.artifact-id}</artifactId> | ||
| <version>${quarkus.platform.version}</version> | ||
| <type>pom</type> | ||
| <scope>import</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </dependencyManagement> | ||
| <dependencies> | ||
| <!-- insert test dependencies here --> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-resteasy</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-swagger-ui</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-maven-plugin</artifactId> | ||
| <version>${quarkus-plugin.version}</version> | ||
| <configuration> | ||
| <uberJar>true</uberJar> | ||
| <ignoredEntries> | ||
| <ignoredEntry>META-INF/swagger-ui-files/swagger-ui-bundle.js.map</ignoredEntry> | ||
| <ignoredEntry>META-INF/swagger-ui-files/swagger-ui-standalone-preset.js.map</ignoredEntry> | ||
| </ignoredEntries> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>build</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
17 changes: 17 additions & 0 deletions
17
...test/resources/projects/ignore-entries-uber-jar/src/main/java/org/acme/HelloResource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package org.acme; | ||
|
|
||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.Produces; | ||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| @Path("/hello") | ||
| public class HelloResource { | ||
|
|
||
| @GET | ||
| @Produces(MediaType.TEXT_PLAIN) | ||
| public String hello() { | ||
| return "hello"; | ||
| } | ||
|
|
||
| } |
156 changes: 156 additions & 0 deletions
156
...sources/projects/ignore-entries-uber-jar/src/main/resources/META-INF/resources/index.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <title>acme - 1.0-SNAPSHOT</title> | ||
| <style> | ||
| h1, h2, h3, h4, h5, h6 { | ||
| margin-bottom: 0.5rem; | ||
| font-weight: 400; | ||
| line-height: 1.5; | ||
| } | ||
|
|
||
| h1 { | ||
| font-size: 2.5rem; | ||
| } | ||
|
|
||
| h2 { | ||
| font-size: 2rem | ||
| } | ||
|
|
||
| h3 { | ||
| font-size: 1.75rem | ||
| } | ||
|
|
||
| h4 { | ||
| font-size: 1.5rem | ||
| } | ||
|
|
||
| h5 { | ||
| font-size: 1.25rem | ||
| } | ||
|
|
||
| h6 { | ||
| font-size: 1rem | ||
| } | ||
|
|
||
| .lead { | ||
| font-weight: 300; | ||
| font-size: 2rem; | ||
| } | ||
|
|
||
| .banner { | ||
| font-size: 2.7rem; | ||
| margin: 0; | ||
| padding: 2rem 1rem; | ||
| background-color: #00A1E2; | ||
| color: white; | ||
| } | ||
|
|
||
| body { | ||
| margin: 0; | ||
| 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"; | ||
| } | ||
|
|
||
| code { | ||
| font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; | ||
| font-size: 87.5%; | ||
| color: #e83e8c; | ||
| word-break: break-word; | ||
| } | ||
|
|
||
| .left-column { | ||
| padding: .75rem; | ||
| max-width: 75%; | ||
| min-width: 55%; | ||
| } | ||
|
|
||
| .right-column { | ||
| padding: .75rem; | ||
| max-width: 25%; | ||
| } | ||
|
|
||
| .container { | ||
| display: flex; | ||
| width: 100%; | ||
| } | ||
|
|
||
| li { | ||
| margin: 0.75rem; | ||
| } | ||
|
|
||
| .right-section { | ||
| margin-left: 1rem; | ||
| padding-left: 0.5rem; | ||
| } | ||
|
|
||
| .right-section h3 { | ||
| padding-top: 0; | ||
| font-weight: 200; | ||
| } | ||
|
|
||
| .right-section ul { | ||
| border-left: 0.3rem solid #00A1E2; | ||
| list-style-type: none; | ||
| padding-left: 0; | ||
| } | ||
|
|
||
| </style> | ||
| </head> | ||
| <body> | ||
|
|
||
| <div class="banner lead"> | ||
| Your new Cloud-Native application is ready! | ||
| </div> | ||
|
|
||
| <div class="container"> | ||
| <div class="left-column"> | ||
| <p class="lead"> Congratulations, you have created a new Quarkus application.</p> | ||
|
|
||
| <h2>Why do you see this?</h2> | ||
|
|
||
| <p>This page is served by Quarkus. The source is in | ||
| <code>src/main/resources/META-INF/resources/index.html</code>.</p> | ||
|
|
||
| <h2>What can I do from here?</h2> | ||
|
|
||
| <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>. | ||
| </p> | ||
| <ul> | ||
| <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li> | ||
| <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li> | ||
| <li>Configure your application in <code>src/main/resources/application.properties</code>. | ||
| </li> | ||
| </ul> | ||
|
|
||
| <h2>Do you like Quarkus?</h2> | ||
| <p>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</p> | ||
|
|
||
| <h2>How do I get rid of this page?</h2> | ||
| <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p> | ||
| </div> | ||
| <div class="right-column"> | ||
| <div class="right-section"> | ||
| <h3>Application</h3> | ||
| <ul> | ||
| <li>GroupId: org.acme</li> | ||
| <li>ArtifactId: acme</li> | ||
| <li>Version: 1.0-SNAPSHOT</li> | ||
| <li>Quarkus Version: 999-SNAPSHOT</li> | ||
| </ul> | ||
| </div> | ||
| <div class="right-section"> | ||
| <h3>Next steps</h3> | ||
| <ul> | ||
| <!-- the url have been erased on purpose --> | ||
| <li><a href="#">Setup your IDE</a></li> | ||
| <li><a href="#">Getting started</a></li> | ||
| <li><a href="#">Documentation</a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
| </body> | ||
| </html> |
2 changes: 2 additions & 0 deletions
2
...test/resources/projects/ignore-entries-uber-jar/src/main/resources/application.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Configuration file | ||
| quarkus.swagger-ui.always-include=true |
Oops, something went wrong.