enforce Micronaut and other BOMs

agorapulse · Aug 11, 2023 · 01b58ba · 01b58ba
1 parent cd509aa
commit 01b58ba
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -27,7 +27,7 @@ jobs:
         cache: gradle
     - uses: gradle/gradle-command-action@v2
       with:
-        arguments: ${{ matrix.versions }}
+        arguments: ${{ matrix.versions }} --scan --parallel
     - name: Show Reports
       uses: actions/upload-artifact@v1
       if: failure()

diff --git a/gradle.properties b/gradle.properties
@@ -26,8 +26,8 @@ nexusPluginVersion=1.0.0
 
 micronautVersion = 1.3.7
 sentryVersion = 6.16.0
-log4jVersion = 2.17.1
-awsLog4jVersion = 1.3.0
+log4jVersion = 2.20.0
+awsLog4jVersion = 1.5.1
 systemLambdaVersion = 1.2.0
 gruVersion = 0.9.4
 bytebuddyVersion = 1.10.17

diff --git a/settings.gradle b/settings.gradle
@@ -48,6 +48,21 @@ buildscript {
     }
 }
 
+plugins {
+    id 'com.gradle.enterprise' version '3.6.1'
+}
+
+gradleEnterprise {
+    buildScan {
+        termsOfServiceUrl = "https://gradle.com/terms-of-service"
+        termsOfServiceAgree = "yes"
+
+        buildScanPublished { scan ->
+            file("scan-journal.log") << "${new Date()} - ${scan.buildScanId} - ${scan.buildScanUri}\n"
+        }
+    }
+}
+
 apply plugin: 'org.kordamp.gradle.settings'
 
 projects {

diff --git a/subprojects/micronaut-log4aws/micronaut-log4aws.gradle b/subprojects/micronaut-log4aws/micronaut-log4aws.gradle
@@ -28,21 +28,21 @@ config {
 dependencies {
     // rewrite("org.openrewrite.recipe:rewrite-micronaut:1.3.0")
 
-    annotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion")
-    api platform("io.micronaut:micronaut-bom:$micronautVersion")
-    testAnnotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion")
-    testImplementation platform("io.micronaut:micronaut-bom:$micronautVersion")
+    annotationProcessor enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion")
+    api enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion")
+    testAnnotationProcessor enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion")
+    testImplementation enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion")
 
-    annotationProcessor platform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
-    api platform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
-    testAnnotationProcessor platform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
-    testImplementation platform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
+    annotationProcessor enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
+    api enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
+    testAnnotationProcessor enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
+    testImplementation enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
 
     annotationProcessor "io.micronaut:micronaut-inject-java"
 
     api "io.sentry:sentry-log4j2:$sentryVersion"
     api group: 'com.amazonaws', name: 'aws-lambda-java-log4j2', version: awsLog4jVersion
-    api "org.apache.logging.log4j:log4j-slf4j18-impl:$log4jVersion"
+    api "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
     api "org.apache.logging.log4j:log4j-api:$log4jVersion"
     api "org.apache.logging.log4j:log4j-core:$log4jVersion"