Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Update constraints in java build files / Constrain lib in UI (#1060)" #1068

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Revert "Update constraints in java build files / Constrain lib in UI (#1060)" #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions annotationProcessor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ repositories {
}

dependencies {
configurations.all {
exclude group: 'ch.qos.logback', module: 'logback-classic'
}

implementation project(path: ':underlay')
implementation project(path: ':service')

Expand Down
2 changes: 2 additions & 0 deletions annotationProcessor/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 8 additions & 4 deletions buildSrc/src/main/groovy/tanagra.java-conventions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions indexer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')))

Expand Down
3 changes: 3 additions & 0 deletions indexer/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
1 change: 1 addition & 0 deletions service/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions ui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions underlay/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down