Skip to content

Commit 4621171

Browse files
jmartiskjmartisk
authored
Merge pull request #50868 from jmartisk/3.27.1-backports-4
[3.27] 3.27.1 backports 4
2 parents 4f48f90 + 60e095a commit 4621171

File tree

33 files changed

+481
-23
lines changed

33 files changed

+481
-23
lines changed

‎bom/application/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<wildfly-elytron.version>2.6.5.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>
@@ -123,7 +123,7 @@
123123
<postgresql-jdbc.version>42.7.7</postgresql-jdbc.version>
124124
<mariadb-jdbc.version>3.5.6</mariadb-jdbc.version>
125125
<mysql-jdbc.version>8.3.0</mysql-jdbc.version>
126-
<mssql-jdbc.version>13.2.0.jre11</mssql-jdbc.version>
126+
<mssql-jdbc.version>13.2.1.jre11</mssql-jdbc.version>
127127
<adal4j.version>1.6.7</adal4j.version>
128128
<oracle-jdbc.version>23.6.0.24.10</oracle-jdbc.version>
129129
<derby-jdbc.version>10.16.1.1</derby-jdbc.version>
@@ -134,7 +134,7 @@
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>

‎core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigDiagnostic.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public static void unknownConfigFiles(final Set<Path> configFiles) throws Except
284284
String unprofiledConfigFile = APPLICATION + "." + filename.substring(filename.lastIndexOf('.') + 1);
285285
String profile = filename.substring(APPLICATION_LENGTH + 1, filename.lastIndexOf('.'));
286286
if (config.getProfiles().contains(profile)
287-
&& !Files.exists(Path.of(configFile.getParent().toString(), unprofiledConfigFile))) {
287+
&& !Files.exists(configFile.getParent().resolve(unprofiledConfigFile))) {
288288
log.warnf(
289289
"Profiled configuration file %s is ignored; a main %s configuration file must exist in the same location to load %s",
290290
configFile, unprofiledConfigFile, filename);

‎devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ private DevModeCommandLine newLauncher(String actualDebugPort, String bootstrapI
14001400
builder.jvmArgs("-Dquarkus-internal.test.specific-selection=maven:" + test);
14011401
}
14021402

1403-
if (openJavaLang) {
1403+
if (openJavaLang || Runtime.version().feature() >= 24) {
14041404
builder.addOpens("java.base/java.lang=ALL-UNNAMED");
14051405
}
14061406

‎devtools/maven/src/main/java/io/quarkus/maven/ImageBuilder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
public enum ImageBuilder {
1515

1616
docker,
17+
podman,
1718
jib,
1819
buildpack,
1920
openshift;
@@ -74,7 +75,7 @@ public static Set<String> getProjectBuilder(MavenProject project) {
7475
return project.getDependencies().stream()
7576
.filter(d -> "io.quarkus".equals(d.getGroupId()))
7677
.map(d -> strip(d.getArtifactId()))
77-
.filter(n -> Arrays.stream(ImageBuilder.values()).anyMatch(e -> e.equals(n)))
78+
.filter(n -> Arrays.stream(ImageBuilder.values()).anyMatch(e -> e.name().equals(n)))
7879
.collect(Collectors.toSet());
7980
}
8081

‎docs/src/main/asciidoc/_includes/devtools/build.adoc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
.CLI
33
----
44
ifdef::build-additional-parameters[]
5-
quarkus build quarkus deploy openshift
5+
quarkus build
6+
quarkus deploy openshift
67
endif::[]
78
ifndef::build-additional-parameters[]
89
quarkus build

‎docs/src/main/asciidoc/security-openid-connect-client-reference.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ Add the following dependencies to your test project:
11171117
<version>${wiremock.version}</version> // <1>
11181118
</dependency>
11191119
----
1120-
<1> Use a proper Wiremock version. All available versions can be found link:https://search.maven.org/artifact/org.wiremock/wiremock[here].
1120+
<1> Use a proper Wiremock version. View all link:https://central.sonatype.com/artifact/org.wiremock/wiremock?smo=true[available WireMock versions] on Maven Central.
11211121

11221122
Write a Wiremock-based `QuarkusTestResourceLifecycleManager`, for example:
11231123
[source, java]

‎extensions/liquibase/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseMongodbProcessor.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,14 @@ void nativeImageConfiguration(
113113
.reason(getClass().getName())
114114
.fields().build());
115115

116+
reflective.produce(ReflectiveClassBuildItem.builder(
117+
liquibase.command.CommandFactory.class.getName(),
118+
liquibase.database.LiquibaseTableNamesFactory.class.getName(),
119+
liquibase.configuration.ConfiguredValueModifierFactory.class.getName(),
120+
liquibase.changelog.FastCheckService.class.getName())
121+
.reason(getClass().getName())
122+
.constructors().build());
123+
116124
reflective.produce(ReflectiveClassBuildItem.builder(
117125
liquibase.change.AbstractSQLChange.class.getName(),
118126
liquibase.ext.mongodb.change.AbstractMongoChange.class.getName(),
@@ -122,6 +130,7 @@ void nativeImageConfiguration(
122130
liquibase.ext.mongodb.change.DropIndexChange.class.getName(),
123131
liquibase.ext.mongodb.change.InsertManyChange.class.getName(),
124132
liquibase.ext.mongodb.change.InsertOneChange.class.getName(),
133+
liquibase.ext.mongodb.change.RunCommandChange.class.getName(),
125134
liquibase.database.jvm.JdbcConnection.class.getName())
126135
.methods().build());
127136

‎extensions/redis-client/runtime/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@
3131
<groupId>io.smallrye.reactive</groupId>
3232
<artifactId>smallrye-mutiny-vertx-redis-client</artifactId>
3333
</dependency>
34+
35+
<dependency>
36+
<groupId>org.graalvm.sdk</groupId>
37+
<artifactId>nativeimage</artifactId>
38+
<scope>provided</scope>
39+
</dependency>
40+
3441
<!-- Add the health extension as optional as we will produce the health check only if it's included -->
3542
<dependency>
3643
<groupId>io.quarkus</groupId>

‎extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/client/graal/RedisClientSubstitutions.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package io.quarkus.redis.runtime.client.graal;
2+
3+
import java.util.Random;
4+
5+
import com.oracle.svm.core.annotate.Alias;
6+
import com.oracle.svm.core.annotate.RecomputeFieldValue;
7+
import com.oracle.svm.core.annotate.TargetClass;
8+
9+
class RedisClientSubstitutions {
10+
11+
}
12+
13+
@TargetClass(className = "io.vertx.redis.client.impl.SentinelTopology")
14+
final class Target_io_vertx_redis_client_impl_SentinelTopology {
15+
16+
@Alias
17+
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
18+
static Random RANDOM;
19+
}
20+
21+
@TargetClass(className = "io.vertx.redis.client.impl.RedisClusterConnection")
22+
final class Target_io_vertx_redis_client_impl_RedisClusterConnection {
23+
24+
@Alias
25+
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
26+
static Random RANDOM;
27+
}
28+
29+
@TargetClass(className = "io.vertx.redis.client.impl.RedisReplicationConnection")
30+
final class Target_io_vertx_redis_client_impl_RedisReplicationConnection {
31+
32+
@Alias
33+
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
34+
static Random RANDOM;
35+
}
36+
37+
@TargetClass(className = "io.vertx.redis.client.impl.Slots")
38+
final class Target_io_vertx_redis_client_impl_Slots {
39+
40+
@Alias
41+
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
42+
static Random RANDOM;
43+
}

‎extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,11 @@ private static List<String> getChannelProperties(String keySuffix, Config config
123123
static String channelPropertyFormat = "mp.messaging.%s.%s.%s";
124124

125125
static String getChannelPropertyKey(String channelName, String propertyName, boolean incoming) {
126-
return String.format(channelPropertyFormat, incoming ? "incoming" : "outgoing",
127-
channelName.contains(".") ? "\"" + channelName + "\"" : channelName, propertyName);
126+
if ((channelName.charAt(0) != '"' || channelName.charAt(channelName.length() - 1) != '"')
127+
&& channelName.contains(".")) {
128+
channelName = "\"" + channelName + "\"";
129+
}
130+
return String.format(channelPropertyFormat, incoming ? "incoming" : "outgoing", channelName, propertyName);
128131
}
129132

130133
@BuildStep

0 commit comments

Comments
 (0)