Merge pull request #23426 from gsmet/2.7.1-backports-2

2.7.1 backports 2
quarkusio · Feb 4, 2022 · 20eff2b · 20eff2b
2 parents 4cc1e87 + 5374b56
commit 20eff2b
Show file tree

Hide file tree

Showing 171 changed files with 4,154 additions and 2,025 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -90,7 +90,8 @@
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-codec.version>1.15</commons-codec.version>
         <classmate.version>1.5.1</classmate.version>
-        <hibernate-orm.version>5.6.5.Final</hibernate-orm.version>
+        <hibernate-orm.version>5.6.5.Final</hibernate-orm.version> <!-- When updating, align bytebuddy.version to Hibernate needs as well (just below): -->
+        <bytebuddy.version>1.12.7</bytebuddy.version> <!-- Version controlled by Hibernate ORM's needs -->
         <hibernate-reactive.version>1.1.2.Final</hibernate-reactive.version>
         <hibernate-validator.version>6.2.1.Final</hibernate-validator.version>
         <hibernate-search.version>6.1.0.Final</hibernate-search.version>
@@ -117,7 +118,7 @@
         <cronutils.version>9.1.6</cronutils.version>
         <quartz.version>2.3.2</quartz.version>
         <h2.version>1.4.197</h2.version>  <!-- keep 1.4.197 as newer versions have severe regressions -->
-        <postgresql-jdbc.version>42.3.1</postgresql-jdbc.version>
+        <postgresql-jdbc.version>42.3.2</postgresql-jdbc.version>
         <mariadb-jdbc.version>2.7.5</mariadb-jdbc.version>
         <mysql-jdbc.version>8.0.28</mysql-jdbc.version>
         <mssql-jdbc.version>7.2.2.jre8</mssql-jdbc.version>
@@ -787,6 +788,16 @@
                 <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-token-propagation-reactive</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-token-propagation-reactive-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-oidc-common</artifactId>
@@ -2683,6 +2694,15 @@
 
             <!-- External dependencies -->
 
+            <!-- Normally controlled by Hibernate ORM upstream,
+                but making the version of ByteBuddy explicit so that this BOM can control the version
+                in case of conflicts with other libraries -->
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${bytebuddy.version}</version>
+            </dependency>
+
             <!-- GRPC dependency -->
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java
@@ -68,6 +68,7 @@ public enum Feature {
     OIDC_CLIENT_FILTER,
     OIDC_CLIENT_REACTIVE_FILTER,
     OIDC_TOKEN_PROPAGATION,
+    OIDC_TOKEN_PROPAGATION_REACTIVE,
     OPENSHIFT_CLIENT,
     OPENTELEMETRY,
     OPENTELEMETRY_JAEGER_EXPORTER,

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/MockedThroughWrapper.java b/core/runtime/src/main/java/io/quarkus/runtime/MockedThroughWrapper.java
@@ -0,0 +1,11 @@
+package io.quarkus.runtime;
+
+/**
+ * Usually, QuarkusMock mocking replaces a "delegating instance" of a client proxy.
+ *
+ * In some cases, e.g. for REST Client Reactive, a CDI bean is a wrapper over a delegate.
+ * This interface allows to replace the delegate instead of the delegating instance of the proxy.
+ */
+public interface MockedThroughWrapper {
+    void setMock(Object mock);
+}
diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml
@@ -1475,6 +1475,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-oidc-token-propagation-reactive</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-openshift</artifactId>

diff --git a/devtools/cli/distribution/jreleaser.yml b/devtools/cli/distribution/jreleaser.yml
@@ -8,6 +8,7 @@ project:
   authors:
     - Quarkus Community
   license: Apache-2.0
+  licenseUrl: https://github.com/quarkusio/quarkus/blob/main/LICENSE.txt
   copyright: Quarkus contributors
   java:
     groupId: io.quarkus

diff --git a/devtools/cli/distribution/release-cli.sh b/devtools/cli/distribution/release-cli.sh
@@ -6,6 +6,13 @@ then
     exit 1
 fi
 
+BRANCH=$2
+if [ -z "$BRANCH" ]
+then
+    echo "Must specify Quarkus branch"
+    exit 1
+fi
+
 DIST_DIR="$( dirname "${BASH_SOURCE[0]}" )"
 pushd ${DIST_DIR}
 
@@ -35,9 +42,10 @@ tar -zcf ${JAVA_BINARY_DIR}.tar.gz ${JAVA_BINARY_DIR}
 popd
 
 export JRELEASER_PROJECT_VERSION=${VERSION}
-export JRELEASER_BRANCH=main
+export JRELEASER_BRANCH=${BRANCH}
+export JRELEASER_CHOCOLATEY_GITHUB_BRANCH=${BRANCH}
 
-jbang jreleaser@jreleaser full-release \
+jbang org.jreleaser:jreleaser:1.0.0-M1 full-release \
   --git-root-search \
   -od target
 

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java
@@ -205,7 +205,10 @@ public void execute(Task test) {
                                 quarkusGenerateCodeTests);
                         task.setQuarkusDevConfiguration(devModeConfiguration);
                     });
-                    quarkusRemoteDev.configure(task -> task.dependsOn(classesTask, resourcesTask));
+                    quarkusRemoteDev.configure(task -> {
+                        task.dependsOn(classesTask, resourcesTask);
+                        task.setQuarkusDevConfiguration(devModeConfiguration);
+                    });
                     quarkusTest.configure(task -> {
                         task.dependsOn(classesTask, resourcesTask, testClassesTask, testResourcesTask,
                                 quarkusGenerateCode,