Skip to content

Commit 1faa7ba

Browse files
gsmetgsmet
authored
Merge pull request #50860 from gsmet/3.29.1-backports-1
[3.29] 3.29.1 backports 1
2 parents 74f5533 + 30d6a6e commit 1faa7ba

File tree

172 files changed

+4219
-750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+4219
-750
lines changed

‎bom/application/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<smallrye-context-propagation.version>2.2.1</smallrye-context-propagation.version>
5858
<smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
5959
<smallrye-reactive-types-converter.version>3.0.3</smallrye-reactive-types-converter.version>
60-
<smallrye-mutiny-vertx-binding.version>3.20.0</smallrye-mutiny-vertx-binding.version>
60+
<smallrye-mutiny-vertx-binding.version>3.20.1</smallrye-mutiny-vertx-binding.version>
6161
<smallrye-reactive-messaging.version>4.29.0</smallrye-reactive-messaging.version>
6262
<smallrye-stork.version>2.7.3</smallrye-stork.version>
6363
<jakarta.activation.version>2.1.4</jakarta.activation.version>
@@ -89,8 +89,8 @@
8989
<!-- GraalVM sdk 23.1.2 has a minimum JDK requirement of 17+ at runtime -->
9090
<graal-sdk.version>23.1.2</graal-sdk.version>
9191
<gizmo.version>1.9.0</gizmo.version>
92-
<gizmo2.version>2.0.0.Beta6</gizmo2.version>
93-
<jackson-bom.version>2.20.0</jackson-bom.version>
92+
<gizmo2.version>2.0.0.Beta8</gizmo2.version>
93+
<jackson-bom.version>2.20.1</jackson-bom.version>
9494
<commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
9595
<commons-lang3.version>3.19.0</commons-lang3.version>
9696
<commons-codec.version>1.19.0</commons-codec.version>
@@ -106,13 +106,13 @@
106106
<wildfly.openssl-java.version>2.2.5.Final</wildfly.openssl-java.version>
107107
<wildfly.openssl-linux.version>2.2.2.SP01</wildfly.openssl-linux.version>
108108
<jboss-logging-annotations.version>3.0.4.Final</jboss-logging-annotations.version>
109-
<slf4j-jboss-logmanager.version>2.0.0.Final</slf4j-jboss-logmanager.version>
109+
<slf4j-jboss-logmanager.version>2.0.2.Final</slf4j-jboss-logmanager.version>
110110
<wildfly-common.version>2.0.1</wildfly-common.version>
111111
<wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
112112
<wildfly-elytron.version>2.7.0.Final</wildfly-elytron.version>
113113
<jboss-marshalling.version>2.2.3.Final</jboss-marshalling.version>
114114
<jboss-threads.version>3.9.1</jboss-threads.version>
115-
<vertx.version>4.5.21</vertx.version>
115+
<vertx.version>4.5.22</vertx.version>
116116
<httpclient.version>4.5.14</httpclient.version>
117117
<httpcore.version>4.4.16</httpcore.version>
118118
<httpasync.version>4.1.5</httpasync.version>
@@ -134,11 +134,11 @@
134134
<infinispan.version>15.0.19.Final</infinispan.version>
135135
<infinispan.protostream.version>5.0.13.Final</infinispan.protostream.version>
136136
<caffeine.version>3.2.2</caffeine.version>
137-
<netty.version>4.1.127.Final</netty.version>
137+
<netty.version>4.1.128.Final</netty.version>
138138
<brotli4j.version>1.16.0</brotli4j.version>
139139
<reactive-streams.version>1.0.4</reactive-streams.version>
140140
<jboss-logging.version>3.6.1.Final</jboss-logging.version>
141-
<mutiny.version>3.0.0</mutiny.version>
141+
<mutiny.version>3.0.1</mutiny.version>
142142
<jctools-core.version>4.0.5</jctools-core.version>
143143
<kafka3.version>4.0.0</kafka3.version>
144144
<lz4.version>1.8.0</lz4.version> <!-- dependency of the kafka-clients that could be overridden by other imported BOMs in the platform -->
@@ -150,7 +150,7 @@
150150
<aws-lambda-java-events.version>3.16.1</aws-lambda-java-events.version>
151151
<aws-xray.version>2.18.3</aws-xray.version>
152152
<cloudevents-api.version>3.0.0</cloudevents-api.version>
153-
<azure-functions-java-library.version>3.2.0</azure-functions-java-library.version>
153+
<azure-functions-java-library.version>3.2.2</azure-functions-java-library.version>
154154
<azure-functions-java-spi.version>1.1.0</azure-functions-java-spi.version>
155155
<kotlin.version>2.2.20</kotlin.version>
156156
<kotlin.coroutine.version>1.10.2</kotlin.coroutine.version>

‎core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ final class ReadOperation {
217217
final ConfigTrackingInterceptor buildConfigTracker;
218218
final Map<String, ConfigValue> allBuildTimeValues = new TreeMap<>();
219219
final Map<String, ConfigValue> buildTimeRunTimeValues = new TreeMap<>();
220-
final Map<String, ConfigValue> runTimeDefaultValues = new TreeMap<>();
221220
final Map<String, ConfigValue> runTimeValues = new TreeMap<>();
222221

223222
ReadOperation(final SmallRyeConfig config, ConfigTrackingInterceptor buildConfigTracker) {
@@ -334,7 +333,6 @@ public void accept(final ConfigSource buildSystem) {
334333
return new ReadResult.Builder()
335334
.setAllBuildTimeValues(allBuildTimeValues)
336335
.setBuildTimeRunTimeValues(filterActiveProfileProperties(buildTimeRunTimeValues))
337-
.setRunTimeDefaultValues(filterActiveProfileProperties(runTimeDefaultValues))
338336
.setRuntimeValues(runTimeValues)
339337
.setBuildTimeMappings(buildTimeMappings)
340338
.setBuildTimeRunTimeMappings(buildTimeRunTimeMappings)
@@ -540,7 +538,6 @@ private static Map<PropertyName, String> mappingsToNames(final List<ConfigClass>
540538
public static final class ReadResult {
541539
final Map<String, ConfigValue> allBuildTimeValues;
542540
final Map<String, ConfigValue> buildTimeRunTimeValues;
543-
final Map<String, ConfigValue> runTimeDefaultValues;
544541
final Map<String, ConfigValue> runTimeValues;
545542

546543
final List<ConfigClass> buildTimeMappings;
@@ -556,7 +553,6 @@ public static final class ReadResult {
556553
public ReadResult(final Builder builder) {
557554
this.allBuildTimeValues = builder.getAllBuildTimeValues();
558555
this.buildTimeRunTimeValues = builder.getBuildTimeRunTimeValues();
559-
this.runTimeDefaultValues = builder.getRunTimeDefaultValues();
560556
this.runTimeValues = builder.getRuntimeValues();
561557

562558
this.buildTimeMappings = builder.getBuildTimeMappings();
@@ -593,10 +589,6 @@ public Map<String, ConfigValue> getBuildTimeRunTimeValues() {
593589
return buildTimeRunTimeValues;
594590
}
595591

596-
public Map<String, ConfigValue> getRunTimeDefaultValues() {
597-
return runTimeDefaultValues;
598-
}
599-
600592
public Map<String, ConfigValue> getRunTimeValues() {
601593
return runTimeValues;
602594
}
@@ -636,7 +628,6 @@ public ConfigTrackingInterceptor.ReadOptionsProvider getReadOptionsProvider() {
636628
static class Builder {
637629
private Map<String, ConfigValue> allBuildTimeValues;
638630
private Map<String, ConfigValue> buildTimeRunTimeValues;
639-
private Map<String, ConfigValue> runTimeDefaultValues;
640631
private Map<String, ConfigValue> runtimeValues;
641632
private List<ConfigClass> buildTimeMappings;
642633
private List<ConfigClass> buildTimeRunTimeMappings;
@@ -663,15 +654,6 @@ Builder setBuildTimeRunTimeValues(final Map<String, ConfigValue> buildTimeRunTim
663654
return this;
664655
}
665656

666-
Map<String, ConfigValue> getRunTimeDefaultValues() {
667-
return runTimeDefaultValues;
668-
}
669-
670-
Builder setRunTimeDefaultValues(final Map<String, ConfigValue> runTimeDefaultValues) {
671-
this.runTimeDefaultValues = runTimeDefaultValues;
672-
return this;
673-
}
674-
675657
Map<String, ConfigValue> getRuntimeValues() {
676658
return runtimeValues;
677659
}

‎core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,9 @@ private static boolean allRootMinLevelOrHigher(
583583
private static void generateMinLevelCompute(Map<String, CategoryBuildTimeConfig> categories,
584584
Map<String, InheritableLevel> categoryMinLevelDefaults, Level rootMinLevel,
585585
ClassOutput output) {
586-
Gizmo g = Gizmo.create(output);
586+
Gizmo g = Gizmo.create(output)
587+
.withDebugInfo(false)
588+
.withParameters(false);
587589
g.class_(MIN_LEVEL_COMPUTE_CLASS_NAME, cc -> {
588590
cc.final_();
589591
cc.staticMethod("isMinLevelEnabled", mc -> {
@@ -611,7 +613,9 @@ private static void generateMinLevelCompute(Map<String, CategoryBuildTimeConfig>
611613
}
612614

613615
private static void generateDefaultLoggerNode(ClassOutput output) {
614-
Gizmo g = Gizmo.create(output);
616+
Gizmo g = Gizmo.create(output)
617+
.withDebugInfo(false)
618+
.withParameters(false);
615619
g.class_(LOGGER_NODE_CLASS_NAME, cc -> {
616620
cc.final_();
617621
cc.addAnnotation(TargetClass.class, ac -> ac.add(TargetClass::className, "org.jboss.logmanager.LoggerNode"));
@@ -630,7 +634,10 @@ interface MinLevelEnabledFunction {
630634

631635
private static void generateLogManagerLogger(ClassOutput output,
632636
MinLevelEnabledFunction isMinLevelEnabledFunction) {
633-
Gizmo.create(output).class_(LOGMANAGER_LOGGER_CLASS_NAME, cc -> {
637+
Gizmo gizmo = Gizmo.create(output)
638+
.withDebugInfo(false)
639+
.withParameters(false);
640+
gizmo.class_(LOGMANAGER_LOGGER_CLASS_NAME, cc -> {
634641
cc.final_();
635642
This this_ = cc.this_();
636643
cc.addAnnotation(TargetClass.class, ac -> ac.add(TargetClass::value, org.jboss.logmanager.Logger.class));
@@ -668,7 +675,9 @@ private static Expr getLogManagerLevelIntValue(String levelName, BlockCreator b0
668675
}
669676

670677
private static void generateDefaultLoggingLogger(Level minLevel, ClassOutput output) {
671-
Gizmo gizmo = Gizmo.create(output);
678+
Gizmo gizmo = Gizmo.create(output)
679+
.withDebugInfo(false)
680+
.withParameters(false);
672681
gizmo.class_(LOGGING_LOGGER_CLASS_NAME, cc -> {
673682
cc.final_();
674683
cc.addAnnotation(TargetClass.class, ac -> ac.add(TargetClass::className, "org.jboss.logging.Logger"));

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import io.quarkus.maven.dependency.ResolvedDependency;
5757
import io.quarkus.runtime.LocalesBuildTimeConfig;
5858
import io.quarkus.runtime.graal.DisableLoggingFeature;
59+
import io.quarkus.runtime.graal.JVMChecksFeature;
5960
import io.quarkus.sbom.ApplicationComponent;
6061
import io.quarkus.sbom.ApplicationManifestConfig;
6162
import io.smallrye.common.os.OS;
@@ -89,6 +90,7 @@ public class NativeImageBuildStep {
8990
void nativeImageFeatures(BuildProducer<NativeImageFeatureBuildItem> features) {
9091
features.produce(new NativeImageFeatureBuildItem(NativeImageFeatureStep.GRAAL_FEATURE));
9192
features.produce(new NativeImageFeatureBuildItem(DisableLoggingFeature.class));
93+
features.produce(new NativeImageFeatureBuildItem(JVMChecksFeature.class));
9294
}
9395

9496
@BuildStep(onlyIf = NativeBuild.class)

‎core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,10 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
232232

233233
public A build(io.quarkus.gizmo2.ClassOutput classOutput) {
234234
generatedLiterals.computeIfAbsent(annotationLiteral, generatedName -> {
235-
Gizmo.create(classOutput).class_(generatedName, cc -> {
235+
Gizmo gizmo = Gizmo.create(classOutput)
236+
.withDebugInfo(false)
237+
.withParameters(false);
238+
gizmo.class_(generatedName, cc -> {
236239
ClassDesc annotationClassDesc = classDescOf(annotationInstance.name());
237240
cc.extends_(GenericType.ofClass(AnnotationLiteral.class, TypeArgument.of(annotationClassDesc)));
238241
cc.implements_(annotationClassDesc);

0 commit comments

Comments
 (0)