1.8.0 backports 2

.github/dependabot.yml

@@ -117,6 +117,7 @@ updates:
       - dependency-name: com.amazon.alexa:ask-sdk-apache-client
       # Apache Commons
       - dependency-name: commons-io:commons-io
+      - dependency-name: com.thoughtworks.xstream:xstream
     rebase-strategy: disabled
   - package-ecosystem: gradle
     directory: "/integration-tests/gradle"

bom/application/pom.xml

@@ -123,7 +123,7 @@
         <rest-assured.version>4.3.0</rest-assured.version>
         <junit.jupiter.version>5.6.2</junit.jupiter.version>
         <testng.version>6.14.2</testng.version>
-        <assertj.version>3.17.1</assertj.version>
+        <assertj.version>3.17.2</assertj.version>
         <json-smart.version>2.3</json-smart.version>
         <infinispan.version>11.0.3.Final</infinispan.version>
         <infinispan.protostream.version>4.3.3.Final</infinispan.protostream.version>
@@ -144,7 +144,7 @@
         <aws-lambda-java-events.version>3.2.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.4.0</aws-xray.version>
-        <awssdk.version>2.14.11</awssdk.version>
+        <awssdk.version>2.14.12</awssdk.version>
         <aws-alexa-sdk.version>2.33.0</aws-alexa-sdk.version>
         <azure-functions-java-library.version>1.3.0</azure-functions-java-library.version>
         <kotlin.version>1.3.72</kotlin.version>
@@ -4411,52 +4411,52 @@
 
             <!-- Micrometer -->
             <dependency>
-              <groupId>org.threeten</groupId>
-              <artifactId>threetenbp</artifactId>
-              <version>${threetenbp.version}</version>
+                <groupId>org.threeten</groupId>
+                <artifactId>threetenbp</artifactId>
+                <version>${threetenbp.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.micrometer</groupId>
-              <artifactId>micrometer-core</artifactId>
-              <version>${micrometer.version}</version>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-core</artifactId>
+                <version>${micrometer.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.micrometer</groupId>
-              <artifactId>micrometer-registry-datadog</artifactId>
-              <version>${micrometer.version}</version>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-registry-datadog</artifactId>
+                <version>${micrometer.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.micrometer</groupId>
-              <artifactId>micrometer-registry-jmx</artifactId>
-              <version>${micrometer.version}</version>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-registry-jmx</artifactId>
+                <version>${micrometer.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.micrometer</groupId>
-              <artifactId>micrometer-registry-prometheus</artifactId>
-              <version>${micrometer.version}</version>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-registry-prometheus</artifactId>
+                <version>${micrometer.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.micrometer</groupId>
-              <artifactId>micrometer-registry-stackdriver</artifactId>
-              <version>${micrometer.version}</version>
-              <exclusions>
-                  <exclusion>
-                      <groupId>commons-logging</groupId>
-                      <artifactId>commons-logging</artifactId>
-                  </exclusion>
-                  <exclusion>
-                      <groupId>javax.annotation</groupId>
-                      <artifactId>javax.annotation-api</artifactId>
-                  </exclusion>
-                  <exclusion>
-                      <groupId>org.checkerframework</groupId>
-                      <artifactId>checker-qual</artifactId>
-                  </exclusion>
-                  <exclusion>
-                      <groupId>com.google.j2objc</groupId>
-                      <artifactId>j2objc-annotations</artifactId>
-                  </exclusion>
-              </exclusions>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-registry-stackdriver</artifactId>
+                <version>${micrometer.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>javax.annotation-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.checkerframework</groupId>
+                        <artifactId>checker-qual</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.google.j2objc</groupId>
+                        <artifactId>j2objc-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- Picocli -->

bom/test/pom.xml

@@ -16,7 +16,7 @@
     <description>Dependency management for integration tests. Importable by third party extension developers.</description>
 
     <properties>
-        <debezium.version>1.2.2.Final</debezium.version>
+        <debezium.version>1.2.3.Final</debezium.version>
         <testcontainers.version>1.14.3</testcontainers.version>
     </properties>
 

core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java

@@ -129,8 +129,7 @@ public static void extractDevModeClasses(Path appRoot, AppModel appModel, PostEx
                 //not all local projects are dependencies
                 continue;
             }
-            IoUtils.recursiveDelete(moduleClasses);
-            Files.createDirectories(moduleClasses);
+            IoUtils.recursiveDeleteAndThenCreate(moduleClasses);
             for (Path p : dep.getPaths()) {
                 if (Files.isDirectory(p)) {
                     Path moduleTarget = moduleClasses;

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java

@@ -38,8 +38,7 @@ public class AppCDSBuildStep {
     public void requested(OutputTargetBuildItem outputTarget, BuildProducer<AppCDSRequestedBuildItem> producer)
             throws IOException {
         Path appCDSDir = outputTarget.getOutputDirectory().resolve("appcds");
-        IoUtils.recursiveDelete(appCDSDir);
-        Files.createDirectories(appCDSDir);
+        IoUtils.recursiveDeleteAndThenCreate(appCDSDir);
 
         producer.produce(new AppCDSRequestedBuildItem(outputTarget.getOutputDirectory().resolve("appcds")));
     }

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java

@@ -414,8 +414,7 @@ private JarBuildItem buildLegacyThinJar(CurateOutcomeBuildItem curateOutcomeBuil
                 .resolve(outputTargetBuildItem.getBaseName() + packageConfig.runnerSuffix + ".jar");
         Path libDir = outputTargetBuildItem.getOutputDirectory().resolve("lib");
         Files.deleteIfExists(runnerJar);
-        IoUtils.recursiveDelete(libDir);
-        Files.createDirectories(libDir);
+        IoUtils.recursiveDeleteAndThenCreate(libDir);
 
         try (FileSystem runnerZipFs = ZipUtils.newZip(runnerJar)) {
 
@@ -464,8 +463,7 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
             userProviders = buildDir.resolve(packageConfig.userProvidersDirectory.get());
         }
         if (!rebuild) {
-            IoUtils.recursiveDelete(buildDir);
-            Files.createDirectories(buildDir);
+            IoUtils.recursiveDeleteAndThenCreate(buildDir);
             Files.createDirectories(mainLib);
             Files.createDirectories(baseLib);
             Files.createDirectories(appDir);
@@ -477,8 +475,7 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
                 Files.createFile(userProviders.resolve(".keep"));
             }
         } else {
-            IoUtils.recursiveDelete(quarkus);
-            Files.createDirectories(quarkus);
+            IoUtils.recursiveDeleteAndThenCreate(quarkus);
         }
         Map<AppArtifactKey, List<Path>> copiedArtifacts = new HashMap<>();
 
@@ -712,8 +709,7 @@ public NativeImageSourceJarBuildItem buildNativeImageJar(CurateOutcomeBuildItem
             List<UberJarRequiredBuildItem> uberJarRequired) throws Exception {
         Path targetDirectory = outputTargetBuildItem.getOutputDirectory()
                 .resolve(outputTargetBuildItem.getBaseName() + "-native-image-source-jar");
-        IoUtils.recursiveDelete(targetDirectory);
-        Files.createDirectories(targetDirectory);
+        IoUtils.recursiveDeleteAndThenCreate(targetDirectory);
 
         List<GeneratedClassBuildItem> allClasses = new ArrayList<>(generatedClasses);
         allClasses.addAll(nativeImageResources.stream()

core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java

@@ -1,5 +1,7 @@
 package io.quarkus.deployment.steps;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,6 +24,7 @@
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 
+import io.quarkus.bootstrap.BootstrapDebug;
 import io.quarkus.bootstrap.classloading.ClassPathElement;
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.deployment.QuarkusClassWriter;
@@ -77,7 +80,7 @@ TransformedClassesBuildItem handleClassTransformation(List<BytecodeTransformerBu
                     ClassPathElement classPathElement = archives.get(0);
                     Path jar = classPathElement.getRoot();
                     if (jar == null) {
-                        log.warnf("Cannot transform %s as it's containing application archive could not be found.",
+                        log.warnf("Cannot transform %s as its containing application archive could not be found.",
                                 entry.getKey());
                         continue;
                     }
@@ -104,15 +107,30 @@ public TransformedClassesBuildItem.TransformedClass call() throws Exception {
                                     visitor = i.apply(className, visitor);
                                 }
                                 cr.accept(visitor, 0);
-                                return new TransformedClassesBuildItem.TransformedClass(className, writer.toByteArray(),
+                                byte[] data = writer.toByteArray();
+                                if (BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR != null) {
+                                    File debugPath = new File(BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR);
+                                    if (!debugPath.exists()) {
+                                        debugPath.mkdir();
+                                    }
+                                    File classFile = new File(debugPath, className.replace(".", "/") + ".class");
+                                    classFile.getParentFile().mkdirs();
+                                    try (FileOutputStream classWriter = new FileOutputStream(classFile)) {
+                                        classWriter.write(data);
+                                    } catch (Exception e) {
+                                        log.errorf(e, "Failed to write transformed class %s", className);
+                                    }
+                                    log.infof("Wrote transformed class to %s", classFile.getAbsolutePath());
+                                }
+                                return new TransformedClassesBuildItem.TransformedClass(className, data,
                                         classFileName, eager.contains(className));
                             } finally {
                                 Thread.currentThread().setContextClassLoader(old);
                             }
                         }
                     }));
                 } else {
-                    log.warnf("Cannot transform %s as it's containing application archive could not be found.",
+                    log.warnf("Cannot transform %s as its containing application archive could not be found.",
                             entry.getKey());
                 }
             }

core/launcher/src/main/java/io/quarkus/launcher/JBangIntegration.java

@@ -40,7 +40,7 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
 
                         @Override
                         protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-                            if (name.startsWith("org.")) {
+                            if (name.startsWith("org.") && !(name.startsWith("org.xml.") || name.startsWith("org.w3c."))) {
                                 //jbang has some but not all of the maven resolver classes we need on its
                                 //class path. These all start with org. so we filter them out to make sure
                                 //we get a complete class path
@@ -51,7 +51,7 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
 
                         @Override
                         public URL getResource(String name) {
-                            if (name.startsWith("org/")) {
+                            if (name.startsWith("org/") && !(name.startsWith("org/xml/") || name.startsWith("org/w3c/"))) {
                                 //jbang has some but not all of the maven resolver classes we need on its
                                 //class path. These all start with org. so we filter them out to make sure
                                 //we get a complete class path
@@ -62,7 +62,7 @@ public URL getResource(String name) {
 
                         @Override
                         public Enumeration<URL> getResources(String name) throws IOException {
-                            if (name.startsWith("org/")) {
+                            if (name.startsWith("org/") && !(name.startsWith("org/xml/") || name.startsWith("org/w3c/"))) {
                                 //jbang has some but not all of the maven resolver classes we need on its
                                 //class path. These all start with org. so we filter them out to make sure
                                 //we get a complete class path

core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigDoItemFinder.java

@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -216,7 +217,8 @@ private List<ConfigDocItem> recursivelyFindConfigItems(Element element, String r
                     DeclaredType declaredType = (DeclaredType) typeMirror;
                     TypeElement typeElement = (TypeElement) declaredType.asElement();
                     Name qualifiedName = typeElement.getQualifiedName();
-                    optional = qualifiedName.toString().startsWith(Optional.class.getName());
+                    optional = qualifiedName.toString().startsWith(Optional.class.getName())
+                            || qualifiedName.contentEquals(Map.class.getName());
                     list = qualifiedName.contentEquals(List.class.getName())
                             || qualifiedName.contentEquals(Set.class.getName());
 
@@ -286,6 +288,8 @@ private List<ConfigDocItem> recursivelyFindConfigItems(Element element, String r
                                 defaultValue = hyphenateEnumValue(defaultValue);
                             }
                             acceptedValues = extractEnumValues(declaredType, useHyphenateEnumValue);
+                        } else if (isDurationType(declaredType) && !defaultValue.isEmpty()) {
+                            defaultValue = DocGeneratorUtil.normalizeDurationValue(defaultValue);
                         }
                     }
                 }
@@ -360,6 +364,10 @@ private boolean isEnumType(TypeMirror realTypeMirror) {
                 && ((DeclaredType) realTypeMirror).asElement().getKind() == ElementKind.ENUM;
     }
 
+    private boolean isDurationType(TypeMirror realTypeMirror) {
+        return realTypeMirror.toString().equals(Duration.class.getName());
+    }
+
     /**
      * Scan or parse configuration items of a given configuration group.
      * <p>

core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtil.java

@@ -257,6 +257,17 @@ static String hyphenateEnumValue(String orig) {
         return target.toString();
     }
 
+    static String normalizeDurationValue(String value) {
+        if (!value.isEmpty() && Character.isDigit(value.charAt(value.length() - 1))) {
+            try {
+                value = Integer.parseInt(value) + "S";
+            } catch (NumberFormatException ignore) {
+            }
+        }
+        value = value.toUpperCase(Locale.ROOT);
+        return value;
+    }
+
     static String joinAcceptedValues(List<String> acceptedValues) {
         if (acceptedValues == null || acceptedValues.isEmpty()) {
             return "";

core/processor/src/test/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtilTest.java

@@ -9,6 +9,7 @@
 import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.computeExtensionDocFileName;
 import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.deriveConfigRootName;
 import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.getJavaDocSiteLink;
+import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.normalizeDurationValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigInteger;
@@ -354,4 +355,16 @@ public void derivingConfigRootNameTestCase() {
         actual = deriveConfigRootName(simpleClassName, ConfigPhase.BUILD_TIME);
         assertEquals("quarkus.root-name", actual);
     }
+
+    @Test
+    public void normalizeDurationValueTest() {
+        assertEquals("", normalizeDurationValue(""));
+        assertEquals("1S", normalizeDurationValue("1"));
+        assertEquals("1S", normalizeDurationValue("1S"));
+        assertEquals("1S", normalizeDurationValue("1s"));
+
+        // values are not validated here
+        assertEquals("1_000", normalizeDurationValue("1_000"));
+        assertEquals("FOO", normalizeDurationValue("foo"));
+    }
 }

core/runtime/src/main/java/io/quarkus/runtime/Application.java

@@ -228,16 +228,15 @@ public void awaitShutdown() {
         stateLock.lock();
         try {
             for (;;) {
-                switch (state) {
-                    case ST_STOPPED:
-                        return; // all good
-                    default:
-                        try {
-                            stateCond.await();
-                        } catch (InterruptedException e) {
-                            Thread.currentThread().interrupt();
-                            throw interruptedOnAwaitStop();
-                        }
+                if (state == ST_STOPPED) {
+                    return; // all good
+                } else {
+                    try {
+                        stateCond.await();
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        throw interruptedOnAwaitStop();
+                    }
                 }
             }
         } finally {