[3.15] 3.15.2 backports 1

.github/ISSUE_TEMPLATE/extension_proposal.yml

@@ -41,7 +41,7 @@ body:
  description: >-
  A URL with more information about the technology this extension promotes (defaults to the Quarkiverse Docs repository)
  value:
- https://quarkiverse.github.io/quarkiverse-docs/<REPOSITORY_NAME>/dev/
+ https://docs.quarkiverse.io/<REPOSITORY_NAME>/dev/
 
  - type: textarea
  id: repository_topics

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

@@ -144,6 +144,8 @@ jobs:
  - name: Cache Maven Repository
  id: cache-maven
  uses: actions/cache@v4
+ # if it's not a pull request, we restore and save the cache
+ if: github.event_name != 'pull_request'
  with:
  path: ~/.m2/repository
  # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
@@ -153,7 +155,27 @@ jobs:
  restore-keys: |
  ${{ steps.cache-key.outputs.m2-monthly-branch-cache-key }}-
  ${{ steps.cache-key.outputs.m2-monthly-cache-key }}-
+ - name: Restore Maven Repository
+ uses: actions/cache/restore@v4
+ # if it a pull request, we restore the cache but we don't save it
+ if: github.event_name == 'pull_request'
+ with:
+ path: ~/.m2/repository
+ key: ${{ steps.cache-key.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ steps.cache-key.outputs.m2-monthly-branch-cache-key }}-
+ ${{ steps.cache-key.outputs.m2-monthly-cache-key }}-
+ - name: Cache Develocity local cache
+ uses: actions/cache@v4
+ if: github.event_name == 'pull_request'
+ with:
+ path: ~/.m2/.develocity/build-cache
+ key: develocity-cache-Initial JDK 17 Build-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}
+ restore-keys: |
+ develocity-cache-Initial JDK 17 Build-${{ github.event.pull_request.number }}-
  - name: Populate the cache
+ # only populate the cache if it's not a pull request as we only store the cache in this case
+ if: github.event_name != 'pull_request'
  run: |
  ./mvnw -T2C $COMMON_MAVEN_ARGS dependency:go-offline
  - name: Verify native-tests.json
@@ -216,13 +238,13 @@ jobs:
  echo 'impacted_modules<<EOF' >> $GITHUB_OUTPUT
  echo "${GIB_IMPACTED}" >> $GITHUB_OUTPUT
  echo 'EOF' >> $GITHUB_OUTPUT
- - name: Tar .m2/repository/io/quarkus
- run: tar -czf m2-io-quarkus.tgz -C ~ .m2/repository/io/quarkus
- - name: Upload .m2/repository/io/quarkus
+ - name: Tar .m2 content pushed to subsequent jobs
+ run: tar -czf m2-content.tgz -C ~ .m2/repository/io/quarkus .m2/.develocity/build-cache
+ - name: Upload .m2 content pushed to subsequent jobs
  uses: actions/upload-artifact@v4
  with:
- name: m2-io-quarkus
- path: m2-io-quarkus.tgz
+ name: m2-content
+ path: m2-content.tgz
  retention-days: 7
  - name: Delete snapshots artifacts from cache
  run: find ~/.m2 -name \*-SNAPSHOT -type d -exec rm -rf {} +
@@ -382,13 +404,21 @@ jobs:
  restore-keys: |
  ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
  ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
- - name: Download .m2/repository/io/quarkus
+ - name: Download previously uploaded .m2 content
  uses: actions/download-artifact@v4
  with:
- name: m2-io-quarkus
+ name: m2-content
  path: .
- - name: Extract .m2/repository/io/quarkus
- run: tar -xzf m2-io-quarkus.tgz -C ~
+ - name: Extract previously uploaded .m2 content
+ run: tar -xzf m2-content.tgz -C ~
+ - name: Cache Develocity local cache
+ uses: actions/cache@v4
+ if: github.event_name == 'pull_request'
+ with:
+ path: ~/.m2/.develocity/build-cache
+ key: develocity-cache-JVM Tests - JDK ${{matrix.java.name}}-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}
+ restore-keys: |
+ develocity-cache-JVM Tests - JDK ${{matrix.java.name}}-${{ github.event.pull_request.number }}-
  - name: Setup Develocity Build Scan capture
  uses: gradle/develocity-actions/maven-setup@v1
  with:
@@ -489,13 +519,13 @@ jobs:
  restore-keys: |
  ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
  ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
- - name: Download .m2/repository/io/quarkus
+ - name: Download previously uploaded .m2 content
  uses: actions/download-artifact@v4
  with:
- name: m2-io-quarkus
+ name: m2-content
  path: .
- - name: Extract .m2/repository/io/quarkus
- run: tar -xzf m2-io-quarkus.tgz -C ~
+ - name: Extract previously uploaded .m2 content
+ run: tar -xzf m2-content.tgz -C ~
  - name: Set up JDK ${{ matrix.java.java-version }}
  uses: actions/setup-java@v4
  with:
@@ -591,13 +621,13 @@ jobs:
  restore-keys: |
  ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
  ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
- - name: Download .m2/repository/io/quarkus
+ - name: Download previously uploaded .m2 content
  uses: actions/download-artifact@v4
  with:
- name: m2-io-quarkus
+ name: m2-content
  path: .
- - name: Extract .m2/repository/io/quarkus
- run: tar -xzf m2-io-quarkus.tgz -C ~
+ - name: Extract previously uploaded .m2 content
+ run: tar -xzf m2-content.tgz -C ~
  - name: Set up JDK ${{ matrix.java.java-version }}
  uses: actions/setup-java@v4
  with:
@@ -683,13 +713,13 @@ jobs:
  restore-keys: |
  ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
  ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
- - name: Download .m2/repository/io/quarkus
+ - name: Download previously uploaded .m2 content
  uses: actions/download-artifact@v4
  with:
- name: m2-io-quarkus
+ name: m2-content
  path: .
- - name: Extract .m2/repository/io/quarkus
- run: tar -xzf m2-io-quarkus.tgz -C ~
+ - name: Extract previously uploaded .m2 content
+ run: tar -xzf m2-content.tgz -C ~
  - name: Set up JDK ${{ matrix.java.java-version }}
  uses: actions/setup-java@v4
  with:
@@ -779,13 +809,13 @@ jobs:
  restore-keys: |
  ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
  ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
- - name: Download .m2/repository/io/quarkus
+ - name: Download previously uploaded .m2 content
  uses: actions/download-artifact@v4
  with:
- name: m2-io-quarkus
+ name: m2-content
  path: .
- - name: Extract .m2/repository/io/quarkus
- run: tar -xzf m2-io-quarkus.tgz -C ~
+ - name: Extract previously uploaded .m2 content
+ run: tar -xzf m2-content.tgz -C ~
  - name: Set up JDK ${{ matrix.java.java-version }}
  uses: actions/setup-java@v4
  with:
@@ -862,13 +892,13 @@ jobs:
  restore-keys: |
  ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
  ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
- - name: Download .m2/repository/io/quarkus
+ - name: Download previously uploaded .m2 content
  uses: actions/download-artifact@v4
  with:
- name: m2-io-quarkus
+ name: m2-content
  path: .
- - name: Extract .m2/repository/io/quarkus
- run: tar -xzf m2-io-quarkus.tgz -C ~
+ - name: Extract previously uploaded .m2 content
+ run: tar -xzf m2-content.tgz -C ~
  - name: Set up JDK ${{ matrix.java.java-version }}
  uses: actions/setup-java@v4
  with:
@@ -951,13 +981,13 @@ jobs:
  restore-keys: |
  ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
  ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
- - name: Download .m2/repository/io/quarkus
+ - name: Download previously uploaded .m2 content
  uses: actions/download-artifact@v4
  with:
- name: m2-io-quarkus
+ name: m2-content
  path: .
- - name: Extract .m2/repository/io/quarkus
- run: tar -xzf m2-io-quarkus.tgz -C ~
+ - name: Extract previously uploaded .m2 content
+ run: tar -xzf m2-content.tgz -C ~
  - name: Set up JDK 21
  uses: actions/setup-java@v4
  with:
@@ -1035,13 +1065,13 @@ jobs:
  restore-keys: |
  ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
  ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
- - name: Download .m2/repository/io/quarkus
+ - name: Download previously uploaded .m2 content
  uses: actions/download-artifact@v4
  with:
- name: m2-io-quarkus
+ name: m2-content
  path: .
- - name: Extract .m2/repository/io/quarkus
- run: tar -xzf m2-io-quarkus.tgz -C ~
+ - name: Extract previously uploaded .m2 content
+ run: tar -xzf m2-content.tgz -C ~
  - name: Setup Develocity Build Scan capture
  uses: gradle/develocity-actions/maven-setup@v1
  with:
@@ -1148,13 +1178,13 @@ jobs:
  restore-keys: |
  ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
  ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
- - name: Download .m2/repository/io/quarkus
+ - name: Download previously uploaded .m2 content
  uses: actions/download-artifact@v4
  with:
- name: m2-io-quarkus
+ name: m2-content
  path: .
- - name: Extract .m2/repository/io/quarkus
- run: tar -xzf m2-io-quarkus.tgz -C ~
+ - name: Extract previously uploaded .m2 content
+ run: tar -xzf m2-content.tgz -C ~
  - name: Setup Develocity Build Scan capture
  uses: gradle/develocity-actions/maven-setup@v1
  with:

bom/application/pom.xml

@@ -15,6 +15,7 @@
 
  <properties>
  <angus-activation.version>2.0.2</angus-activation.version>
+ <angus-mail.version>2.0.3</angus-mail.version> <!-- keep in sync with angus-activation (mail depends on activation) -->
  <bouncycastle.version>1.78.1</bouncycastle.version>
  <bouncycastle.fips.version>1.0.2.5</bouncycastle.fips.version>
  <bouncycastle.tls.fips.version>1.0.19</bouncycastle.tls.fips.version>
@@ -35,8 +36,8 @@
  <opentelemetry.version>1.39.0</opentelemetry.version>
  <opentelemetry-alpha.version>2.5.0-alpha</opentelemetry-alpha.version>
  <opentelemetry-semconv.version>1.26.0-alpha</opentelemetry-semconv.version>
- <quarkus-http.version>5.3.2</quarkus-http.version>
- <micrometer.version>1.13.3</micrometer.version><!-- keep in sync with hdrhistogram -->
+ <quarkus-http.version>5.3.3</quarkus-http.version>
+ <micrometer.version>1.13.5</micrometer.version><!-- keep in sync with hdrhistogram -->
  <hdrhistogram.version>2.2.2</hdrhistogram.version><!-- keep in sync with micrometer -->
  <google-auth.version>0.22.0</google-auth.version>
  <graphql-java.version>22.1</graphql-java.version> <!-- keep in sync with smallrye-graphql -->
@@ -133,8 +134,8 @@
  <shrinkwrap.version>1.2.6</shrinkwrap.version>
  <hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
  <junit.jupiter.version>5.10.3</junit.jupiter.version>
- <infinispan.version>15.0.8.Final</infinispan.version>
- <infinispan.protostream.version>5.0.8.Final</infinispan.protostream.version>
+ <infinispan.version>15.0.10.Final</infinispan.version>
+ <infinispan.protostream.version>5.0.12.Final</infinispan.protostream.version>
  <caffeine.version>3.1.5</caffeine.version>
  <netty.version>4.1.111.Final</netty.version>
  <brotli4j.version>1.16.0</brotli4j.version>
@@ -175,7 +176,7 @@
  <javaparser.version>3.26.1</javaparser.version>
  <hibernate-quarkus-local-cache.version>0.3.0</hibernate-quarkus-local-cache.version>
  <flapdoodle.mongo.version>4.16.2</flapdoodle.mongo.version>
- <quarkus-spring-api.version>6.1.SP3</quarkus-spring-api.version>
+ <quarkus-spring-api.version>6.1.SP4</quarkus-spring-api.version>
  <quarkus-spring-data-api.version>3.2.SP2</quarkus-spring-data-api.version>
  <quarkus-spring-security-api.version>6.2</quarkus-spring-security-api.version>
  <quarkus-spring-boot-api.version>3.2</quarkus-spring-boot-api.version>
@@ -3613,6 +3614,11 @@
  <artifactId>angus-activation</artifactId>
  <version>${angus-activation.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
+ <version>${angus-mail.version}</version>
+ </dependency>
  <dependency>
  <groupId>com.h2database</groupId>
  <artifactId>h2</artifactId>

core/runtime/src/main/java/io/quarkus/runtime/configuration/MemorySize.java

@@ -1,6 +1,7 @@
 package io.quarkus.runtime.configuration;
 
 import java.math.BigInteger;
+import java.util.Objects;
 
 /**
  * A type representing data sizes.
@@ -25,4 +26,19 @@ public long asLongValue() {
  public BigInteger asBigInteger() {
  return value;
  }
+
+ @Override
+ public boolean equals(Object object) {
+ if (this == object)
+ return true;
+ if (object == null || getClass() != object.getClass())
+ return false;
+ MemorySize that = (MemorySize) object;
+ return Objects.equals(value, that.value);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(value);
+ }
 }

devtools/config-doc-maven-plugin/src/main/java/io/quarkus/maven/config/doc/AsciidocFormatter.java

@@ -44,19 +44,25 @@ String formatDescription(ConfigProperty configProperty) {
  String formatTypeDescription(ConfigProperty configProperty) {
  String typeContent = "";
 
- if (configProperty.isEnum() && enableEnumTooltips) {
- typeContent = configProperty.getEnumAcceptedValues().values().entrySet().stream()
- .map(e -> {
- Optional<JavadocElement> javadocElement = javadocRepository.getElement(configProperty.getType(),
- e.getKey());
- if (javadocElement.isEmpty()) {
- return "`" + e.getValue().configValue() + "`";
- }
-
- return String.format(TOOLTIP_MACRO, e.getValue().configValue(),
- cleanTooltipContent(javadocElement.get().description()));
- })
- .collect(Collectors.joining(", "));
+ if (configProperty.isEnum()) {
+ if (enableEnumTooltips) {
+ typeContent = configProperty.getEnumAcceptedValues().values().entrySet().stream()
+ .map(e -> {
+ Optional<JavadocElement> javadocElement = javadocRepository.getElement(configProperty.getType(),
+ e.getKey());
+ if (javadocElement.isEmpty()) {
+ return "`" + e.getValue().configValue() + "`";
+ }
+
+ return String.format(TOOLTIP_MACRO, e.getValue().configValue(),
+ cleanTooltipContent(javadocElement.get().description()));
+ })
+ .collect(Collectors.joining(", "));
+ } else {
+ typeContent = configProperty.getEnumAcceptedValues().values().values().stream()
+ .map(v -> v.configValue())
+ .collect(Collectors.joining("`, `", "`", "`"));
+ }
  } else {
  typeContent = configProperty.getTypeDescription();
  if (configProperty.getJavadocSiteLink() != null) {

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

@@ -246,6 +246,10 @@ public class DevMojo extends AbstractMojo {
  @Parameter
  private File workingDir;
 
+ /**
+ * Allows configuring arbitrary JVM arguments. Multiple arguments can be specified by delimiting them with a space
+ * character.
+ */
  @Parameter(defaultValue = "${jvm.args}")
  private String jvmArgs;
 

docs/src/main/asciidoc/_attributes.adoc

@@ -55,13 +55,13 @@
 :hibernate-orm-dialect-docs-url: https://docs.jboss.org/hibernate/orm/{hibernate-orm-version-major-minor}/dialect/dialect.html
 :hibernate-search-docs-url: https://docs.jboss.org/hibernate/search/{hibernate-search-version-major-minor}/reference/en-US/html_single/
 // .
-:amazon-services-guide: https://quarkiverse.github.io/quarkiverse-docs/quarkus-amazon-services/dev/index.html
-:config-consul-guide: https://quarkiverse.github.io/quarkiverse-docs/quarkus-config-extensions/dev/consul.html
-:hibernate-search-orm-elasticsearch-aws-guide: https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/dev/index.html
-:neo4j-guide: https://quarkiverse.github.io/quarkiverse-docs/quarkus-neo4j/dev/index.html
-:vault-guide: https://quarkiverse.github.io/quarkiverse-docs/quarkus-vault/dev/index.html
-:vault-datasource-guide: https://quarkiverse.github.io/quarkiverse-docs/quarkus-vault/dev/vault-datasource.html
-:micrometer-registry-guide: https://quarkiverse.github.io/quarkiverse-docs/quarkus-micrometer-registry/dev/index.html
+:amazon-services-guide: https://docs.quarkiverse.io/quarkus-amazon-services/dev/index.html
+:config-consul-guide: https://docs.quarkiverse.io/quarkus-config-extensions/dev/consul.html
+:hibernate-search-orm-elasticsearch-aws-guide: https://docs.quarkiverse.io/quarkus-hibernate-search-extras/dev/index.html
+:neo4j-guide: https://docs.quarkiverse.io/quarkus-neo4j/dev/index.html
+:vault-guide: https://docs.quarkiverse.io/quarkus-vault/dev/index.html
+:vault-datasource-guide: https://docs.quarkiverse.io/quarkus-vault/dev/vault-datasource.html
+:micrometer-registry-guide: https://docs.quarkiverse.io/quarkus-micrometer-registry/dev/index.html
 :quarkus-migration-guide: https://github.com/quarkusio/quarkus/wiki/Migration-Guides[Migration Guides]
 :quarkus-tls-registry-reference-guide: TLS registry reference
 // .

docs/src/main/asciidoc/container-image.adoc

@@ -239,7 +239,7 @@ quarkus.container-image.builder=docker
 
 == Integrating with `systemd-notify`
 
-If you are building a container image in order to deploy your Quarkus application as a Linux service with Podman and Systemd, you might want to consider including the https://quarkiverse.github.io/quarkiverse-docs/quarkus-systemd-notify/dev/index.html[Quarkus Systemd Notify Extension] as part of your application, with:
+If you are building a container image in order to deploy your Quarkus application as a Linux service with Podman and Systemd, you might want to consider including the https://docs.quarkiverse.io/quarkus-systemd-notify/dev/index.html[Quarkus Systemd Notify Extension] as part of your application, with:
 
 :add-extension-extensions: io.quarkiverse.systemd.notify:quarkus-systemd-notify
 include::{includes}/devtools/extension-add.adoc[]