2.2.2 backports 1

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

@@ -178,9 +178,10 @@ jobs:
         uses: actions/upload-artifact@v2
         if: ${{ failure() || cancelled() }}
         with:
-          name: "build-reports-JVM Tests - JDK ${{matrix.java.name}}"
+          name: "build-reports-Initial JDK 11 Build"
           path: |
             target/build-report.json
+            LICENSE.txt
           retention-days: 2
 
   calculate-test-jobs:
@@ -322,6 +323,7 @@ jobs:
           path: |
             **/target/*-reports/TEST-*.xml
             target/build-report.json
+            LICENSE.txt
           retention-days: 2
       - name: Upload gc.log
         uses: actions/upload-artifact@v2
@@ -388,6 +390,7 @@ jobs:
           path: |
             **/target/*-reports/TEST-*.xml
             target/build-report.json
+            LICENSE.txt
           retention-days: 2
 
   gradle-tests:
@@ -447,6 +450,7 @@ jobs:
             **/build/test-results/test/TEST-*.xml
             **/target/*-reports/TEST-*.xml
             target/build-report.json
+            LICENSE.txt
           retention-days: 2
 
   devtools-tests:
@@ -506,6 +510,7 @@ jobs:
           path: |
             **/target/*-reports/TEST-*.xml
             target/build-report.json
+            LICENSE.txt
           retention-days: 2
 
   tcks-test:
@@ -564,6 +569,7 @@ jobs:
           path: |
             **/target/*-reports/TEST-*.xml
             target/build-report.json
+            LICENSE.txt
           retention-days: 2
 
   native-tests:
@@ -643,4 +649,5 @@ jobs:
             **/target/*-reports/TEST-*.xml
             **/build/test-results/test/TEST-*.xml
             target/build-report.json
+            LICENSE.txt
           retention-days: 2

bom/application/pom.xml

@@ -47,14 +47,14 @@
         <smallrye-health.version>3.1.1</smallrye-health.version>
         <smallrye-metrics.version>3.0.1</smallrye-metrics.version>
         <smallrye-open-api.version>2.1.10</smallrye-open-api.version>
-        <smallrye-graphql.version>1.3.1</smallrye-graphql.version>
+        <smallrye-graphql.version>1.3.2</smallrye-graphql.version>
         <smallrye-opentracing.version>2.0.1</smallrye-opentracing.version>
         <smallrye-fault-tolerance.version>5.2.1</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>3.2.1</smallrye-jwt.version>
         <smallrye-context-propagation.version>1.2.0</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
         <smallrye-reactive-types-converter.version>2.6.0</smallrye-reactive-types-converter.version>
-        <smallrye-mutiny-vertx-binding.version>2.12.0</smallrye-mutiny-vertx-binding.version>
+        <smallrye-mutiny-vertx-binding.version>2.13.0</smallrye-mutiny-vertx-binding.version>
         <smallrye-reactive-messaging.version>3.9.1</smallrye-reactive-messaging.version>
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
@@ -110,7 +110,7 @@
         <wildfly-elytron.version>1.16.1.Final</wildfly-elytron.version>
         <jboss-modules.version>1.8.7.Final</jboss-modules.version>
         <jboss-threads.version>3.4.2.Final</jboss-threads.version>
-        <vertx.version>4.1.2</vertx.version>
+        <vertx.version>4.1.3</vertx.version>
         <httpclient.version>4.5.13</httpclient.version>
         <httpcore.version>4.4.14</httpcore.version>
         <httpasync.version>4.1.4</httpasync.version>
@@ -121,7 +121,7 @@
         <mariadb-jdbc.version>2.7.4</mariadb-jdbc.version>
         <mysql-jdbc.version>8.0.26</mysql-jdbc.version>
         <mssql-jdbc.version>7.2.2.jre8</mssql-jdbc.version>
-        <oracle-jdbc.version>21.1.0.0</oracle-jdbc.version>
+        <oracle-jdbc.version>21.3.0.0</oracle-jdbc.version>
         <derby-jdbc.version>10.14.2.0</derby-jdbc.version>
         <db2-jdbc.version>11.5.6.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
@@ -132,7 +132,7 @@
         <infinispan.version>12.1.7.Final</infinispan.version>
         <infinispan.protostream.version>4.4.1.Final</infinispan.protostream.version>
         <caffeine.version>2.9.2</caffeine.version>
-        <netty.version>4.1.65.Final</netty.version>
+        <netty.version>4.1.67.Final</netty.version>
         <reactive-streams.version>1.0.3</reactive-streams.version>
         <jboss-logging.version>3.4.2.Final</jboss-logging.version>
         <mutiny.version>1.0.0</mutiny.version>
@@ -170,14 +170,14 @@
         <okhttp.version>3.14.9</okhttp.version>
         <sentry.version>5.0.1</sentry.version>
         <hibernate-quarkus-local-cache.version>0.1.0</hibernate-quarkus-local-cache.version>
-        <kubernetes-client.version>5.7.0</kubernetes-client.version>
+        <kubernetes-client.version>5.7.2</kubernetes-client.version>
         <flapdoodle.mongo.version>2.2.0</flapdoodle.mongo.version>
         <quarkus-spring-api.version>5.2.SP4</quarkus-spring-api.version>
         <quarkus-spring-data-api.version>2.1.SP2</quarkus-spring-data-api.version>
         <quarkus-spring-security-api.version>5.2.Final</quarkus-spring-security-api.version>
         <quarkus-spring-boot-api.version>2.1.SP1</quarkus-spring-boot-api.version>
         <mockito.version>3.11.2</mockito.version>
-        <jna.version>5.3.1</jna.version><!-- should satisfy both testcontainers and mongodb -->
+        <jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
         <antlr.version>4.8</antlr.version>
         <quarkus-security.version>1.1.4.Final</quarkus-security.version>
         <keycloak.version>14.0.0</keycloak.version>
@@ -353,6 +353,15 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Oracle JDBC driver -->
+            <dependency>
+                <groupId>com.oracle.database.jdbc</groupId>
+                <artifactId>ojdbc-bom</artifactId>
+                <version>${oracle-jdbc.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <!-- Mutiny and Vert.x Mutiny Binding BOMs -->
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
@@ -1608,6 +1617,11 @@
                 <artifactId>quarkus-mailer</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-mailer-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-mongodb-client</artifactId>
@@ -4489,11 +4503,6 @@
                 <artifactId>mssql-jdbc</artifactId>
                 <version>${mssql-jdbc.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.oracle.database.jdbc</groupId>
-                <artifactId>ojdbc8</artifactId>
-                <version>${oracle-jdbc.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.elasticsearch.client</groupId>
                 <artifactId>elasticsearch-rest-client</artifactId>

core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.java

@@ -0,0 +1,41 @@
+package io.quarkus.deployment.builditem.nativeimage;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * A build item that allows extension to configure the native-image compiler to effectively
+ * ignore certain configuration files in specific jars.
+ *
+ * The {@code jarFile} property specifies the name of the jar file or a regular expression that can be used to
+ * match multiple jar files.
+ * Matching jar files using regular expressions should be done as a last resort.
+ *
+ * The {@code resourceName} property specifies the name of the resource file or a regular expression that can be used to
+ * match multiple resource files.
+ * For the match to work, the resources need to be part of the matched jar file(s) (see {@code jarFile}).
+ * Matching resource files using regular expressions should be done as a last resort.
+ *
+ * See https://github.com/oracle/graal/pull/3179 for more details.
+ */
+public final class ExcludeConfigBuildItem extends MultiBuildItem {
+
+    private final String jarFile;
+    private final String resourceName;
+
+    public ExcludeConfigBuildItem(String jarFile, String resourceName) {
+        this.jarFile = jarFile;
+        this.resourceName = resourceName;
+    }
+
+    public ExcludeConfigBuildItem(String jarFile) {
+        this(jarFile, "/META-INF/native-image/native-image\\.properties");
+    }
+
+    public String getJarFile() {
+        return jarFile;
+    }
+
+    public String getResourceName() {
+        return resourceName;
+    }
+}

core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathAggregateBuildItem.java

@@ -0,0 +1,21 @@
+package io.quarkus.deployment.builditem.nativeimage;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Do not use directly: use {@see io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathBuildItem}
+ * instead.
+ */
+public final class NativeImageAllowIncompleteClasspathAggregateBuildItem extends SimpleBuildItem {
+
+    private final boolean allow;
+
+    public NativeImageAllowIncompleteClasspathAggregateBuildItem(boolean allow) {
+        this.allow = allow;
+    }
+
+    public boolean isAllow() {
+        return allow;
+    }
+
+}

core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathBuildItem.java

@@ -0,0 +1,32 @@
+package io.quarkus.deployment.builditem.nativeimage;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * If any build item of this type is produced, the native-image build tool
+ * will run with {@literal --allow-incomplete-classpath} set.
+ * <p>
+ * This should be strongly discouraged as it makes diagnostics of any issue
+ * much more complex, and we have it seen affect error message of code
+ * seemingly unrelated to the code which is having the broken classpath.
+ * <p>
+ * Use of this build item will trigger a warning during build.
+ *
+ * @Deprecated Please don't use it unless there is general consensus that we can't practically find a better solution.
+ */
+@Deprecated
+public final class NativeImageAllowIncompleteClasspathBuildItem extends MultiBuildItem {
+
+    private final String extensionName;
+
+    /**
+     * @param extensionName Name the extension requiring this, so that it can be shamed appropriately during build.
+     */
+    public NativeImageAllowIncompleteClasspathBuildItem(String extensionName) {
+        this.extensionName = extensionName;
+    }
+
+    public String getExtensionName() {
+        return extensionName;
+    }
+}