Skip to content

Commit 7ab57a6

Browse files
gsmetgsmet
authored
Merge pull request #48314 from gsmet/3.23.3-backports-1
[3.23] 3.23.3 backports 1
2 parents 8a07478 + 47a3cc2 commit 7ab57a6

File tree

80 files changed

+1669
-222
lines changed

Some content is hidden

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

80 files changed

+1669
-222
lines changed

‎.github/workflows/ci-actions-incremental.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ jobs:
264264
- name: Verify virtual-threads-tests.json
265265
run: ./.github/verify-tests-json.sh virtual-threads-tests.json integration-tests/virtual-threads/
266266
- name: Setup Develocity Build Scan capture
267-
uses: gradle/develocity-actions/setup-maven@v1.3
267+
uses: gradle/develocity-actions/setup-maven@v1.4
268268
with:
269269
capture-strategy: ON_DEMAND
270270
job-name: "Initial JDK 17 Build"
@@ -515,7 +515,7 @@ jobs:
515515
restore-keys: |
516516
develocity-cache-${{matrix.java.name}}-${{ github.event.pull_request.number }}-
517517
- name: Setup Develocity Build Scan capture
518-
uses: gradle/develocity-actions/setup-maven@v1.3
518+
uses: gradle/develocity-actions/setup-maven@v1.4
519519
with:
520520
capture-strategy: ON_DEMAND
521521
job-name: "${{ matrix.java.name }}"
@@ -646,7 +646,7 @@ jobs:
646646
distribution: temurin
647647
java-version: ${{ matrix.java.java-version }}
648648
- name: Setup Develocity Build Scan capture
649-
uses: gradle/develocity-actions/setup-maven@v1.3
649+
uses: gradle/develocity-actions/setup-maven@v1.4
650650
with:
651651
capture-strategy: ON_DEMAND
652652
job-name: "Maven Tests - JDK ${{matrix.java.name}}"
@@ -756,7 +756,7 @@ jobs:
756756
if: ${{ !startsWith(matrix.java.os-name, 'windows') }}
757757
run: ./integration-tests/gradle/update-dependencies.sh $COMMON_MAVEN_ARGS -Dscan=false
758758
- name: Setup Develocity Build Scan capture
759-
uses: gradle/develocity-actions/setup-maven@v1.3
759+
uses: gradle/develocity-actions/setup-maven@v1.4
760760
with:
761761
capture-strategy: ON_DEMAND
762762
job-name: "Gradle Tests - JDK ${{matrix.java.name}}"
@@ -847,7 +847,7 @@ jobs:
847847
distribution: temurin
848848
java-version: ${{ matrix.java.java-version }}
849849
- name: Setup Develocity Build Scan capture
850-
uses: gradle/develocity-actions/setup-maven@v1.3
850+
uses: gradle/develocity-actions/setup-maven@v1.4
851851
with:
852852
capture-strategy: ON_DEMAND
853853
job-name: "Devtools Tests - JDK ${{matrix.java.name}}"
@@ -947,7 +947,7 @@ jobs:
947947
distribution: temurin
948948
java-version: ${{ matrix.java.java-version }}
949949
- name: Setup Develocity Build Scan capture
950-
uses: gradle/develocity-actions/setup-maven@v1.3
950+
uses: gradle/develocity-actions/setup-maven@v1.4
951951
with:
952952
capture-strategy: ON_DEMAND
953953
job-name: "Kubernetes Tests - JDK ${{matrix.java.name}}"
@@ -1034,7 +1034,7 @@ jobs:
10341034
distribution: temurin
10351035
java-version: ${{ matrix.java.java-version }}
10361036
- name: Setup Develocity Build Scan capture
1037-
uses: gradle/develocity-actions/setup-maven@v1.3
1037+
uses: gradle/develocity-actions/setup-maven@v1.4
10381038
with:
10391039
capture-strategy: ON_DEMAND
10401040
job-name: "Quickstarts Compilation - JDK ${{matrix.java.name}}"
@@ -1131,7 +1131,7 @@ jobs:
11311131
distribution: temurin
11321132
java-version: ${{ matrix.java.java-version }}
11331133
- name: Setup Develocity Build Scan capture
1134-
uses: gradle/develocity-actions/setup-maven@v1.3
1134+
uses: gradle/develocity-actions/setup-maven@v1.4
11351135
with:
11361136
capture-strategy: ON_DEMAND
11371137
job-name: "Platform Tests - JDK ${{matrix.java.name}}"
@@ -1230,7 +1230,7 @@ jobs:
12301230
cat <<< $(jq '.HttpHeaders += {"User-Agent": "Quarkus-CI-Docker-Client"}' ~/.docker/config.json) > ~/.docker/config.json
12311231
fi
12321232
- name: Setup Develocity Build Scan capture
1233-
uses: gradle/develocity-actions/setup-maven@v1.3
1233+
uses: gradle/develocity-actions/setup-maven@v1.4
12341234
with:
12351235
capture-strategy: ON_DEMAND
12361236
job-name: "Native Tests - Virtual Thread - ${{matrix.category}}"
@@ -1307,7 +1307,7 @@ jobs:
13071307
- name: Extract previously uploaded .m2 content
13081308
run: tar -xzf m2-content.tgz -C ~
13091309
- name: Setup Develocity Build Scan capture
1310-
uses: gradle/develocity-actions/setup-maven@v1.3
1310+
uses: gradle/develocity-actions/setup-maven@v1.4
13111311
with:
13121312
capture-strategy: ON_DEMAND
13131313
job-name: "MicroProfile TCKs Tests"
@@ -1425,7 +1425,7 @@ jobs:
14251425
- name: Extract previously uploaded .m2 content
14261426
run: tar -xzf m2-content.tgz -C ~
14271427
- name: Setup Develocity Build Scan capture
1428-
uses: gradle/develocity-actions/setup-maven@v1.3
1428+
uses: gradle/develocity-actions/setup-maven@v1.4
14291429
with:
14301430
capture-strategy: ON_DEMAND
14311431
job-name: "Native Tests - ${{matrix.category}}"

‎.github/workflows/develocity-publish-build-scans.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
steps:
2121
- name: Setup Build Scan link capture
2222
id: setup
23-
uses: gradle/develocity-actions/setup-maven@v1.3
23+
uses: gradle/develocity-actions/setup-maven@v1.4
2424
with:
2525
add-pr-comment: false
2626
add-job-summary: true
2727
- name: Publish Maven Build Scans
2828
id: publish
29-
uses: gradle/develocity-actions/maven-publish-build-scan@v1.3
29+
uses: gradle/develocity-actions/maven-publish-build-scan@v1.4
3030
with:
3131
develocity-url: 'https://ge.quarkus.io'
3232
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

‎.github/workflows/native-it-selected-graalvm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
- name: Verify virtual-threads-tests.json
104104
run: ./.github/verify-tests-json.sh virtual-threads-tests.json integration-tests/virtual-threads/
105105
- name: Setup Develocity Build Scan capture
106-
uses: gradle/develocity-actions/setup-maven@v1.3
106+
uses: gradle/develocity-actions/setup-maven@v1.4
107107
with:
108108
capture-strategy: ON_DEMAND
109109
job-name: "Initial JDK 17 Build"
@@ -266,7 +266,7 @@ jobs:
266266
cat <<< $(jq '.HttpHeaders += {"User-Agent": "Quarkus-CI-Docker-Client"}' ~/.docker/config.json) > ~/.docker/config.json
267267
fi
268268
- name: Setup Develocity Build Scan capture
269-
uses: gradle/develocity-actions/setup-maven@v1.3
269+
uses: gradle/develocity-actions/setup-maven@v1.4
270270
with:
271271
capture-strategy: ON_DEMAND
272272
job-name: "Native Tests - Virtual Thread - ${{matrix.category}}"
@@ -353,7 +353,7 @@ jobs:
353353
- name: Extract .m2/repository/io/quarkus
354354
run: tar -xzf m2-io-quarkus.tgz -C ~
355355
- name: Setup Develocity Build Scan capture
356-
uses: gradle/develocity-actions/setup-maven@v1.3
356+
uses: gradle/develocity-actions/setup-maven@v1.4
357357
with:
358358
capture-strategy: ON_DEMAND
359359
job-name: "Native Tests - ${{matrix.category}}"

‎.mvn/extensions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<extension>
88
<groupId>com.gradle</groupId>
99
<artifactId>common-custom-user-data-maven-extension</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3</version>
1111
</extension>
1212
<extension>
1313
<groupId>com.gradle</groupId>
@@ -27,6 +27,6 @@
2727
<extension>
2828
<groupId>eu.maveniverse.maven.njord</groupId>
2929
<artifactId>extension</artifactId>
30-
<version>0.7.0</version>
30+
<version>0.7.4</version>
3131
</extension>
3232
</extensions>

‎bom/application/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<angus-activation.version>2.0.2</angus-activation.version>
1818
<angus-mail.version>2.0.3</angus-mail.version> <!-- keep in sync with angus-activation (mail depends on activation) -->
19-
<bouncycastle.version>1.80</bouncycastle.version>
19+
<bouncycastle.version>1.81</bouncycastle.version>
2020
<bouncycastle.fips.version>1.0.2.5</bouncycastle.fips.version>
2121
<bouncycastle.tls.fips.version>1.0.19</bouncycastle.tls.fips.version>
2222
<cyclonedx.version>9.0.5</cyclonedx.version>
@@ -47,7 +47,7 @@
4747
<microprofile-lra.version>2.0.1</microprofile-lra.version>
4848
<microprofile-openapi.version>4.0.2</microprofile-openapi.version>
4949
<smallrye-common.version>2.12.0</smallrye-common.version>
50-
<smallrye-config.version>3.13.0</smallrye-config.version>
50+
<smallrye-config.version>3.13.1</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.10</smallrye-open-api.version>
@@ -97,7 +97,7 @@
9797
<!-- See root POM for hibernate-orm.version, hibernate-reactive.version, hibernate-validator.version,
9898
hibernate-search.version, antlr.version, bytebuddy.version, hibernate-commons-annotations.version -->
9999
<narayana.version>7.2.2.Final</narayana.version>
100-
<narayana-lra.version>1.0.0.Final</narayana-lra.version>
100+
<narayana-lra.version>1.0.1.Final</narayana-lra.version>
101101
<agroal.version>2.7.1</agroal.version>
102102
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
103103
<elasticsearch-opensource-components.version>8.18.2</elasticsearch-opensource-components.version>
@@ -166,11 +166,11 @@
166166
<liquibase-mongodb.version>4.29.1</liquibase-mongodb.version>
167167
<snakeyaml.version>2.4</snakeyaml.version>
168168
<osgi.version>6.0.0</osgi.version>
169-
<mongo-client.version>5.5.0</mongo-client.version>
169+
<mongo-client.version>5.5.1</mongo-client.version>
170170
<proton-j.version>0.34.1</proton-j.version>
171171
<javaparser.version>3.26.4</javaparser.version>
172172
<hibernate-quarkus-local-cache.version>0.3.1</hibernate-quarkus-local-cache.version>
173-
<flapdoodle.mongo.version>4.20.0</flapdoodle.mongo.version>
173+
<flapdoodle.mongo.version>4.20.1</flapdoodle.mongo.version>
174174
<quarkus-spring-api.version>6.2.SP1</quarkus-spring-api.version>
175175
<quarkus-spring-data-api.version>3.4</quarkus-spring-data-api.version>
176176
<quarkus-spring-security-api.version>6.4</quarkus-spring-security-api.version>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -683,16 +683,16 @@ public void accept(final ConfigSource buildSystem) {
683683
if (buildTimeNames.contains(name)) {
684684
unknownBuildProperties.remove(property);
685685
ConfigValue value = config.getConfigValue(property);
686-
if (value.getRawValue() != null) {
687-
allBuildTimeValues.put(value.getNameProfiled(), value.noProblems().withValue(value.getRawValue()));
686+
if (value.getValue() != null) {
687+
allBuildTimeValues.put(value.getNameProfiled(), value);
688688
}
689689
}
690690
if (buildTimeRunTimeNames.contains(name)) {
691691
unknownBuildProperties.remove(property);
692692
ConfigValue value = config.getConfigValue(property);
693-
if (value.getRawValue() != null) {
694-
allBuildTimeValues.put(value.getNameProfiled(), value.noProblems().withValue(value.getRawValue()));
695-
buildTimeRunTimeValues.put(value.getNameProfiled(), value.noProblems().withValue(value.getRawValue()));
693+
if (value.getValue() != null) {
694+
allBuildTimeValues.put(value.getNameProfiled(), value);
695+
buildTimeRunTimeValues.put(value.getNameProfiled(), value);
696696
}
697697
}
698698
if (runTimeNames.contains(name)) {

‎core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@
9999
import io.quarkus.runtime.configuration.RuntimeOverrideConfigSource;
100100
import io.quarkus.runtime.configuration.RuntimeOverrideConfigSourceBuilder;
101101
import io.quarkus.runtime.configuration.StaticInitConfigBuilder;
102-
import io.smallrye.config.ConfigMappingLoader;
103-
import io.smallrye.config.ConfigMappingMetadata;
104102
import io.smallrye.config.ConfigMappings.ConfigClass;
105103
import io.smallrye.config.ConfigSourceFactory;
106104
import io.smallrye.config.ConfigSourceInterceptor;
@@ -643,12 +641,6 @@ private static Map<Object, FieldDescriptor> generateSharedConfig(
643641
clinit.writeStaticField(mappingField, clinit.invokeStaticMethod(CONFIG_CLASS,
644642
clinit.load(mapping.getType().getName()), clinit.load(mapping.getPrefix())));
645643

646-
List<ConfigMappingMetadata> configMappingsMetadata = ConfigMappingLoader
647-
.getConfigMappingsMetadata(mapping.getType());
648-
for (ConfigMappingMetadata configMappingMetadata : configMappingsMetadata) {
649-
clinit.invokeStaticMethod(ENSURE_LOADED, clinit.load(configMappingMetadata.getInterfaceType().getName()));
650-
}
651-
652644
fields.put(mapping, mappingField);
653645
}
654646

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ protected static void withMapping(SmallRyeConfigBuilder builder, String mappingC
8484

8585
protected static void withMappingInstance(SmallRyeConfigBuilder builder, ConfigClass mapping) {
8686
SmallRyeConfig config = ConfigProvider.getConfig().unwrap(SmallRyeConfig.class);
87-
builder.getMappingsBuilder().mappingInstance(mapping, config.getConfigMapping(mapping.getType()));
87+
builder.getMappingsBuilder().mappingInstance(mapping, config.getConfigMapping(mapping.getType(), mapping.getPrefix()));
8888
}
8989

9090
protected static void withBuilder(SmallRyeConfigBuilder builder, ConfigBuilder configBuilder) {

‎devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@
7070
import io.quarkus.gradle.tasks.QuarkusTestConfig;
7171
import io.quarkus.gradle.tasks.QuarkusUpdate;
7272
import io.quarkus.gradle.tasks.services.ForcedPropertieBuildService;
73+
import io.quarkus.gradle.tooling.DefaultProjectDescriptor;
7374
import io.quarkus.gradle.tooling.GradleApplicationModelBuilder;
75+
import io.quarkus.gradle.tooling.ProjectDescriptorBuilder;
7476
import io.quarkus.gradle.tooling.ToolingUtils;
7577
import io.quarkus.gradle.tooling.dependency.DependencyUtils;
7678
import io.quarkus.gradle.tooling.dependency.ExtensionDependency;
7779
import io.quarkus.gradle.tooling.dependency.ProjectExtensionDependency;
78-
import io.quarkus.gradle.workspace.descriptors.DefaultProjectDescriptor;
79-
import io.quarkus.gradle.workspace.descriptors.ProjectDescriptorBuilder;
8080
import io.quarkus.runtime.LaunchMode;
8181

8282
public class QuarkusPlugin implements Plugin<Project> {

‎devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusApplicationModelTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
import io.quarkus.bootstrap.workspace.WorkspaceModule;
6565
import io.quarkus.bootstrap.workspace.WorkspaceModuleId;
6666
import io.quarkus.fs.util.ZipUtils;
67+
import io.quarkus.gradle.tooling.DefaultProjectDescriptor;
68+
import io.quarkus.gradle.tooling.ProjectDescriptor;
6769
import io.quarkus.gradle.tooling.ToolingUtils;
68-
import io.quarkus.gradle.workspace.descriptors.DefaultProjectDescriptor;
69-
import io.quarkus.gradle.workspace.descriptors.ProjectDescriptor;
7070
import io.quarkus.maven.dependency.ArtifactCoords;
7171
import io.quarkus.maven.dependency.ArtifactDependency;
7272
import io.quarkus.maven.dependency.ArtifactKey;

0 commit comments

Comments
 (0)