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

chore: update transitive dependencies of ms8-patch1 #458

Merged
merged 4 commits into from
Aug 23, 2023
Merged

chore: update transitive dependencies of ms8-patch1 #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ba7c23
chore: update transitive dependencies of ms8-patch1
tmberthold Jul 24, 2023
b05a0ef
chore: update transitive dependencies of ms8-patch1
tmberthold Jul 24, 2023
666ccab
Merge branch 'main' into chore/update-dependencies
tmberthold Jul 24, 2023
eeaa43d
Merge branch 'main' into chore/update-dependencies
tmberthold Jul 24, 2023
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
19 changes: 18 additions & 1 deletion connector/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ plugins {

val edcVersion: String by project
val edcGroup: String by project
val jettyVersion: String by project
val jettyGroup: String by project

dependencies {
// Control-Plane
Expand All @@ -14,9 +16,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("${jettyGroup}:jetty-client:${jettyVersion}")
implementation("${jettyGroup}:jetty-http:${jettyVersion}")
implementation("${jettyGroup}:jetty-io:${jettyVersion}")
implementation("${jettyGroup}:jetty-server:${jettyVersion}")
implementation("${jettyGroup}:jetty-util:${jettyVersion}")
implementation("${jettyGroup}:jetty-webapp:${jettyVersion}")

// Control-plane to Data-plane
implementation("${edcGroup}:transfer-data-plane:${edcVersion}")
implementation("${edcGroup}:data-plane-selector-core:${edcVersion}")
Expand Down
20 changes: 19 additions & 1 deletion extensions/edc-ui-config/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
val edcVersion: String by project
val edcGroup: String by project
val restAssured: String by project
val jettyVersion: String by project
val jettyGroup: String by project

plugins {
`java-library`
Expand All @@ -18,7 +20,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("${jettyGroup}:jetty-client:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")

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
20 changes: 19 additions & 1 deletion extensions/last-commit-info/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
val edcVersion: String by project
val edcGroup: String by project
val restAssured: String by project
val jettyVersion: String by project
val jettyGroup: String by project

plugins {
`java-library`
Expand All @@ -24,7 +26,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("${jettyGroup}:jetty-client:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")

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
20 changes: 19 additions & 1 deletion extensions/wrapper/client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ val edcVersion: String by project
val edcGroup: String by project
val restAssured: String by project
val assertj: String by project
val jettyVersion: String by project
val jettyGroup: String by project


plugins {
Expand Down Expand Up @@ -40,7 +42,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("${jettyGroup}:jetty-client:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")

testImplementation(project(":extensions:wrapper:wrapper"))
testImplementation("io.rest-assured:rest-assured:${restAssured}")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
Expand Down
20 changes: 19 additions & 1 deletion extensions/wrapper/wrapper/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ val edcVersion: String by project
val edcGroup: String by project
val restAssured: String by project
val assertj: String by project
val jettyVersion: String by project
val jettyGroup: String by project

plugins {
`java-library`
Expand Down Expand Up @@ -37,7 +39,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("${jettyGroup}:jetty-client:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")

testImplementation(project(":extensions:policy-always-true"))
testImplementation("io.rest-assured:rest-assured:${restAssured}")
testImplementation("org.assertj:assertj-core:${assertj}")
Expand Down
4 changes: 3 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ 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
jettyGroup=org.eclipse.jetty
jettyVersion=11.0.15

org.gradle.jvmargs=-Xmx1024m