Merge branch 'main' into dependabot/maven/narayana.version-5.12.0.Final

quarkusio · Jun 18, 2021 · b5feee0 · b5feee0
2 parents 8554677 + d4a513e
commit b5feee0
Show file tree

Hide file tree

Showing 344 changed files with 8,145 additions and 2,223 deletions.
diff --git a/.github/native-tests.json b/.github/native-tests.json
@@ -33,7 +33,7 @@
         {
             "category": "Data5",
             "timeout": 65,
-            "test-modules": "jpa-postgresql, narayana-stm, narayana-jta, reactive-pg-client, hibernate-reactive-postgresql",
+            "test-modules": "jpa-postgresql, jpa-postgresql-withxml, narayana-stm, narayana-jta, reactive-pg-client, hibernate-reactive-postgresql",
             "os-name": "ubuntu-latest"
         },
         {

diff --git a/.github/quarkus-bot.yml b/.github/quarkus-bot.yml
@@ -72,6 +72,7 @@ triage:
         - integration-tests/jpa-mssql/
         - integration-tests/jpa-mysql/
         - integration-tests/jpa-postgresql/
+        - integration-tests/jpa-postgresql-withxml/
         - integration-tests/jpa-without-entity/
         - integration-tests/jpa/
         - integration-tests/infinispan-cache-jpa/

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -12,6 +12,7 @@ jobs:
     if: github.repository == 'quarkusio/quarkus'
     env:
       MAVEN_OPTS: -Xmx2048m -XX:MaxMetaspaceSize=1000m
+      JBANG_REPO: $HOME/release/repository
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -27,8 +27,8 @@
         <opentracing-jdbc.version>0.2.12</opentracing-jdbc.version>
         <opentracing-kafka.version>0.1.15</opentracing-kafka.version>
         <opentracing-mongo.version>0.1.5</opentracing-mongo.version>
-        <opentelemetry.version>1.2.0</opentelemetry.version>
-        <opentelemetry-alpha.version>1.2.0-alpha</opentelemetry-alpha.version>
+        <opentelemetry.version>1.3.0</opentelemetry.version>
+        <opentelemetry-alpha.version>1.3.0-alpha</opentelemetry-alpha.version>
         <jaeger.version>1.4.0</jaeger.version>
         <quarkus-http.version>4.1.1</quarkus-http.version>
         <jboss-servlet-api_4.0_spec.version>1.0.0.Final</jboss-servlet-api_4.0_spec.version>
@@ -45,15 +45,15 @@
         <smallrye-config.version>2.3.0</smallrye-config.version>
         <smallrye-health.version>3.0.2</smallrye-health.version>
         <smallrye-metrics.version>3.0.1</smallrye-metrics.version>
-        <smallrye-open-api.version>2.1.5</smallrye-open-api.version>
-        <smallrye-graphql.version>1.2.4</smallrye-graphql.version>
+        <smallrye-open-api.version>2.1.6</smallrye-open-api.version>
+        <smallrye-graphql.version>1.2.5</smallrye-graphql.version>
         <smallrye-opentracing.version>2.0.0</smallrye-opentracing.version>
         <smallrye-fault-tolerance.version>5.1.0</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>3.2.0</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-utils.version>2.6.0</smallrye-reactive-utils.version>
-        <smallrye-reactive-messaging.version>3.4.0</smallrye-reactive-messaging.version>
+        <smallrye-reactive-messaging.version>3.5.0</smallrye-reactive-messaging.version>
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
         <jakarta.el-impl.version>3.0.3</jakarta.el-impl.version>
@@ -93,10 +93,10 @@
         <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.5.0.Final</hibernate-orm.version>
+        <hibernate-orm.version>5.5.2.Final</hibernate-orm.version>
         <hibernate-reactive.version>1.0.0.CR6</hibernate-reactive.version>
         <hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
-        <hibernate-search.version>6.0.3.Final</hibernate-search.version>
+        <hibernate-search.version>6.0.4.Final</hibernate-search.version>
         <narayana.version>5.12.0.Final</narayana.version>
         <jboss-transaction-api_1.2_spec.version>1.1.1.Final</jboss-transaction-api_1.2_spec.version>
         <agroal.version>1.11</agroal.version>
@@ -120,7 +120,7 @@
         <cronutils.version>9.1.5</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.2.20</postgresql-jdbc.version>
+        <postgresql-jdbc.version>42.2.21</postgresql-jdbc.version>
         <mariadb-jdbc.version>2.7.3</mariadb-jdbc.version>
         <mysql-jdbc.version>8.0.25</mysql-jdbc.version>
         <mssql-jdbc.version>7.2.2.jre8</mssql-jdbc.version>
@@ -150,7 +150,7 @@
         <aws-lambda-java-events.version>3.9.0</aws-lambda-java-events.version>
         <aws-lambda-serverless-java-container.version>1.3.1</aws-lambda-serverless-java-container.version>
         <aws-xray.version>2.9.1</aws-xray.version>
-        <awssdk.version>2.16.81</awssdk.version>
+        <awssdk.version>2.16.87</awssdk.version>
         <aws-alexa-sdk.version>2.39.0</aws-alexa-sdk.version>
         <azure-functions-java-library.version>1.4.2</azure-functions-java-library.version>
         <kotlin.version>1.4.32</kotlin.version>
@@ -161,9 +161,9 @@
         <awaitility.version>4.1.0</awaitility.version>
         <jboss-logmanager.version>1.0.9</jboss-logmanager.version>
         <jgit.version>5.12.0.202106070339-r</jgit.version>
-        <flyway.version>7.9.2</flyway.version>
+        <flyway.version>7.10.0</flyway.version>
         <yasson.version>1.0.9</yasson.version>
-        <liquibase.version>4.3.5</liquibase.version>
+        <liquibase.version>4.4.0</liquibase.version>
         <snakeyaml.version>1.29</snakeyaml.version>
         <osgi.version>6.0.0</osgi.version>
         <neo4j-java-driver.version>4.3.1</neo4j-java-driver.version>
@@ -182,7 +182,7 @@
         <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>
         <htmlunit.version>2.40.0</htmlunit.version>
-        <mockito.version>3.11.0</mockito.version>
+        <mockito.version>3.11.1</mockito.version>
         <jna.version>5.3.1</jna.version><!-- should satisfy both testcontainers and mongodb -->
         <antlr.version>4.8</antlr.version>
         <quarkus-security.version>1.1.4.Final</quarkus-security.version>
@@ -209,6 +209,7 @@
         <log4j2-jboss-logmanager.version>1.0.0.Final</log4j2-jboss-logmanager.version>
         <log4j-jboss-logmanager.version>1.2.0.Final</log4j-jboss-logmanager.version>
         <avro.version>1.10.2</avro.version>
+        <apicurio-registry.version>2.0.1.Final</apicurio-registry.version>
         <jacoco.version>0.8.7</jacoco.version>
         <testcontainers.version>1.15.3</testcontainers.version>
         <docker-java.version>3.2.8</docker-java.version> <!-- must be the version Testcontainers use -->
@@ -1106,6 +1107,16 @@
                 <artifactId>quarkus-avro-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-avro</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-avro-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-smallrye-health</artifactId>
@@ -2844,6 +2855,11 @@
                 <artifactId>agroal-pool</artifactId>
                 <version>${agroal.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.apicurio</groupId>
+                <artifactId>apicurio-registry-serdes-avro-serde</artifactId>
+                <version>${apicurio-registry.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>mutiny</artifactId>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -71,7 +71,7 @@
         <microprofile-opentracing-api.version>2.0</microprofile-opentracing-api.version>
         <microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>
         <microprofile-jwt-api.version>1.2</microprofile-jwt-api.version>
-        <microprofile-graphql-api.version>1.0.3</microprofile-graphql-api.version>
+        <microprofile-graphql-api.version>1.1.0</microprofile-graphql-api.version>
 
         <!-- Antlr is used by the PanacheQL parser-->
         <antlr.version>4.7.2</antlr.version>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java
@@ -102,4 +102,7 @@ public interface Capability {
 
     String VERTX = QUARKUS_PREFIX + "vertx";
     String VERTX_CORE = VERTX + ".core";
+
+    String APICURIO_REGISTRY = QUARKUS_PREFIX + "apicurio.registry";
+    String APICURIO_REGISTRY_AVRO = APICURIO_REGISTRY + ".avro";
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java
@@ -19,6 +19,7 @@ public enum Feature {
     AMAZON_SES,
     AMAZON_KMS,
     AMAZON_SSM,
+    APICURIO_REGISTRY_AVRO,
     ARTEMIS_CORE,
     ARTEMIS_JMS,
     CACHE,

diff --git a/...ment/src/main/java/io/quarkus/deployment/builditem/AdditionalIndexedClassesBuildItem.java b/...ment/src/main/java/io/quarkus/deployment/builditem/AdditionalIndexedClassesBuildItem.java
@@ -1,21 +1,20 @@
 package io.quarkus.deployment.builditem;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
 import io.quarkus.builder.item.MultiBuildItem;
 
+/**
+ * Allows extensions to add classes to the index available via {@link CombinedIndexBuildItem}
+ * The classes are loaded by the Deployment ClassLoader
+ */
 public final class AdditionalIndexedClassesBuildItem extends MultiBuildItem {
 
     private final Set<String> classesToIndex;
 
     public AdditionalIndexedClassesBuildItem(String... classesToIndex) {
-        Set<String> toIndex = new HashSet<>(classesToIndex.length);
-        for (String s : classesToIndex) {
-            toIndex.add(s);
-        }
-        this.classesToIndex = toIndex;
+        this.classesToIndex = Set.of(classesToIndex);
     }
 
     public AdditionalIndexedClassesBuildItem(String classToIndex) {

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedTestModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedTestModeMain.java
@@ -17,6 +17,7 @@
 import io.quarkus.bootstrap.app.AugmentAction;
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.runner.Timing;
+import io.quarkus.deployment.builditem.ConsoleFormatterBannerBuildItem;
 import io.quarkus.deployment.dev.testing.TestHandler;
 import io.quarkus.deployment.dev.testing.TestSetupBuildItem;
 import io.quarkus.deployment.dev.testing.TestSupport;
@@ -25,7 +26,7 @@
 import io.quarkus.dev.spi.DevModeType;
 import io.quarkus.dev.spi.HotReplacementSetup;
 import io.quarkus.runner.bootstrap.AugmentActionImpl;
-import io.quarkus.runtime.logging.LoggingSetupRecorder;
+import io.quarkus.runtime.Quarkus;
 
 /**
  * The main entry point of quarkus:test
@@ -41,6 +42,7 @@ public class IsolatedTestModeMain extends IsolatedDevModeMain {
 
     private RuntimeUpdatesProcessor setupRuntimeCompilation(DevModeContext context, Path applicationRoot)
             throws Exception {
+        System.setProperty("quarkus.test.display-test-output", "true");
         if (!context.getAllModules().isEmpty()) {
             ServiceLoader<CompilationProvider> serviceLoader = ServiceLoader.load(CompilationProvider.class);
             List<CompilationProvider> compilationProviders = new ArrayList<>();
@@ -115,7 +117,6 @@ public void accept(CuratedApplication o, Map<String, Object> params) {
                 oo.writeObject(potentialContext);
                 context = (DevModeContext) new ObjectInputStream(new ByteArrayInputStream(out.toByteArray())).readObject();
             }
-
             augmentAction = new AugmentActionImpl(curatedApplication);
             RuntimeUpdatesProcessor.INSTANCE = setupRuntimeCompilation(context, (Path) params.get(APP_ROOT));
 
@@ -125,16 +126,13 @@ public void accept(CuratedApplication o, Map<String, Object> params) {
             }
             try {
                 augmentAction.performCustomBuild(TestHandler.class.getName(), null, TestSetupBuildItem.class.getName(),
-                        LoggingSetupBuildItem.class.getName());
+                        LoggingSetupBuildItem.class.getName(), ConsoleFormatterBannerBuildItem.class.getName());
             } catch (Throwable t) {
                 //logging may not have been started, this is more reliable
                 System.err.println("Failed to start quarkus test mode");
                 t.printStackTrace();
                 System.exit(1);
             }
-            //we don't actually start the app
-            //so logging would not be enabled
-            LoggingSetupRecorder.handleFailedStart();
 
             Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
                 @Override
@@ -148,6 +146,7 @@ public void run() {
                     }
                 }
             }, "Quarkus Shutdown Thread"));
+            Quarkus.waitForExit();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/JavaCompilationProvider.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/JavaCompilationProvider.java
@@ -72,7 +72,13 @@ public void compile(Set<File> filesToCompile, Context context) {
                     compilerFlags.toList(), null, sources);
 
             if (!task.call()) {
-                throw new RuntimeException("Compilation failed" + diagnostics.getDiagnostics());
+                StringBuilder sb = new StringBuilder("\u001B[91mCompilation Failed:");
+                for (Diagnostic<? extends JavaFileObject> i : diagnostics.getDiagnostics()) {
+                    sb.append("\n");
+                    sb.append(i.toString());
+                }
+                sb.append("\u001b[0m");
+                throw new RuntimeException(sb.toString());
             }
 
             logDiagnostics(diagnostics);