Skip to content

Commit 2fa5516

Browse files
committed
Drop long deprecated native config options
1 parent fae46f4 commit 2fa5516

File tree

3 files changed

+0
-121
lines changed

3 files changed

+0
-121
lines changed

core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -64,31 +64,6 @@ public interface NativeConfig {
6464
@WithDefault("false")
6565
boolean enableHttpsUrlHandler();
6666

67-
/**
68-
* If all security services should be added to the native image
69-
*
70-
* @deprecated {@code --enable-all-security-services} was removed in GraalVM 21.1 https://github.com/oracle/graal/pull/3258
71-
*/
72-
@WithDefault("false")
73-
@Deprecated
74-
boolean enableAllSecurityServices();
75-
76-
/**
77-
* If {@code -H:+InlineBeforeAnalysis} flag will be added to the native-image run
78-
*
79-
* @deprecated inlineBeforeAnalysis is always enabled starting from GraalVM 21.3.
80-
*/
81-
@Deprecated
82-
@WithDefault("true")
83-
boolean inlineBeforeAnalysis();
84-
85-
/**
86-
* @deprecated JNI is always enabled starting from GraalVM 19.3.1.
87-
*/
88-
@Deprecated
89-
@WithDefault("true")
90-
boolean enableJni();
91-
9267
/**
9368
* The default value for java.awt.headless JVM option.
9469
* Switching this option affects linking of awt libraries.
@@ -173,16 +148,6 @@ public interface NativeConfig {
173148
@WithDefault("true")
174149
boolean publishDebugBuildProcessPort();
175150

176-
/**
177-
* If the native image server should be restarted.
178-
*
179-
* @deprecated Since GraalVM 20.2.0 the native image server has become an experimental feature and is disabled by
180-
* default.
181-
*/
182-
@Deprecated
183-
@WithDefault("false")
184-
boolean cleanupServer();
185-
186151
/**
187152
* If isolates should be enabled
188153
*/
@@ -196,18 +161,6 @@ public interface NativeConfig {
196161
@WithDefault("false")
197162
boolean enableFallbackImages();
198163

199-
/**
200-
* If the native image server should be used. This can speed up compilation but can result in changes not always
201-
* being picked up due to cache invalidation not working 100%
202-
*
203-
* @deprecated This used to be the default prior to GraalVM 20.2.0 and this configuration item was used to disable
204-
* it as it was not stable. Since GraalVM 20.2.0 the native image server has become an experimental
205-
* feature.
206-
*/
207-
@Deprecated
208-
@WithDefault("false")
209-
boolean enableServer();
210-
211164
/**
212165
* If all META-INF/services entries should be automatically registered
213166
*/
@@ -339,15 +292,6 @@ default String getEffectiveImage() {
339292
*/
340293
Optional<List<MonitoringOption>> monitoring();
341294

342-
/**
343-
* If full stack traces are enabled in the resulting image
344-
*
345-
* @deprecated GraalVM 23.1+ will always build with full stack traces.
346-
*/
347-
@WithDefault("true")
348-
@Deprecated
349-
boolean fullStackTraces();
350-
351295
/**
352296
* If the reports on call paths and included packages/classes/methods should be generated
353297
*/

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,6 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, LocalesBuildTimeCon
246246
checkGraalVMVersion(graalVMVersion);
247247

248248
try {
249-
if (nativeConfig.cleanupServer()) {
250-
log.warn(
251-
"Your application is setting the deprecated 'quarkus.native.cleanup-server' configuration key"
252-
+ " to true. Please consider removing this configuration key as it is ignored"
253-
+ " (The Native image build server is always disabled) and it will be removed in a"
254-
+ " future Quarkus version.");
255-
}
256-
257249
NativeImageInvokerInfo commandAndExecutable = new NativeImageInvokerInfo.Builder()
258250
.setNativeConfig(nativeConfig)
259251
.setLocalesBuildTimeConfig(localesBuildTimeConfig)
@@ -717,7 +709,6 @@ public Builder setNativeMonitoringOptions(List<NativeMonitoringBuildItem> option
717709
public NativeImageInvokerInfo build() {
718710
List<String> nativeImageArgs = new ArrayList<>();
719711
boolean enableSslNative = false;
720-
boolean inlineBeforeAnalysis = nativeConfig.inlineBeforeAnalysis();
721712
boolean addAllCharsets = nativeConfig.addAllCharsets();
722713
boolean enableHttpsUrlHandler = nativeConfig.enableHttpsUrlHandler();
723714
for (NativeImageSystemPropertyBuildItem prop : nativeImageProperties) {
@@ -735,8 +726,6 @@ public NativeImageInvokerInfo build() {
735726
+ " will be removed in a future Quarkus version.");
736727
} else if (prop.getKey().equals("quarkus.native.enable-all-charsets") && prop.getValue() != null) {
737728
addAllCharsets |= Boolean.parseBoolean(prop.getValue());
738-
} else if (prop.getKey().equals("quarkus.native.inline-before-analysis") && prop.getValue() != null) {
739-
inlineBeforeAnalysis = Boolean.parseBoolean(prop.getValue());
740729
} else {
741730
// todo maybe just -D is better than -J-D in this case
742731
if (prop.getValue() == null) {
@@ -922,29 +911,13 @@ public NativeImageInvokerInfo build() {
922911
if (!protocols.isEmpty()) {
923912
nativeImageArgs.add("--enable-url-protocols=" + String.join(",", protocols));
924913
}
925-
if (!inlineBeforeAnalysis) {
926-
addExperimentalVMOption(nativeImageArgs, "-H:-InlineBeforeAnalysis");
927-
}
928914
if (!pie.isEmpty()) {
929915
nativeImageArgs.add("-H:NativeLinkerOption=" + pie);
930916
}
931917

932918
if (!nativeConfig.enableIsolates()) {
933919
addExperimentalVMOption(nativeImageArgs, "-H:-SpawnIsolates");
934920
}
935-
if (!nativeConfig.enableJni()) {
936-
log.warn(
937-
"Your application is setting the deprecated 'quarkus.native.enable-jni' configuration key to false."
938-
+ " Please consider removing this configuration key as it is ignored (JNI is always enabled) and it"
939-
+ " will be removed in a future Quarkus version.");
940-
}
941-
if (nativeConfig.enableServer()) {
942-
log.warn(
943-
"Your application is setting the deprecated 'quarkus.native.enable-server' configuration key to true."
944-
+ " Please consider removing this configuration key as it is ignored"
945-
+ " (The Native image build server is always disabled) and it"
946-
+ " will be removed in a future Quarkus version.");
947-
}
948921
if (nativeConfig.enableVmInspection()) {
949922
addExperimentalVMOption(nativeImageArgs, "-H:+AllowVMInspection");
950923
}
@@ -1000,14 +973,6 @@ public NativeImageInvokerInfo build() {
1000973
} else {
1001974
addExperimentalVMOption(nativeImageArgs, "-H:-UseServiceLoaderFeature");
1002975
}
1003-
// This option has no effect on GraalVM 23.1+
1004-
if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_1_0) < 0) {
1005-
if (nativeConfig.fullStackTraces()) {
1006-
nativeImageArgs.add("-H:+StackTrace");
1007-
} else {
1008-
nativeImageArgs.add("-H:-StackTrace");
1009-
}
1010-
}
1011976

1012977
if (nativeConfig.enableDashboardDump()) {
1013978
addExperimentalVMOption(nativeImageArgs,

core/deployment/src/test/java/io/quarkus/deployment/pkg/TestNativeConfig.java

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,6 @@ public boolean enableHttpsUrlHandler() {
5050
return false;
5151
}
5252

53-
@Override
54-
public boolean enableAllSecurityServices() {
55-
return false;
56-
}
57-
58-
@Override
59-
public boolean inlineBeforeAnalysis() {
60-
return false;
61-
}
62-
63-
@Override
64-
public boolean enableJni() {
65-
return false;
66-
}
67-
6853
@Override
6954
public boolean headless() {
7055
return false;
@@ -115,11 +100,6 @@ public boolean publishDebugBuildProcessPort() {
115100
return false;
116101
}
117102

118-
@Override
119-
public boolean cleanupServer() {
120-
return false;
121-
}
122-
123103
@Override
124104
public boolean enableIsolates() {
125105
return false;
@@ -130,11 +110,6 @@ public boolean enableFallbackImages() {
130110
return false;
131111
}
132112

133-
@Override
134-
public boolean enableServer() {
135-
return false;
136-
}
137-
138113
@Override
139114
public boolean autoServiceLoaderRegistration() {
140115
return false;
@@ -190,11 +165,6 @@ public Optional<List<MonitoringOption>> monitoring() {
190165
return Optional.empty();
191166
}
192167

193-
@Override
194-
public boolean fullStackTraces() {
195-
return false;
196-
}
197-
198168
@Override
199169
public boolean enableReports() {
200170
return false;

0 commit comments

Comments
 (0)