Copy all surefire reports to the uploaded archive.

Signed-off-by: James R. Perkins <jperkins@redhat.com>
resteasy · Aug 9, 2023 · 1806048 · 1806048
1 parent b0e68f8
commit 1806048
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml
@@ -35,7 +35,7 @@ jobs:
         if: failure()
         with:
           name: surefire-reports
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/'
       - name: Upload server logs
         uses: actions/upload-artifact@v3
         if: failure()

diff --git a/.github/workflows/manual-wildfly-build.yml b/.github/workflows/manual-wildfly-build.yml
@@ -61,7 +61,7 @@ jobs:
         if: failure()
         with:
           name: surefire-reports
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/'
       - name: Upload server logs
         uses: actions/upload-artifact@v3
         if: failure()

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -75,7 +75,7 @@ jobs:
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/'
       - uses: actions/upload-artifact@v3
         if: failure()
         with:
@@ -109,7 +109,7 @@ jobs:
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/'
       - uses: actions/upload-artifact@v3
         if: failure()
         with:

diff --git a/.github/workflows/wildfly-build.yml b/.github/workflows/wildfly-build.yml
@@ -68,7 +68,7 @@ jobs:
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/'
       - name: Upload server logs
         uses: actions/upload-artifact@v3
         if: failure()
@@ -111,7 +111,7 @@ jobs:
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/'
       - uses: actions/upload-artifact@v3
         if: failure()
         with:

diff --git a/resteasy-core-spi/src/main/java/org/jboss/resteasy/spi/config/Options.java b/resteasy-core-spi/src/main/java/org/jboss/resteasy/spi/config/Options.java
@@ -23,6 +23,7 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import org.jboss.resteasy.resteasy_jaxrs.i18n.LogMessages;
 import org.jboss.resteasy.spi.util.Functions;
 
 /**
@@ -126,8 +127,17 @@ protected static <T> T getProperty(final String name, final Class<T> returnType,
     }
 
     private static <T> Optional<T> getProperty(final String name, final Class<T> returnType) {
-        return ConfigurationFactory.getInstance()
-                .getConfiguration()
-                .getOptionalValue(name, returnType);
+        // If the MicroProfile Config is available, we might not have Converters for these types. If an error occurs
+        // attempting to get the value, log it, but return an empty optional.
+        try {
+            return ConfigurationFactory.getInstance()
+                    .getConfiguration()
+                    .getOptionalValue(name, returnType);
+        } catch (SecurityException e) {
+            throw e;
+        } catch (Exception e) {
+            LogMessages.LOGGER.tracef(e, "Failed to get property for %s of type %s.", name, returnType);
+        }
+        return Optional.empty();
     }
 }