Skip to content

Commit 7262103

Browse files
All upgrades. Tests still need to be fixed.
1 parent 43addd3 commit 7262103

File tree

6 files changed

+35
-11
lines changed

6 files changed

+35
-11
lines changed

build.gradle.kts

+20-3
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,15 @@ subprojects {
302302
}
303303

304304
if (requested.group == "org.apache.avro" && requested.name == "avro") {
305-
if(requested.version!! < Versions.AVRO) {
305+
if(requested.version!! < "2.0") {
306306
useVersion(Versions.AVRO)
307307
because("latest avro does not depend on vulnerable jackson-mapper-asl which has not been updated since 2013")
308308
}
309309
}
310310

311311
if (requested.group == "org.apache.logging.log4j" && requested.name == "log4j-api") {
312-
if (requested.version!! < "2.11.2") {
313-
useVersion("2.13.3")
312+
if (requested.version!! < "2.13") {
313+
useVersion("2.17.2")
314314
because("fixes vulnerability in 2.11.1 and before")
315315
}
316316
}
@@ -343,6 +343,13 @@ subprojects {
343343
}
344344
}
345345

346+
if (requested.group == "org.apache.commons" && requested.name == "commons-compress") {
347+
if (requested.version!! < "2.0") {
348+
useVersion("1.21")
349+
because("fixes CVE-2021-36090, CVE-2021-35516, CVE-2021-35515, CVE-2021-35517: Crafty ZIPs")
350+
}
351+
}
352+
346353
if (requested.group == "org.jasig.cas.client" && requested.name == "cas-client-core") {
347354
if (requested.version!! <= "3.5.0") {
348355
useVersion("3.6.0")
@@ -381,8 +388,18 @@ subprojects {
381388
" for this commit to take effect: " +
382389
"https://github.com/reactor/reactor-netty/commit/857277287671d5b40708064b3afef1a7ae7b7a47")
383390
}
391+
if (requested.group.startsWith("junit") &&
392+
requested.name == "junit" &&
393+
requested.version!! < "4.2") {
394+
useVersion("4.13.2")
395+
because("Fixes CVE-2020-15250: Local information for the test rule TemporaryFolder.")
396+
}
384397
}
385398
}
386399

387400
}
388401
}
402+
403+
subprojects {
404+
tasks.register<DependencyReportTask>("allDeps") {}
405+
}

buildSrc/src/main/kotlin/utils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object Versions {
2525
const val CONFLUENT: String = "7.1.3"
2626
const val KAFKA: String = "3.1.2"
2727
const val SPRING_KAFKA: String = "3.1.2.RELEASE"
28-
const val AVRO: String = "1.11.0"
28+
const val AVRO: String = "1.11.1"
2929

3030
const val GROOVY: String = "3.0.9"
3131
const val SPOCK: String = "2.2-M1-groovy-3.0"

elastic-common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
// implementation 'com.mapbox.mapboxsdk:mapbox-sdk-geojson:5.3.0' // TODO use this with EsMapping.kt and schemas for geojson object?
1818

1919
testImplementation("org.codehaus.groovy:groovy:${Versions.GROOVY}")
20-
testImplementation("junit:junit:4.12")
20+
testImplementation("junit:junit:4.13.2")
2121
testImplementation("org.springframework.boot:spring-boot-starter-test")
2222
testImplementation("org.testcontainers:testcontainers:${Versions.TEST_CONTAINERS}")
2323
testImplementation("org.testcontainers:elasticsearch:${Versions.TEST_CONTAINERS}")

owasp-suppressions.xml

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
33

4+
<suppress>
5+
<notes><![CDATA[
6+
file name: tomcat-embed-core:9.0.63
7+
Vunerability is specific to an example in the original project, which is not included in the distribution.
8+
]]></notes>
9+
<cve>CVE-2022-34305</cve>
10+
</suppress>
11+
412
<suppress>
513
<notes><![CDATA[
614
file name: lodash:4.17.15

parsalyzer/src/test/groovy/org/cedar/onestop/parsalyzer/stream/StreamParsalyzerSpec.groovy

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class StreamParsalyzerSpec extends Specification {
4848
TestOutputTopic outputTopic = driver.createOutputTopic(Topics.parsedTopic(testType), STRING_DESERIALIZER, AVRO_DESERIALIZER)
4949

5050
when:
51-
throw new Exception("${input.getClass()}")
5251
inputTopic.pipeInput(key, input)
5352
// driver.pipeInput(inputFactory.create(testChangelog, key, input))
5453

registry/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ configurations {
99
integrationTestImplementation.extendsFrom testImplementation
1010
integrationTestRuntime.extendsFrom testRuntime
1111
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
12-
12+
1313
schemaDefinitions
1414
}
1515

@@ -33,10 +33,10 @@ dependencies {
3333
implementation("org.hibernate.validator:hibernate-validator:6.0.2.Final")
3434

3535
// -- CAS Authentication --
36-
implementation "org.pac4j:spring-webmvc-pac4j:3.2.0"
37-
implementation "org.pac4j:pac4j-cas:3.8.3"
36+
implementation "org.pac4j:spring-webmvc-pac4j:4.0.1"
37+
implementation "org.pac4j:pac4j-cas:${Versions.PAC4J}"
3838

39-
//used to copy schema definitions to generate openAPI
39+
//used to copy schema definitions to generate openAPI
4040
schemaDefinitions ("com.github.cedardevs.schemas:schemas-core:${Versions.ONESTOP_SCHEMAS}")
4141

4242
compileOnly("org.springframework.boot:spring-boot-starter-tomcat")
@@ -172,4 +172,4 @@ repositories {
172172
url 'https://repo.maven.apache.org/maven2'
173173
name 'Maven Central'
174174
}
175-
}
175+
}

0 commit comments

Comments
 (0)