forked from quarkusio/quarkus
-
Notifications
You must be signed in to change notification settings - Fork 0
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 quarkusio#19929 from gsmet/2.2.2-backports-1
2.2.2 backports 1
- Loading branch information
Showing
164 changed files
with
3,766 additions
and
883 deletions.
There are no files selected for viewing
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
41 changes: 41 additions & 0 deletions
41
...ent/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.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,41 @@ | ||
| package io.quarkus.deployment.builditem.nativeimage; | ||
|
|
||
| import io.quarkus.builder.item.MultiBuildItem; | ||
|
|
||
| /** | ||
| * A build item that allows extension to configure the native-image compiler to effectively | ||
| * ignore certain configuration files in specific jars. | ||
| * | ||
| * The {@code jarFile} property specifies the name of the jar file or a regular expression that can be used to | ||
| * match multiple jar files. | ||
| * Matching jar files using regular expressions should be done as a last resort. | ||
| * | ||
| * The {@code resourceName} property specifies the name of the resource file or a regular expression that can be used to | ||
| * match multiple resource files. | ||
| * For the match to work, the resources need to be part of the matched jar file(s) (see {@code jarFile}). | ||
| * Matching resource files using regular expressions should be done as a last resort. | ||
| * | ||
| * See https://github.com/oracle/graal/pull/3179 for more details. | ||
| */ | ||
| public final class ExcludeConfigBuildItem extends MultiBuildItem { | ||
|
|
||
| private final String jarFile; | ||
| private final String resourceName; | ||
|
|
||
| public ExcludeConfigBuildItem(String jarFile, String resourceName) { | ||
| this.jarFile = jarFile; | ||
| this.resourceName = resourceName; | ||
| } | ||
|
|
||
| public ExcludeConfigBuildItem(String jarFile) { | ||
| this(jarFile, "/META-INF/native-image/native-image\\.properties"); | ||
| } | ||
|
|
||
| public String getJarFile() { | ||
| return jarFile; | ||
| } | ||
|
|
||
| public String getResourceName() { | ||
| return resourceName; | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
...ployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathAggregateBuildItem.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,21 @@ | ||
| package io.quarkus.deployment.builditem.nativeimage; | ||
|
|
||
| import io.quarkus.builder.item.SimpleBuildItem; | ||
|
|
||
| /** | ||
| * Do not use directly: use {@see io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathBuildItem} | ||
| * instead. | ||
| */ | ||
| public final class NativeImageAllowIncompleteClasspathAggregateBuildItem extends SimpleBuildItem { | ||
|
|
||
| private final boolean allow; | ||
|
|
||
| public NativeImageAllowIncompleteClasspathAggregateBuildItem(boolean allow) { | ||
| this.allow = allow; | ||
| } | ||
|
|
||
| public boolean isAllow() { | ||
| return allow; | ||
| } | ||
|
|
||
| } |
32 changes: 32 additions & 0 deletions
32
...uarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathBuildItem.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,32 @@ | ||
| package io.quarkus.deployment.builditem.nativeimage; | ||
|
|
||
| import io.quarkus.builder.item.MultiBuildItem; | ||
|
|
||
| /** | ||
| * If any build item of this type is produced, the native-image build tool | ||
| * will run with {@literal --allow-incomplete-classpath} set. | ||
| * <p> | ||
| * This should be strongly discouraged as it makes diagnostics of any issue | ||
| * much more complex, and we have it seen affect error message of code | ||
| * seemingly unrelated to the code which is having the broken classpath. | ||
| * <p> | ||
| * Use of this build item will trigger a warning during build. | ||
| * | ||
| * @Deprecated Please don't use it unless there is general consensus that we can't practically find a better solution. | ||
| */ | ||
| @Deprecated | ||
| public final class NativeImageAllowIncompleteClasspathBuildItem extends MultiBuildItem { | ||
|
|
||
| private final String extensionName; | ||
|
|
||
| /** | ||
| * @param extensionName Name the extension requiring this, so that it can be shamed appropriately during build. | ||
| */ | ||
| public NativeImageAllowIncompleteClasspathBuildItem(String extensionName) { | ||
| this.extensionName = extensionName; | ||
| } | ||
|
|
||
| public String getExtensionName() { | ||
| return extensionName; | ||
| } | ||
| } |
Oops, something went wrong.