open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove jetty-server exclude (#3453)

This commit is contained in:
Lauri Tulmin 2021-07-01 03:12:26 +03:00 committed by GitHub
parent bbd33115d1
commit 5d6be8764e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
instrumentation/grails-3.0/javaagent/build.gradle.kts
View File

@ -42,10 +42,6 @@ dependencies {
testLibrary("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
testLibrary("org.springframework.boot:spring-boot-starter-tomcat:$springBootVersion")
testImplementation(project(":testing-common")) {
exclude("org.eclipse.jetty", "jetty-server")
}
latestDepTestLibrary("org.grails:grails-plugin-url-mappings:4.0.+")
latestDepTestLibrary("org.springframework.boot:spring-boot-autoconfigure:2.1.17.RELEASE")
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-tomcat:2.1.17.RELEASE")

3
instrumentation/gwt-2.0/javaagent/build.gradle.kts
View File

@ -44,9 +44,6 @@ dependencies {
testImplementation("org.testcontainers:selenium:${versions["org.testcontainers"]}")
testImplementation("org.seleniumhq.selenium:selenium-java:3.141.59")
testImplementation(project(":testing-common")) {
exclude("org.eclipse.jetty", "jetty-server")
}
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.35.v20201120")
}

5
instrumentation/jetty/jetty-11.0/javaagent/build.gradle.kts
View File

@ -15,11 +15,6 @@ dependencies {
implementation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
implementation(project(":instrumentation:jetty:jetty-common:javaagent"))
// Don't want to conflict with jetty from the test server.
testImplementation(project(":testing-common")) {
exclude("org.eclipse.jetty", "jetty-server")
}
testLibrary("org.eclipse.jetty:jetty-servlet:11.0.0")
}

5
instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts
View File

@ -18,11 +18,6 @@ dependencies {
implementation(project(":instrumentation:jetty:jetty-common:javaagent"))
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
// Don't want to conflict with jetty from the test server.
testImplementation(project(":testing-common")) {
exclude("org.eclipse.jetty", "jetty-server")
}
testLibrary("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")
testLibrary("org.eclipse.jetty:jetty-continuation:8.0.0.v20110901")

4
instrumentation/jsf/jsf-testing-common/build.gradle.kts
View File

@ -11,9 +11,7 @@ dependencies {
compileOnly("jakarta.faces:jakarta.faces-api:2.3.2")
compileOnly("jakarta.el:jakarta.el-api:3.0.3")
implementation(project(":testing-common")) {
exclude("org.eclipse.jetty", "jetty-server")
}
implementation(project(":testing-common"))
implementation("org.jsoup:jsoup:1.13.1")
val jettyVersion = "9.4.35.v20201120"

3
instrumentation/servlet/servlet-2.2/javaagent/build.gradle.kts
View File

@ -24,9 +24,6 @@ dependencies {
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
testImplementation(project(":testing-common")) {
exclude("org.eclipse.jetty", "jetty-server")
}
testLibrary("org.eclipse.jetty:jetty-server:7.0.0.v20091005")
testLibrary("org.eclipse.jetty:jetty-servlet:7.0.0.v20091005")

3
instrumentation/servlet/servlet-3.0/javaagent/build.gradle.kts
View File

@ -23,9 +23,6 @@ dependencies {
testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
testImplementation(project(":testing-common")) {
exclude("org.eclipse.jetty", "jetty-server")
}
testLibrary("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
testLibrary("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")
testLibrary("org.apache.tomcat.embed:tomcat-embed-core:8.0.41")

4
instrumentation/servlet/servlet-javax-common/javaagent/build.gradle.kts
View File

@ -22,10 +22,6 @@ dependencies {
compileOnly("javax.servlet:servlet-api:2.3")
testImplementation(project(":testing-common")) {
exclude("org.eclipse.jetty", "jetty-server")
}
// We don't check testLatestDeps for this module since we have coverage in others like servlet-3.0
testImplementation("org.eclipse.jetty:jetty-server:7.0.0.v20091005")
testImplementation("org.eclipse.jetty:jetty-servlet:7.0.0.v20091005")

1
instrumentation/vaadin-14.2/javaagent/build.gradle.kts
View File

@ -57,7 +57,6 @@ dependencies {
add("vaadin142TestImplementation", "com.vaadin:vaadin-spring-boot-starter:14.2.0")
testImplementation(project(":instrumentation:vaadin-14.2:testing"))
testImplementation(project(":testing-common"))
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))

4
instrumentation/vaadin-14.2/testing/build.gradle.kts
View File

@ -8,8 +8,6 @@ dependencies {
compileOnly("com.vaadin:vaadin-spring-boot-starter:14.2.0")
api("org.testcontainers:selenium:${versions["org.testcontainers"]}")
implementation(project(":testing-common")) {
exclude(module = "jetty-server")
}
implementation(project(":testing-common"))
implementation("org.seleniumhq.selenium:selenium-java:3.141.59")
}