diff --git a/annotationProcessor/build.gradle b/annotationProcessor/build.gradle index bbe720a37..27eca9555 100644 --- a/annotationProcessor/build.gradle +++ b/annotationProcessor/build.gradle @@ -34,10 +34,6 @@ repositories { } dependencies { - configurations.all { - exclude group: 'ch.qos.logback', module: 'logback-classic' - } - implementation project(path: ':underlay') implementation project(path: ':service') diff --git a/annotationProcessor/gradle.lockfile b/annotationProcessor/gradle.lockfile index 9bf9f3854..75ec2fa1f 100644 --- a/annotationProcessor/gradle.lockfile +++ b/annotationProcessor/gradle.lockfile @@ -6,6 +6,7 @@ bio.terra:terra-common-lib:1.1.22-SNAPSHOT=compileClasspath,productionRuntimeCla ch.qos.logback.contrib:logback-jackson:0.1.5=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback.contrib:logback-json-classic:0.1.5=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback.contrib:logback-json-core:0.1.5=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.5.11=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.5.11=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml-jvm:0.60.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml:0.60.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -169,6 +170,7 @@ commons-beanutils:commons-beanutils:1.9.4=checkstyle commons-codec:commons-codec:1.16.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-io:commons-io:2.16.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.3.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath info.picocli:picocli:4.7.5=checkstyle info.picocli:picocli:4.7.6=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/buildSrc/src/main/groovy/tanagra.java-conventions.gradle b/buildSrc/src/main/groovy/tanagra.java-conventions.gradle index f7c1e6f6f..188b1a590 100644 --- a/buildSrc/src/main/groovy/tanagra.java-conventions.gradle +++ b/buildSrc/src/main/groovy/tanagra.java-conventions.gradle @@ -39,13 +39,17 @@ dependencyLocking { lockAllConfigurations() } -configurations.all { - exclude group: 'commons-logging', module: 'commons-logging' -} - dependencies { // GCP BOM - See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM implementation platform('com.google.cloud:libraries-bom:26.49.0') + constraints { + // "-jre" for Java 8 or higher + implementation 'com.google.guava:guava:33.3.1-jre' + + def vGcpProtobuf = '3.25.5' + implementation "com.google.protobuf:protobuf-java:${vGcpProtobuf}" + implementation "com.google.protobuf:protobuf-java-util:${vGcpProtobuf}" + } } // Javadoc diff --git a/indexer/build.gradle b/indexer/build.gradle index 05eb55f1f..56c9ffdd5 100644 --- a/indexer/build.gradle +++ b/indexer/build.gradle @@ -25,14 +25,12 @@ repositories { dependencies { // added to address synk warnings constraints { + implementation 'org.apache.commons:commons-compress:1.26.2' + implementation 'io.netty:netty-codec-http:4.1.108.Final' implementation 'org.apache.avro:avro:1.11.4' runtimeOnly 'com.charleskorn.kaml:kaml:0.60.0' } - configurations.all { - exclude group: 'ch.qos.logback', module: 'logback-classic' - } - implementation project(':underlay') testImplementation(testFixtures(project(':underlay'))) diff --git a/indexer/gradle.lockfile b/indexer/gradle.lockfile index 8c222c7b0..3a3ec7f20 100644 --- a/indexer/gradle.lockfile +++ b/indexer/gradle.lockfile @@ -2,6 +2,8 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. args4j:args4j:2.33=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.5.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.5.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml-jvm:0.60.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml:0.60.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.18.0=compileClasspath,testCompileClasspath @@ -150,6 +152,7 @@ commons-codec:commons-codec:1.15=checkstyle,pmd,spotbugs commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath info.picocli:picocli-codegen:4.7.6=annotationProcessor info.picocli:picocli:4.7.5=checkstyle info.picocli:picocli:4.7.6=annotationProcessor,compileClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/service/build.gradle b/service/build.gradle index 01e37e2e4..38f745c2d 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -52,9 +52,15 @@ dependencyManagement { } } +configurations.all { + // excluded to avoid LoggerFactory conflicts (logback/slf4j) + exclude group: 'ch.qos.logback', module: 'logback-classic' +} + dependencies { - configurations.all { - exclude group: 'ch.qos.logback', module: 'logback-classic' + // added to address synk warnings + constraints { + implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3' } implementation project(path: ':indexer') diff --git a/service/gradle.lockfile b/service/gradle.lockfile index 536ad13a3..dca6f85d0 100644 --- a/service/gradle.lockfile +++ b/service/gradle.lockfile @@ -177,6 +177,7 @@ commons-beanutils:commons-beanutils:1.9.4=checkstyle commons-codec:commons-codec:1.16.1=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-io:commons-io:2.16.1=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.3.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath info.picocli:picocli:4.7.5=checkstyle info.picocli:picocli:4.7.6=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/ui/package-lock.json b/ui/package-lock.json index e7d7ecea3..f19e9d720 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -7769,10 +7769,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", - "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", - "license": "MIT", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", diff --git a/ui/package.json b/ui/package.json index e84774979..e7e817282 100644 --- a/ui/package.json +++ b/ui/package.json @@ -52,7 +52,6 @@ "body-parser": "^1.20.3", "braces": "^3.0.3", "cookie": "^0.7.2", - "cross-spawn": "^7.0.5", "decode-uri-component": "^0.2.2", "ejs": "^3.1.10", "express": "^4.21.1", diff --git a/underlay/gradle.lockfile b/underlay/gradle.lockfile index 6a9f3c9b4..4c194c8fe 100644 --- a/underlay/gradle.lockfile +++ b/underlay/gradle.lockfile @@ -79,6 +79,7 @@ commons-beanutils:commons-beanutils:1.9.4=checkstyle commons-codec:commons-codec:1.15=checkstyle,pmd,spotbugs commons-codec:commons-codec:1.17.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle +commons-logging:commons-logging:1.2=compileProtoPath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath info.picocli:picocli:4.7.5=checkstyle io.github.pseudomuto:protoc-gen-doc:1.5.1=protobufToolsLocator_doc io.grpc:grpc-alts:1.67.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath