Skip to content

Commit 0ff22e4

Browse files
gsmetgsmet
authored
Merge pull request #44580 from gsmet/3.16.4-backports-1
[3.16] 3.16.4 backports 1
2 parents 8bbe797 + 31c36ed commit 0ff22e4

File tree

42 files changed

+945
-76
lines changed

Some content is hidden

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

42 files changed

+945
-76
lines changed

‎bom/application/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959
<smallrye-open-api.version>3.13.0</smallrye-open-api.version>
6060
<smallrye-graphql.version>2.11.0</smallrye-graphql.version>
6161
<smallrye-fault-tolerance.version>6.5.0</smallrye-fault-tolerance.version>
62-
<smallrye-jwt.version>4.6.0</smallrye-jwt.version>
62+
<smallrye-jwt.version>4.6.1</smallrye-jwt.version>
6363
<smallrye-context-propagation.version>2.1.2</smallrye-context-propagation.version>
6464
<smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
6565
<smallrye-reactive-types-converter.version>3.0.1</smallrye-reactive-types-converter.version>
66-
<smallrye-mutiny-vertx-binding.version>3.15.0</smallrye-mutiny-vertx-binding.version>
66+
<smallrye-mutiny-vertx-binding.version>3.16.0</smallrye-mutiny-vertx-binding.version>
6767
<smallrye-reactive-messaging.version>4.25.0</smallrye-reactive-messaging.version>
6868
<smallrye-stork.version>2.7.0</smallrye-stork.version>
6969
<jakarta.activation.version>2.1.3</jakarta.activation.version>
@@ -115,7 +115,7 @@
115115
<wildfly-elytron.version>2.6.0.Final</wildfly-elytron.version>
116116
<jboss-marshalling.version>2.2.1.Final</jboss-marshalling.version>
117117
<jboss-threads.version>3.8.0.Final</jboss-threads.version>
118-
<vertx.version>4.5.10</vertx.version>
118+
<vertx.version>4.5.11</vertx.version>
119119
<httpclient.version>4.5.14</httpclient.version>
120120
<httpcore.version>4.4.16</httpcore.version>
121121
<httpasync.version>4.1.5</httpasync.version>
@@ -134,10 +134,10 @@
134134
<shrinkwrap.version>1.2.6</shrinkwrap.version>
135135
<hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
136136
<junit.jupiter.version>5.10.5</junit.jupiter.version>
137-
<infinispan.version>15.0.10.Final</infinispan.version>
137+
<infinispan.version>15.0.11.Final</infinispan.version>
138138
<infinispan.protostream.version>5.0.12.Final</infinispan.protostream.version>
139139
<caffeine.version>3.1.8</caffeine.version>
140-
<netty.version>4.1.111.Final</netty.version>
140+
<netty.version>4.1.115.Final</netty.version>
141141
<brotli4j.version>1.16.0</brotli4j.version>
142142
<reactive-streams.version>1.0.4</reactive-streams.version>
143143
<jboss-logging.version>3.6.1.Final</jboss-logging.version>

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

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@ public void apply(Project project) {
139139
// Apply the `java` plugin
140140
project.getPluginManager().apply(JavaPlugin.class);
141141

142-
project.getGradle().getSharedServices().registerIfAbsent("forcedPropertiesService", ForcedPropertieBuildService.class,
143-
spec -> {
144-
});
145-
146142
registerModel();
147143

148144
// register extension
@@ -156,7 +152,11 @@ public void apply(Project project) {
156152

157153
private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
158154
TaskContainer tasks = project.getTasks();
159-
155+
String forcedPropertiesService = String.format("forcedPropertiesService-%s", project.getName());
156+
Provider<ForcedPropertieBuildService> serviceProvider = project.getGradle().getSharedServices().registerIfAbsent(
157+
forcedPropertiesService, ForcedPropertieBuildService.class,
158+
spec -> {
159+
});
160160
final String devRuntimeConfigName = ApplicationDeploymentClasspathBuilder
161161
.getBaseRuntimeConfigName(LaunchMode.DEVELOPMENT);
162162
final Configuration devRuntimeDependencies = project.getConfigurations().maybeCreate(devRuntimeConfigName);
@@ -236,14 +236,14 @@ private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
236236
});
237237
tasks.register(QUARKUS_SHOW_EFFECTIVE_CONFIG_TASK_NAME,
238238
QuarkusShowEffectiveConfig.class, task -> {
239-
configureQuarkusBuildTask(project, quarkusExt, task, quarkusBuildAppModelTask);
239+
configureQuarkusBuildTask(project, task, quarkusBuildAppModelTask, serviceProvider);
240240
task.setDescription("Show effective Quarkus build configuration.");
241241
});
242242

243243
TaskProvider<QuarkusBuildDependencies> quarkusBuildDependencies = tasks.register(QUARKUS_BUILD_DEP_TASK_NAME,
244244
QuarkusBuildDependencies.class,
245245
task -> {
246-
configureQuarkusBuildTask(project, quarkusExt, task, quarkusBuildAppModelTask);
246+
configureQuarkusBuildTask(project, task, quarkusBuildAppModelTask, serviceProvider);
247247

248248
task.getOutputs().doNotCacheIf("Dependencies are never cached", t -> true);
249249
task.getApplicationModel()
@@ -256,7 +256,7 @@ private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
256256
TaskProvider<QuarkusBuildCacheableAppParts> quarkusBuildCacheableAppParts = tasks.register(
257257
QUARKUS_BUILD_APP_PARTS_TASK_NAME,
258258
QuarkusBuildCacheableAppParts.class, task -> {
259-
configureQuarkusBuildTask(project, quarkusExt, task, quarkusBuildAppModelTask);
259+
configureQuarkusBuildTask(project, task, quarkusBuildAppModelTask, serviceProvider);
260260
task.dependsOn(quarkusGenerateCode);
261261
task.getOutputs().doNotCacheIf(
262262
"Not adding uber-jars, native binaries and mutable-jar package type to Gradle " +
@@ -272,7 +272,7 @@ public boolean isSatisfiedBy(Task t) {
272272
});
273273

274274
TaskProvider<QuarkusBuild> quarkusBuild = tasks.register(QUARKUS_BUILD_TASK_NAME, QuarkusBuild.class, build -> {
275-
configureQuarkusBuildTask(project, quarkusExt, build, quarkusBuildAppModelTask);
275+
configureQuarkusBuildTask(project, build, quarkusBuildAppModelTask, serviceProvider);
276276
build.dependsOn(quarkusBuildDependencies, quarkusBuildCacheableAppParts);
277277
build.getOutputs().doNotCacheIf(
278278
"Only collects and combines the outputs of " + QUARKUS_BUILD_APP_PARTS_TASK_NAME + " and "
@@ -296,7 +296,7 @@ public boolean isSatisfiedBy(Task t) {
296296

297297
tasks.register(IMAGE_BUILD_TASK_NAME, ImageBuild.class, task -> {
298298
task.dependsOn(quarkusRequiredExtension);
299-
configureQuarkusBuildTask(project, quarkusExt, task, quarkusBuildAppModelTask);
299+
configureQuarkusBuildTask(project, task, quarkusBuildAppModelTask, serviceProvider);
300300
task.getBuilderName().set(quarkusRequiredExtension.flatMap(ImageCheckRequirementsTask::getOutputFile));
301301
task.getOutputs().doNotCacheIf("Dependencies are never cached", t -> true);
302302
task.getApplicationModel()
@@ -306,7 +306,7 @@ public boolean isSatisfiedBy(Task t) {
306306

307307
tasks.register(IMAGE_PUSH_TASK_NAME, ImagePush.class, task -> {
308308
task.dependsOn(quarkusRequiredExtension);
309-
configureQuarkusBuildTask(project, quarkusExt, task, quarkusBuildAppModelTask);
309+
configureQuarkusBuildTask(project, task, quarkusBuildAppModelTask, serviceProvider);
310310
task.getBuilderName().set(quarkusRequiredExtension.flatMap(ImageCheckRequirementsTask::getOutputFile));
311311
task.getOutputs().doNotCacheIf("Dependencies are never cached", t -> true);
312312
task.getApplicationModel()
@@ -315,7 +315,7 @@ public boolean isSatisfiedBy(Task t) {
315315
});
316316

317317
tasks.register(DEPLOY_TASK_NAME, Deploy.class, task -> {
318-
configureQuarkusBuildTask(project, quarkusExt, task, quarkusBuildAppModelTask);
318+
configureQuarkusBuildTask(project, task, quarkusBuildAppModelTask, serviceProvider);
319319
task.getOutputs().doNotCacheIf("Dependencies are never cached", t -> true);
320320
task.getApplicationModel()
321321
.set(quarkusGenerateAppModelTask.flatMap(QuarkusApplicationModelTask::getApplicationModel));
@@ -326,7 +326,7 @@ public boolean isSatisfiedBy(Task t) {
326326
quarkusExt);
327327
TaskProvider<QuarkusRun> quarkusRun = tasks.register(QUARKUS_RUN_TASK_NAME, QuarkusRun.class,
328328
build -> {
329-
configureQuarkusBuildTask(project, quarkusExt, build, quarkusBuildAppModelTask);
329+
configureQuarkusBuildTask(project, build, quarkusBuildAppModelTask, serviceProvider);
330330
build.getOutputs().doNotCacheIf("Dependencies are never cached", t -> true);
331331
build.getApplicationModel()
332332
.set(quarkusGenerateAppModelTask.flatMap(QuarkusApplicationModelTask::getApplicationModel));
@@ -527,10 +527,13 @@ private static void configureApplicationModelTask(Project project, QuarkusApplic
527527
task.getApplicationModel().set(project.getLayout().getBuildDirectory().file(quarkusModelFile));
528528
}
529529

530-
private static void configureQuarkusBuildTask(Project project, QuarkusPluginExtension quarkusExt, QuarkusBuildTask task,
531-
TaskProvider<QuarkusApplicationModelTask> quarkusGenerateAppModelTask) {
530+
private static void configureQuarkusBuildTask(Project project, QuarkusBuildTask task,
531+
TaskProvider<QuarkusApplicationModelTask> quarkusGenerateAppModelTask,
532+
Provider<ForcedPropertieBuildService> serviceProvider) {
532533
task.getApplicationModel().set(quarkusGenerateAppModelTask.flatMap(QuarkusApplicationModelTask::getApplicationModel));
533534
SourceSet mainSourceSet = getSourceSet(project, SourceSet.MAIN_SOURCE_SET_NAME);
535+
task.getAdditionalForcedProperties().set(serviceProvider);
536+
task.usesService(serviceProvider);
534537
task.setCompileClasspath(mainSourceSet.getCompileClasspath().plus(mainSourceSet.getRuntimeClasspath())
535538
.plus(mainSourceSet.getAnnotationProcessorPath())
536539
.plus(mainSourceSet.getResources()));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import org.gradle.api.file.RegularFileProperty;
1818
import org.gradle.api.logging.LogLevel;
1919
import org.gradle.api.provider.Property;
20-
import org.gradle.api.services.ServiceReference;
2120
import org.gradle.api.tasks.Classpath;
2221
import org.gradle.api.tasks.Input;
2322
import org.gradle.api.tasks.InputFile;
23+
import org.gradle.api.tasks.Internal;
2424
import org.gradle.api.tasks.Nested;
2525
import org.gradle.api.tasks.PathSensitive;
2626
import org.gradle.api.tasks.PathSensitivity;
@@ -48,8 +48,8 @@ public abstract class QuarkusBuildTask extends QuarkusTask {
4848
static final String NATIVE_SOURCES = "native-sources";
4949
private final QuarkusPluginExtensionView extensionView;
5050

51-
@ServiceReference("forcedPropertiesService")
52-
abstract Property<ForcedPropertieBuildService> getAdditionalForcedProperties();
51+
@Internal
52+
public abstract Property<ForcedPropertieBuildService> getAdditionalForcedProperties();
5353

5454
QuarkusBuildTask(String description, boolean compatible) {
5555
super(description, compatible);
@@ -272,7 +272,7 @@ void generateBuild() {
272272
.collect(Collectors.joining("\n ", "\n ", "")));
273273
}
274274

275-
WorkQueue workQueue = workQueue(quarkusProperties, getExtensionView().getCodeGenForkOptions().get());
275+
WorkQueue workQueue = workQueue(quarkusProperties, getExtensionView().getBuildForkOptions().get());
276276

277277
workQueue.submit(BuildWorker.class, params -> {
278278
params.getBuildSystemProperties()

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public QuarkusPluginExtensionView(Project project, QuarkusPluginExtension extens
6464
getCleanupBuildOutput().set(extension.getCleanupBuildOutput());
6565
getFinalName().set(extension.getFinalName());
6666
getCodeGenForkOptions().set(getProviderFactory().provider(() -> extension.codeGenForkOptions));
67+
getBuildForkOptions().set(getProviderFactory().provider(() -> extension.buildForkOptions));
6768
getIgnoredEntries().set(extension.ignoredEntriesProperty());
6869
getMainResources().setFrom(project.getExtensions().getByType(SourceSetContainer.class).getByName(MAIN_SOURCE_SET_NAME)
6970
.getResources().getSourceDirectories());
@@ -127,6 +128,9 @@ private Provider<Map<String, String>> getQuarkusRelevantProjectProperties(Projec
127128
@Nested
128129
public abstract ListProperty<Action<? super JavaForkOptions>> getCodeGenForkOptions();
129130

131+
@Nested
132+
public abstract ListProperty<Action<? super JavaForkOptions>> getBuildForkOptions();
133+
130134
@Input
131135
@Optional
132136
public abstract Property<Boolean> getJarEnabled();

‎docs/src/main/asciidoc/dev-ui.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ public JsonArray getAll() { // <2>
922922
<1> This example runs nonblocking. We could also return `Uni<JsonArray>`
923923
<2> The method name `getAll` will be available in the Javascript
924924

925-
https://github.com/quarkusio/quarkus/blob/main/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/devconsole/CacheJsonRPCService.java[Example code]
925+
https://github.com/quarkusio/quarkus/blob/main/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/devui/CacheJsonRPCService.java[Example code]
926926

927927
*Webcomponent (Javascript) part*
928928

0 commit comments

Comments
 (0)