Skip to content

Commit 0dbc0d0

Browse files
gsmetgsmet
authored
Merge pull request #50088 from gsmet/3.28.0-backports-1
[3.28] 3.28.0 backports 1
2 parents e9fb402 + 65a7860 commit 0dbc0d0

File tree

136 files changed

+3427
-1117
lines changed

Some content is hidden

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

136 files changed

+3427
-1117
lines changed

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=only-script
193
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
204
distributionSha256Sum=0d7125e8c91097b36edb990ea5934e6c68b4440eef4ea96510a0f6815e7eeadb

‎bom/application/pom.xml‎

Lines changed: 17 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<packaging>pom</packaging>
1515

1616
<properties>
17-
<angus-activation.version>2.0.2</angus-activation.version>
17+
<angus-activation.version>2.0.3</angus-activation.version>
1818
<angus-mail.version>2.0.4</angus-mail.version> <!-- keep in sync with angus-activation (mail depends on activation) -->
1919
<bouncycastle.version>1.81</bouncycastle.version>
2020
<bouncycastle.fips.version>2.1.1</bouncycastle.fips.version>
2121
<bouncycastle.tls.fips.version>2.1.20</bouncycastle.tls.fips.version>
2222
<cyclonedx.version>9.0.5</cyclonedx.version>
2323
<expressly.version>6.0.0</expressly.version>
2424
<findbugs.version>3.0.2</findbugs.version>
25-
<jandex.version>3.4.0</jandex.version>
25+
<jandex.version>3.5.0</jandex.version>
2626
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
2727
<javax.inject.version>1</javax.inject.version>
2828
<parsson.version>1.1.7</parsson.version>
@@ -46,21 +46,21 @@
4646
<microprofile-jwt.version>2.1</microprofile-jwt.version>
4747
<microprofile-lra.version>2.0.1</microprofile-lra.version>
4848
<microprofile-openapi.version>4.0.2</microprofile-openapi.version>
49-
<smallrye-common.version>2.13.8</smallrye-common.version>
49+
<smallrye-common.version>2.13.9</smallrye-common.version>
5050
<smallrye-config.version>3.13.4</smallrye-config.version>
5151
<smallrye-health.version>4.2.0</smallrye-health.version>
5252
<smallrye-metrics.version>4.0.0</smallrye-metrics.version>
5353
<smallrye-open-api.version>4.0.12</smallrye-open-api.version>
5454
<smallrye-graphql.version>2.14.1</smallrye-graphql.version>
55-
<smallrye-fault-tolerance.version>6.9.2</smallrye-fault-tolerance.version>
55+
<smallrye-fault-tolerance.version>6.9.3</smallrye-fault-tolerance.version>
5656
<smallrye-jwt.version>4.6.2</smallrye-jwt.version>
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>
6060
<smallrye-mutiny-vertx-binding.version>3.19.2</smallrye-mutiny-vertx-binding.version>
6161
<smallrye-reactive-messaging.version>4.28.0</smallrye-reactive-messaging.version>
6262
<smallrye-stork.version>2.7.3</smallrye-stork.version>
63-
<jakarta.activation.version>2.1.3</jakarta.activation.version>
63+
<jakarta.activation.version>2.1.4</jakarta.activation.version>
6464
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
6565
<jakarta.authentication-api>3.1.0</jakarta.authentication-api>
6666
<jakarta.authorization-api.version>3.0.0</jakarta.authorization-api.version>
@@ -121,7 +121,7 @@
121121
<h2.version>2.3.230</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions
122122
and the dependency jts-core needs to be updated in extensions/jdbc/jdbc-h2/runtime/pom.xml -->
123123
<postgresql-jdbc.version>42.7.7</postgresql-jdbc.version>
124-
<mariadb-jdbc.version>3.5.5</mariadb-jdbc.version>
124+
<mariadb-jdbc.version>3.5.6</mariadb-jdbc.version>
125125
<mysql-jdbc.version>8.3.0</mysql-jdbc.version>
126126
<mssql-jdbc.version>13.2.0.jre11</mssql-jdbc.version>
127127
<adal4j.version>1.6.7</adal4j.version>
@@ -146,13 +146,13 @@
146146
<strimzi-test-container.version>0.109.2</strimzi-test-container.version>
147147
<!-- Scala is used by Kafka so we need to choose a compatible version -->
148148
<scala.version>2.13.16</scala.version>
149-
<aws-lambda-java.version>1.3.0</aws-lambda-java.version>
149+
<aws-lambda-java.version>1.4.0</aws-lambda-java.version>
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>
153153
<azure-functions-java-library.version>3.1.0</azure-functions-java-library.version>
154154
<azure-functions-java-spi.version>1.1.0</azure-functions-java-spi.version>
155-
<kotlin.version>2.2.10</kotlin.version>
155+
<kotlin.version>2.2.20</kotlin.version>
156156
<kotlin.coroutine.version>1.10.2</kotlin.coroutine.version>
157157
<kotlin-serialization.version>1.9.0</kotlin-serialization.version>
158158
<azure.toolkit-lib.version>0.53.0</azure.toolkit-lib.version>
@@ -190,7 +190,7 @@
190190
<google-cloud-functions.version>1.1.4</google-cloud-functions.version>
191191
<commons-compress.version>1.28.0</commons-compress.version> <!-- Please check with Java Operator SDK / Fabric8 team before updating -->
192192
<commons-text.version>1.14.0</commons-text.version>
193-
<gson.version>2.13.1</gson.version>
193+
<gson.version>2.13.2</gson.version>
194194
<log4j2-jboss-logmanager.version>2.0.1.Final</log4j2-jboss-logmanager.version>
195195
<log4j2-api.version>2.25.1</log4j2-api.version>
196196
<log4j-jboss-logmanager.version>1.3.1.Final</log4j-jboss-logmanager.version>
@@ -3733,6 +3733,11 @@
37333733
<artifactId>bcpg-jdk18on</artifactId>
37343734
<version>${bouncycastle.version}</version>
37353735
</dependency>
3736+
<dependency>
3737+
<groupId>org.bouncycastle</groupId>
3738+
<artifactId>bcmail-jdk18on</artifactId>
3739+
<version>${bouncycastle.version}</version>
3740+
</dependency>
37363741
<dependency>
37373742
<groupId>org.bouncycastle</groupId>
37383743
<artifactId>bc-fips</artifactId>
@@ -4403,58 +4408,10 @@
44034408
</dependency>
44044409
<dependency>
44054410
<groupId>io.smallrye</groupId>
4406-
<artifactId>smallrye-fault-tolerance</artifactId>
4407-
<version>${smallrye-fault-tolerance.version}</version>
4408-
</dependency>
4409-
<dependency>
4410-
<groupId>io.smallrye</groupId>
4411-
<artifactId>smallrye-fault-tolerance-api</artifactId>
4412-
<version>${smallrye-fault-tolerance.version}</version>
4413-
</dependency>
4414-
<dependency>
4415-
<groupId>io.smallrye</groupId>
4416-
<artifactId>smallrye-fault-tolerance-apiimpl</artifactId>
4417-
<version>${smallrye-fault-tolerance.version}</version>
4418-
</dependency>
4419-
<dependency>
4420-
<groupId>io.smallrye</groupId>
4421-
<artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
4422-
<version>${smallrye-fault-tolerance.version}</version>
4423-
</dependency>
4424-
<dependency>
4425-
<groupId>io.smallrye</groupId>
4426-
<artifactId>smallrye-fault-tolerance-core</artifactId>
4427-
<version>${smallrye-fault-tolerance.version}</version>
4428-
</dependency>
4429-
<dependency>
4430-
<groupId>io.smallrye</groupId>
4431-
<artifactId>smallrye-fault-tolerance-context-propagation</artifactId>
4432-
<version>${smallrye-fault-tolerance.version}</version>
4433-
</dependency>
4434-
<dependency>
4435-
<groupId>io.smallrye</groupId>
4436-
<artifactId>smallrye-fault-tolerance-kotlin</artifactId>
4437-
<version>${smallrye-fault-tolerance.version}</version>
4438-
</dependency>
4439-
<dependency>
4440-
<groupId>io.smallrye</groupId>
4441-
<artifactId>smallrye-fault-tolerance-mutiny</artifactId>
4442-
<version>${smallrye-fault-tolerance.version}</version>
4443-
</dependency>
4444-
<dependency>
4445-
<groupId>io.smallrye</groupId>
4446-
<artifactId>smallrye-fault-tolerance-standalone</artifactId>
4447-
<version>${smallrye-fault-tolerance.version}</version>
4448-
</dependency>
4449-
<dependency>
4450-
<groupId>io.smallrye</groupId>
4451-
<artifactId>smallrye-fault-tolerance-tracing-propagation</artifactId>
4452-
<version>${smallrye-fault-tolerance.version}</version>
4453-
</dependency>
4454-
<dependency>
4455-
<groupId>io.smallrye</groupId>
4456-
<artifactId>smallrye-fault-tolerance-vertx</artifactId>
4411+
<artifactId>smallrye-fault-tolerance-bom</artifactId>
44574412
<version>${smallrye-fault-tolerance.version}</version>
4413+
<type>pom</type>
4414+
<scope>import</scope>
44584415
</dependency>
44594416
<dependency>
44604417
<groupId>io.smallrye</groupId>

‎build-parent/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<!-- These properties are needed in order for them to be resolvable by the generated projects -->
2222
<compiler-plugin.version>${version.compiler.plugin}</compiler-plugin.version>
23-
<kotlin.version>2.2.10</kotlin.version>
23+
<kotlin.version>2.2.20</kotlin.version>
2424
<ksp-gradle-plugin.version>2.2.10-2.0.2</ksp-gradle-plugin.version> <!-- Kotlin Symbol Processing plugin used in a test -->
2525
<dokka.version>2.0.0</dokka.version>
2626
<scala.version>2.13.12</scala.version>
@@ -30,7 +30,7 @@
3030
<jboss-bridger-plugin.version>1.6.Final</jboss-bridger-plugin.version>
3131

3232
<!-- Jandex versions -->
33-
<jandex.version>3.4.0</jandex.version>
33+
<jandex.version>3.5.0</jandex.version>
3434
<jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
3535

3636
<asciidoctorj.version>2.5.13</asciidoctorj.version>
@@ -62,7 +62,7 @@
6262

6363
<!-- These 2 properties are used by CreateProjectMojo to add the Maven Wrapper -->
6464
<proposed-maven-version>3.9.11</proposed-maven-version>
65-
<maven-wrapper.version>3.3.2</maven-wrapper.version>
65+
<maven-wrapper.version>3.3.4</maven-wrapper.version>
6666
<gradle-wrapper.version>9.0.0</gradle-wrapper.version>
6767
<quarkus-gradle-plugin.version>${project.version}</quarkus-gradle-plugin.version>
6868
<quarkus-maven-plugin.version>${project.version}</quarkus-maven-plugin.version>

‎core/deployment/src/main/java/io/quarkus/deployment/pkg/jar/ParallelCommonsCompressArchiveCreator.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.commons.compress.archivers.zip.DefaultBackingStoreSupplier;
2626
import org.apache.commons.compress.archivers.zip.ParallelScatterZipCreator;
2727
import org.apache.commons.compress.archivers.zip.ScatterZipOutputStream;
28+
import org.apache.commons.compress.archivers.zip.UnixStat;
2829
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
2930
import org.apache.commons.compress.archivers.zip.ZipArchiveEntryRequest;
3031
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
@@ -44,6 +45,9 @@ public class ParallelCommonsCompressArchiveCreator implements ArchiveCreator {
4445

4546
private static final InputStreamSupplier EMPTY_SUPPLIER = () -> new ByteArrayInputStream(new byte[0]);
4647

48+
private static final int DIR_UNIX_MODE = UnixStat.DIR_FLAG | UnixStat.DEFAULT_DIR_PERM;
49+
private static final int FILE_UNIX_MODE = UnixStat.FILE_FLAG | UnixStat.DEFAULT_FILE_PERM;
50+
4751
private final Path archivePath;
4852
private final FileTime entryTimestamp;
4953
private final ZipArchiveOutputStream archive;
@@ -84,7 +88,7 @@ public class ParallelCommonsCompressArchiveCreator implements ArchiveCreator {
8488
public void addManifest(Manifest manifest) throws IOException {
8589
// we add the manifest directly to the final archive to make sure it is the first element added
8690
ZipArchiveEntry metaInfArchiveEntry = new ZipArchiveEntry("META-INF/");
87-
normalizeTimestamps(metaInfArchiveEntry);
91+
normalizeTimestampsAndPermissions(metaInfArchiveEntry);
8892
archive.putArchiveEntry(metaInfArchiveEntry);
8993
archive.closeArchiveEntry();
9094

@@ -93,7 +97,7 @@ public void addManifest(Manifest manifest) throws IOException {
9397
byte[] manifestBytes = baos.toByteArray();
9498

9599
ZipArchiveEntry manifestEntry = new ZipArchiveEntry("META-INF/MANIFEST.MF");
96-
normalizeTimestamps(manifestEntry);
100+
normalizeTimestampsAndPermissions(manifestEntry);
97101
manifestEntry.setSize(manifestBytes.length);
98102
archive.putArchiveEntry(manifestEntry);
99103
archive.write(manifestBytes);
@@ -167,13 +171,13 @@ private void addDirectoryEntry(final ZipArchiveEntry zipArchiveEntry) throws IOE
167171
if (!zipArchiveEntry.isDirectory() || zipArchiveEntry.isUnixSymlink()) {
168172
return;
169173
}
170-
normalizeTimestamps(zipArchiveEntry);
174+
normalizeTimestampsAndPermissions(zipArchiveEntry);
171175
zipArchiveEntry.setMethod(compressionMethod);
172176
directories.addArchiveEntry(ZipArchiveEntryRequest.createZipArchiveEntryRequest(zipArchiveEntry, EMPTY_SUPPLIER));
173177
}
174178

175179
private void addEntry(final ZipArchiveEntry zipArchiveEntry, final InputStreamSupplier streamSupplier) throws IOException {
176-
normalizeTimestamps(zipArchiveEntry);
180+
normalizeTimestampsAndPermissions(zipArchiveEntry);
177181
zipArchiveEntry.setMethod(compressionMethod);
178182
if (zipArchiveEntry.isDirectory() && !zipArchiveEntry.isUnixSymlink()) {
179183
directories.addArchiveEntry(ZipArchiveEntryRequest.createZipArchiveEntryRequest(zipArchiveEntry, streamSupplier));
@@ -208,7 +212,7 @@ private static InputStreamSupplier toInputStreamSupplier(Path path) {
208212
};
209213
}
210214

211-
private void normalizeTimestamps(ZipArchiveEntry archiveEntry) {
215+
private void normalizeTimestampsAndPermissions(ZipArchiveEntry archiveEntry) {
212216
if (entryTimestamp == null) {
213217
return;
214218
}
@@ -217,6 +221,12 @@ private void normalizeTimestamps(ZipArchiveEntry archiveEntry) {
217221
archiveEntry.setCreationTime(entryTimestamp);
218222
archiveEntry.setLastModifiedTime(entryTimestamp);
219223
archiveEntry.setLastAccessTime(entryTimestamp);
224+
225+
if (archiveEntry.isDirectory()) {
226+
archiveEntry.setUnixMode(DIR_UNIX_MODE);
227+
} else {
228+
archiveEntry.setUnixMode(FILE_UNIX_MODE);
229+
}
220230
}
221231

222232
@Override

‎core/runtime/src/main/java/io/quarkus/runtime/annotations/DevMCPEnableByDefault.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package io.quarkus.runtime.annotations;
2+
3+
import static java.lang.annotation.ElementType.METHOD;
4+
import static java.lang.annotation.RetentionPolicy.RUNTIME;
5+
6+
import java.lang.annotation.Documented;
7+
import java.lang.annotation.Retention;
8+
import java.lang.annotation.Target;
9+
10+
/**
11+
* Enable a JsonRPC Method for MCP by default
12+
*/
13+
@Retention(RUNTIME)
14+
@Target({ METHOD })
15+
@Documented
16+
public @interface DevMCPEnableByDefault {
17+
18+
}

‎devtools/gradle/gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
plugin-publish = "2.0.0"
33

4-
kotlin = "2.2.10"
4+
kotlin = "2.2.20"
55
smallrye-config = "3.13.4"
66

77
junit5 = "5.13.4"

0 commit comments

Comments
 (0)