Skip to content

Commit

Permalink
chore: update transitive dependencies of ms8-patch1
Browse files Browse the repository at this point in the history
  • Loading branch information
@tmberthold
tmberthold committed Jul 24, 2023
1 parent 6dce5bb commit 2ba7c23
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 6 deletions.
17 changes: 16 additions & 1 deletion connector/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,24 @@ dependencies {
implementation("${edcGroup}:api-observability:${edcVersion}")
implementation("${edcGroup}:configuration-filesystem:${edcVersion}")
implementation("${edcGroup}:control-plane-aggregate-services:${edcVersion}")
implementation("${edcGroup}:http:${edcVersion}")
implementation("${edcGroup}:http:${edcVersion}") {
exclude(group = "org.eclipse.jetty", module = "jetty-client")
exclude(group = "org.eclipse.jetty", module = "jetty-http")
exclude(group = "org.eclipse.jetty", module = "jetty-io")
exclude(group = "org.eclipse.jetty", module = "jetty-server")
exclude(group = "org.eclipse.jetty", module = "jetty-util")
exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
}
implementation("${edcGroup}:ids:${edcVersion}")

// Updated jetty versions for e.g. CVE-2023-26048
implementation("org.eclipse.jetty:jetty-client:11.0.15")
implementation("org.eclipse.jetty:jetty-http:11.0.15")
implementation("org.eclipse.jetty:jetty-io:11.0.15")
implementation("org.eclipse.jetty:jetty-server:11.0.15")
implementation("org.eclipse.jetty:jetty-util:11.0.15")
implementation("org.eclipse.jetty:jetty-webapp:11.0.15")

// Control-plane to Data-plane
implementation("${edcGroup}:transfer-data-plane:${edcVersion}")
implementation("${edcGroup}:data-plane-selector-core:${edcVersion}")
Expand Down
18 changes: 17 additions & 1 deletion extensions/edc-ui-config/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,23 @@ dependencies {

testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
testImplementation("${edcGroup}:junit:${edcVersion}")
testImplementation("${edcGroup}:http:${edcVersion}")
testImplementation("${edcGroup}:http:${edcVersion}") {
exclude(group = "org.eclipse.jetty", module = "jetty-client")
exclude(group = "org.eclipse.jetty", module = "jetty-http")
exclude(group = "org.eclipse.jetty", module = "jetty-io")
exclude(group = "org.eclipse.jetty", module = "jetty-server")
exclude(group = "org.eclipse.jetty", module = "jetty-util")
exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
}

// Updated jetty versions for e.g. CVE-2023-26048
testImplementation("org.eclipse.jetty:jetty-client:11.0.15")
testImplementation("org.eclipse.jetty:jetty-http:11.0.15")
testImplementation("org.eclipse.jetty:jetty-io:11.0.15")
testImplementation("org.eclipse.jetty:jetty-server:11.0.15")
testImplementation("org.eclipse.jetty:jetty-util:11.0.15")
testImplementation("org.eclipse.jetty:jetty-webapp:11.0.15")

testImplementation("io.rest-assured:rest-assured:${restAssured}")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
Expand Down
18 changes: 17 additions & 1 deletion extensions/last-commit-info/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,23 @@ dependencies {

testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
testImplementation("${edcGroup}:junit:${edcVersion}")
testImplementation("${edcGroup}:http:${edcVersion}")
testImplementation("${edcGroup}:http:${edcVersion}") {
exclude(group = "org.eclipse.jetty", module = "jetty-client")
exclude(group = "org.eclipse.jetty", module = "jetty-http")
exclude(group = "org.eclipse.jetty", module = "jetty-io")
exclude(group = "org.eclipse.jetty", module = "jetty-server")
exclude(group = "org.eclipse.jetty", module = "jetty-util")
exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
}

// Updated jetty versions for e.g. CVE-2023-26048
testImplementation("org.eclipse.jetty:jetty-client:11.0.15")
testImplementation("org.eclipse.jetty:jetty-http:11.0.15")
testImplementation("org.eclipse.jetty:jetty-io:11.0.15")
testImplementation("org.eclipse.jetty:jetty-server:11.0.15")
testImplementation("org.eclipse.jetty:jetty-util:11.0.15")
testImplementation("org.eclipse.jetty:jetty-webapp:11.0.15")

testImplementation("io.rest-assured:rest-assured:${restAssured}")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
Expand Down
18 changes: 17 additions & 1 deletion extensions/wrapper/client/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,23 @@ dependencies {

testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
testImplementation("${edcGroup}:junit:${edcVersion}")
testImplementation("${edcGroup}:http:${edcVersion}")
testImplementation("${edcGroup}:http:${edcVersion}") {
exclude(group = "org.eclipse.jetty", module = "jetty-client")
exclude(group = "org.eclipse.jetty", module = "jetty-http")
exclude(group = "org.eclipse.jetty", module = "jetty-io")
exclude(group = "org.eclipse.jetty", module = "jetty-server")
exclude(group = "org.eclipse.jetty", module = "jetty-util")
exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
}

// Updated jetty versions for e.g. CVE-2023-26048
testImplementation("org.eclipse.jetty:jetty-client:11.0.15")
testImplementation("org.eclipse.jetty:jetty-http:11.0.15")
testImplementation("org.eclipse.jetty:jetty-io:11.0.15")
testImplementation("org.eclipse.jetty:jetty-server:11.0.15")
testImplementation("org.eclipse.jetty:jetty-util:11.0.15")
testImplementation("org.eclipse.jetty:jetty-webapp:11.0.15")

testImplementation(project(":extensions:wrapper:wrapper"))
testImplementation("io.rest-assured:rest-assured:${restAssured}")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
Expand Down
18 changes: 17 additions & 1 deletion extensions/wrapper/wrapper/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,23 @@ dependencies {

testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
testImplementation("${edcGroup}:junit:${edcVersion}")
testImplementation("${edcGroup}:http:${edcVersion}")
testImplementation("${edcGroup}:http:${edcVersion}") {
exclude(group = "org.eclipse.jetty", module = "jetty-client")
exclude(group = "org.eclipse.jetty", module = "jetty-http")
exclude(group = "org.eclipse.jetty", module = "jetty-io")
exclude(group = "org.eclipse.jetty", module = "jetty-server")
exclude(group = "org.eclipse.jetty", module = "jetty-util")
exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
}

// Updated jetty versions for e.g. CVE-2023-26048
testImplementation("org.eclipse.jetty:jetty-client:11.0.15")
testImplementation("org.eclipse.jetty:jetty-http:11.0.15")
testImplementation("org.eclipse.jetty:jetty-io:11.0.15")
testImplementation("org.eclipse.jetty:jetty-server:11.0.15")
testImplementation("org.eclipse.jetty:jetty-util:11.0.15")
testImplementation("org.eclipse.jetty:jetty-webapp:11.0.15")

testImplementation(project(":extensions:policy-always-true"))
testImplementation("io.rest-assured:rest-assured:${restAssured}")
testImplementation("org.assertj:assertj-core:${assertj}")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assertj=3.23.1
jupiterVersion=5.8.2
mockitoVersion=4.8.0
okHttpVersion=4.10.0
jsonVersion=20220924
jsonVersion=20230618
restAssured=4.5.0
flywayVersion=9.0.1
postgresVersion=42.4.0
Expand Down

0 comments on commit 2ba7c23

Please sign in to comment.