Merge branch 'integration/uplift-2025' into metadataRename

Author: richardelms

Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 gem 'bugsnag-maze-runner', '~>9.0'
 gem 'os'
+# Pin power_assert to avoid compatibility issues with test-unit
+gem 'power_assert', '< 3.0.0'

bugsnag-spring/build.gradle

@@ -0,0 +1,50 @@
+plugins {
+    `java-library`
+}
+
+repositories {
+    mavenCentral()
+}
+
+java {
+    withJavadocJar()
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+val sourceJar by tasks.registering(Jar::class) {
+    from(sourceSets.main.get().allJava)
+}
+
+// do not move this higher - sourceJar must be registered before we apply common.gradle.kts
+apply(from = "../common.gradle.kts")
+
+dependencies {
+    implementation(project(":bugsnag"))
+
+    implementation(libs.logback.core)
+    implementation(libs.slf4j.api)
+
+    implementation(libs.jakarta.servlet.api)
+    implementation(libs.spring.webmvc)
+    implementation(libs.springBoot3.boot)
+    implementation(libs.spring.aop)
+
+    testImplementation(project(":bugsnag").dependencyProject.sourceSets["test"].output)
+    testImplementation(project(":bugsnag"))
+    testImplementation(libs.junit)
+    testImplementation(libs.springBoot3.starter.test)
+    testImplementation(libs.springBoot3.starter.web)
+    testImplementation(libs.junit.jupiter)
+    testCompileOnly(libs.mockito.core.legacy)
+}
+
+/** ---- Publishing config ----
+ * Pulls in publishing+signing rules from the shared release.gradle.kts.
+ * This will create tasks like:
+ *   :bugsnag:publishMavenJavaPublicationToTestRepository
+ *   :bugsnag:publishMavenJavaPublicationToOssrhStagingRepository
+ */
+apply(from = "${rootProject.projectDir}/release.gradle.kts")
+

bugsnag-spring/build.gradle.kts

@@ -0,0 +1,57 @@
+plugins {
+    alias(libs.plugins.license)
+    `java-library`
+}
+
+apply(from = "../common.gradle.kts")
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    api(libs.jackson.databind)
+    api(libs.slf4j.api)
+    compileOnly(libs.jakarta.servlet.api)
+    compileOnly(libs.logback.classic) {
+        exclude(group = "org.slf4j")
+    }
+
+    testImplementation(libs.junit)
+    testImplementation(libs.log4j.over.slf4j)
+    testImplementation(libs.jakarta.servlet.api)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.logback.classic) {
+        exclude(group = "org.slf4j")
+    }
+}
+
+// license checking
+configure<nl.javadude.gradle.plugins.license.LicenseExtension> {
+    header = rootProject.file("LICENSE")
+    isIgnoreFailures = true
+}
+
+tasks.named("downloadLicenses") {
+    // Note: dependencyConfiguration property needs to be set through the plugin's DSL
+    // This may require checking the plugin documentation for Kotlin DSL syntax
+}
+
+java {
+    withJavadocJar()
+}
+
+/** ---- Publishing config ----
+ * Pulls in publishing+signing rules from the shared release.gradle.kts.
+ * This will create tasks like:
+ *   :bugsnag:publishMavenJavaPublicationToTestRepository
+ *   :bugsnag:publishMavenJavaPublicationToOssrhStagingRepository
+ */
+apply(from = "${rootProject.projectDir}/release.gradle.kts")
+

bugsnag/build.gradle

@@ -8,14 +8,15 @@ buildscript {
 }
 
 gradle.projectsEvaluated {
-    tasks.withType(JavaCompile) {
+    tasks.withType<JavaCompile>().configureEach {
         // fail build on warnings, disable options complaining about Java 6 compatibility when building with JDK 7+
-        options.compilerArgs << "-Xlint:all" << "-Werror" << "-Xlint:-options"
+        options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror", "-Xlint:-options"))
     }
 }
 
-tasks.register('publishToTestRepoAll') {
-    dependsOn subprojects.collect {
-        tasks.findByPath("${it.path}:publishAllPublicationsToTestRepository") ?: []
-    }.flatten()
-}
+tasks.register("publishToTestRepoAll") {
+    dependsOn(subprojects.mapNotNull {
+        tasks.findByPath("${it.path}:publishAllPublicationsToTestRepository")
+    })
+}
+

bugsnag/build.gradle.kts

@@ -0,0 +1,16 @@
+// Version catalog is now used - see gradle/libs.versions.toml
+apply(plugin = "checkstyle")
+
+if (project.hasProperty("releasing") && project.depth <= 1) {
+    apply(from = "../release.gradle.kts")
+}
+tasks.named<Test>("test") {
+    testLogging {
+        events("passed", "skipped", "failed", "standardOut", "standardError")
+    }
+}
+
+configure<org.gradle.api.plugins.quality.CheckstyleExtension> {
+    toolVersion = "8.18"
+    configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")
+}

build.gradle renamed to build.gradle.kts

@@ -9,12 +9,6 @@ services:
       dockerfile: dockerfiles/Dockerfile.java-common
     volumes:
       - .:/app
-  java8-mazerunner:
-    build:
-      context: .
-      dockerfile: dockerfiles/Dockerfile.java8-mazerunner
-    volumes:
-      - .:/app
   java17-mazerunner:
     build:
       context: .

common.gradle

@@ -9,5 +9,5 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y zip
 COPY gradlew gradle.properties /app/
 COPY gradle/ /app/gradle/
 ENV GRADLE_OPTS="-Dorg.gradle.daemon=false"
-COPY settings.gradle /app/
+COPY settings.gradle.kts /app/
 RUN ./gradlew