Skip to content

Commit 68c2af1

Browse files
authored
Merge pull request quarkusio#34296 from turing85/feature/quiet-docker-command-for-determining-java-version
Initialize build runner in AwtProcessor before usage
2 parents e6ea6d5 + d7eda21 commit 68c2af1

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

extensions/awt/deployment/src/main/java/io/quarkus/awt/deployment/AwtProcessor.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import java.util.ArrayList;
66
import java.util.List;
7+
import java.util.Optional;
78
import java.util.stream.Stream;
89

910
import io.quarkus.awt.runtime.graal.DarwinAwtFeature;
@@ -21,6 +22,8 @@
2122
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedPackageBuildItem;
2223
import io.quarkus.deployment.builditem.nativeimage.UnsupportedOSBuildItem;
2324
import io.quarkus.deployment.pkg.builditem.NativeImageRunnerBuildItem;
25+
import io.quarkus.deployment.pkg.builditem.ProcessInheritIODisabled;
26+
import io.quarkus.deployment.pkg.builditem.ProcessInheritIODisabledBuildItem;
2427
import io.quarkus.deployment.pkg.steps.GraalVM;
2528
import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
2629

@@ -95,7 +98,11 @@ ReflectiveClassBuildItem setupReflectionClassesWithMethods() {
9598
void setupAWTInit(BuildProducer<JniRuntimeAccessBuildItem> jc,
9699
BuildProducer<JniRuntimeAccessMethodBuildItem> jm,
97100
BuildProducer<JniRuntimeAccessFieldBuildItem> jf,
98-
NativeImageRunnerBuildItem nativeImageRunnerBuildItem) {
101+
NativeImageRunnerBuildItem nativeImageRunnerBuildItem,
102+
Optional<ProcessInheritIODisabled> processInheritIODisabled,
103+
Optional<ProcessInheritIODisabledBuildItem> processInheritIODisabledBuildItem) {
104+
nativeImageRunnerBuildItem.getBuildRunner()
105+
.setup(processInheritIODisabled.isPresent() || processInheritIODisabledBuildItem.isPresent());
99106
final GraalVM.Version v = nativeImageRunnerBuildItem.getBuildRunner().getGraalVMVersion();
100107
// Dynamically loading shared objects instead
101108
// of baking in static libs: https://github.com/oracle/graal/issues/4921
@@ -118,7 +125,11 @@ void setupAWTInit(BuildProducer<JniRuntimeAccessBuildItem> jc,
118125
}
119126

120127
@BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
121-
JniRuntimeAccessBuildItem setupJava2DClasses(NativeImageRunnerBuildItem nativeImageRunnerBuildItem) {
128+
JniRuntimeAccessBuildItem setupJava2DClasses(NativeImageRunnerBuildItem nativeImageRunnerBuildItem,
129+
Optional<ProcessInheritIODisabled> processInheritIODisabled,
130+
Optional<ProcessInheritIODisabledBuildItem> processInheritIODisabledBuildItem) {
131+
nativeImageRunnerBuildItem.getBuildRunner()
132+
.setup(processInheritIODisabled.isPresent() || processInheritIODisabledBuildItem.isPresent());
122133
final GraalVM.Version v = nativeImageRunnerBuildItem.getBuildRunner().getGraalVMVersion();
123134
final List<String> classes = new ArrayList<>();
124135
classes.add("com.sun.imageio.plugins.jpeg.JPEGImageReader");

0 commit comments

Comments
 (0)