Merge branch '5.8.x' into 5.9.x

micronaut-projects · Dec 13, 2024 · a16d51b · a16d51b
2 parents 13566dc + c42c2db
commit a16d51b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -160,6 +160,6 @@ jobs:
       - name: Upload assets
         # Upload the artifacts to the existing release. Note that the SLSA provenance will
         # attest to each artifact file and not the aggregated ZIP file.
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
         with:
           files: artifacts.zip
diff --git a/gcp-common/src/main/java/io/micronaut/gcp/credentials/DefaultOAuth2HttpTransportFactory.java b/gcp-common/src/main/java/io/micronaut/gcp/credentials/DefaultOAuth2HttpTransportFactory.java
@@ -56,7 +56,7 @@
  */
 @Singleton
 @Requires(classes = HttpClient.class)
-@Requires(property = GoogleCredentialsConfiguration.PREFIX + ".use-http-client", value = StringUtils.TRUE, defaultValue = StringUtils.TRUE)
+@Requires(property = GoogleCredentialsConfiguration.PREFIX + ".use-http-client", value = StringUtils.TRUE, defaultValue = StringUtils.FALSE)
 public class DefaultOAuth2HttpTransportFactory implements HttpTransportFactory {
 
     private static final Logger LOG = LoggerFactory.getLogger(DefaultOAuth2HttpTransportFactory.class);

diff --git a/.../groovy/io/micronaut/gcp/credentials/DefaultOAuth2HttpTransportFactoryDisabledSpec.groovy b/.../groovy/io/micronaut/gcp/credentials/DefaultOAuth2HttpTransportFactoryDisabledSpec.groovy
@@ -8,7 +8,6 @@ import jakarta.inject.Inject
 import spock.lang.Specification
 
 @MicronautTest
-@Property(name = "gcp.credentials.use-http-client", value = StringUtils.FALSE)
 class DefaultOAuth2HttpTransportFactoryDisabledSpec extends Specification {
 
     @Inject

diff --git a/gcp-common/src/test/groovy/io/micronaut/gcp/credentials/GoogleCredentialsFactorySpec.groovy b/gcp-common/src/test/groovy/io/micronaut/gcp/credentials/GoogleCredentialsFactorySpec.groovy
@@ -13,6 +13,7 @@ import io.micronaut.context.exceptions.BeanInstantiationException
 import io.micronaut.context.exceptions.ConfigurationException
 import io.micronaut.context.exceptions.NoSuchBeanException
 import io.micronaut.core.reflect.ReflectionUtils
+import io.micronaut.core.util.StringUtils
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.HttpStatus
 import io.micronaut.http.MediaType
@@ -275,6 +276,7 @@ class GoogleCredentialsFactorySpec extends Specification {
                 "micronaut.server.port" : 8080
         ])
         def ctx = ApplicationContext.run([
+                "gcp.credentials.use-http-client" : StringUtils.TRUE,
                 (GoogleCredentialsConfiguration.PREFIX + ".location"): serviceAccountCredentials.getPath()
         ])
         GoogleCredentials gc = ctx.getBean(GoogleCredentials)
@@ -302,6 +304,7 @@ class GoogleCredentialsFactorySpec extends Specification {
                 "micronaut.server.port" : 8080
         ])
         def ctx = ApplicationContext.run([
+                "gcp.credentials.use-http-client" : StringUtils.TRUE,
                 (GoogleCredentialsConfiguration.PREFIX + ".encoded-key"): encodedServiceAccountCredentials
         ])
         GoogleCredentials gc = ctx.getBean(GoogleCredentials)

diff --git a/gcp-logging/src/test/groovy/io/micronaut/gcp/logging/StackdriverJsonLayoutSpec.groovy b/gcp-logging/src/test/groovy/io/micronaut/gcp/logging/StackdriverJsonLayoutSpec.groovy
@@ -24,7 +24,7 @@ class StackdriverJsonLayoutSpec extends Specification {
         then:
         result['severity'] == expectedSeverity
         result['message'] == 'the message\njava.lang.IllegalArgumentException: exception message\n'
-        result['thread'] == 'main'
+        result['thread'] == 'main' || result['thread'] == 'Test worker'
         result['logger'] == this.class.canonicalName
         result['timestampSeconds'] == TimeUnit.MILLISECONDS.toSeconds(event.timeStamp)
         result['timestampNanos'] == TimeUnit.MILLISECONDS.toNanos(event.getTimeStamp() % 1_000)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME