Skip to content

Commit 08af136

Browse files
amarzialiamarziali
authored
Group tomcat modules (#9541)
1 parent 2d42e7c commit 08af136

File tree

50 files changed

+34
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+34
-34
lines changed

‎dd-java-agent/instrumentation/servlet/request-3/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ dependencies {
4949
testImplementation project(':dd-java-agent:instrumentation:jetty-7.0') // See if there's any conflicts.
5050
testImplementation project(':dd-java-agent:instrumentation:jetty-7.6') // See if there's any conflicts.
5151
testImplementation project(':dd-java-agent:instrumentation:jetty-9') // See if there's any conflicts.
52-
testImplementation project(':dd-java-agent:instrumentation:tomcat-5.5') // See if there's any conflicts.
53-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-6')
54-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-7')
52+
testImplementation project(':dd-java-agent:instrumentation:tomcat:tomcat-5.5') // See if there's any conflicts.
53+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0')
54+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0')
5555
testImplementation project(':dd-java-agent:instrumentation:servlet')
5656
testImplementation project(':dd-java-agent:instrumentation:jetty-util')
5757
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.2.0.v20160908'

‎dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ dependencies {
2424
latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.+'
2525
latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: '2.+'
2626

27-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-6')
28-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-5.5')
27+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0')
28+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-5.5')
2929
}

‎dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ dependencies {
2727
latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '3.+'
2828
latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: '3.+'
2929

30-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-6')
31-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-5.5')
30+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0')
31+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-5.5')
3232
}

‎dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ dependencies {
5757
testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
5858

5959
// include also tomcat instrumentation
60-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-5.5')
61-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-6')
62-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-7')
60+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-5.5')
61+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0')
62+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0')
6363
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
6464
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
6565

‎dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ dependencies {
4242

4343
testImplementation project(':dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-3.1')
4444
testImplementation project(':dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-5.3')
45-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-5.5')
46-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-6')
47-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-7')
45+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-5.5')
46+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0')
47+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0')
4848
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
4949
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
5050
testImplementation project(':dd-java-agent:instrumentation:servlet:request-5')

‎dd-java-agent/instrumentation/spring/spring-ws-2.0/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
testImplementation group: 'org.apache.ws.xmlschema', name: 'xmlschema-core', version: '2.1.0'
2222
testImplementation group: 'wsdl4j', name: 'wsdl4j', version: '1.6.1'
2323
// Required for "servlet.request" span
24-
testImplementation project(':dd-java-agent:instrumentation:tomcat-5.5')
24+
testImplementation project(':dd-java-agent:instrumentation:tomcat:tomcat-5.5')
2525
// Required for "spring.handler" span
2626
testImplementation project(':dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-3.1')
2727

dd-java-agent/instrumentation/tomcat-5.5/build.gradle renamed to dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ dependencies {
9292
// https://tomcat.apache.org/whichversion.html
9393
compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.4'
9494

95-
implementation project(':dd-java-agent:instrumentation:tomcat-5.5-common')
95+
implementation project(':dd-java-agent:instrumentation:tomcat:tomcat-common')
9696

9797
testImplementation(project(':dd-java-agent:instrumentation-testing')) {
9898
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
@@ -109,8 +109,8 @@ dependencies {
109109
testImplementation group: 'javax.servlet', name: 'servlet-api', version: '2.4'
110110
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
111111

112-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-5.5')
113-
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat-appsec-6')
112+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-5.5')
113+
testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0')
114114
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet')
115115
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
116116
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
@@ -128,18 +128,18 @@ dependencies {
128128
latest10TestImplementation group: 'org.apache.tomcat', name: 'jakartaee-migration', version: '1.+'
129129
latest10TestImplementation project(":dd-java-agent:appsec:appsec-test-fixtures")
130130

131-
latest10TestImplementation(project(':dd-java-agent:instrumentation:tomcat-appsec-6'))
132-
latest10TestImplementation(project(':dd-java-agent:instrumentation:tomcat-appsec-7'))
133-
latest10TestImplementation(project(':dd-java-agent:instrumentation:tomcat-classloading-9'))
131+
latest10TestImplementation(project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0'))
132+
latest10TestImplementation(project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0'))
133+
latest10TestImplementation(project(':dd-java-agent:instrumentation:tomcat:tomcat-9.0'))
134134

135135
latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '11.+'
136136
latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '11.+'
137137
latestDepTestImplementation group: 'org.apache.tomcat', name: 'jakartaee-migration', version: '1.+'
138138
latestDepTestImplementation project(":dd-java-agent:appsec:appsec-test-fixtures")
139139

140-
latestDepTestRuntimeOnly(project(':dd-java-agent:instrumentation:tomcat-appsec-6'))
141-
latestDepTestRuntimeOnly(project(':dd-java-agent:instrumentation:tomcat-appsec-7'))
142-
latestDepTestRuntimeOnly(project(':dd-java-agent:instrumentation:tomcat-classloading-9'))
140+
latestDepTestRuntimeOnly(project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0'))
141+
latestDepTestRuntimeOnly(project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0'))
142+
latestDepTestRuntimeOnly(project(':dd-java-agent:instrumentation:tomcat:tomcat-9.0'))
143143
}
144144

145145
project.afterEvaluate {

dd-java-agent/instrumentation/tomcat-5.5/gradle.lockfile renamed to dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile

File renamed without changes.

dd-java-agent/instrumentation/tomcat-5.5/src/latestDepTest/groovy/AbstractServletTest.groovy renamed to dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/groovy/AbstractServletTest.groovy

File renamed without changes.

dd-java-agent/instrumentation/tomcat-5.5/src/latestDepTest/groovy/TomcatAppSecInactiveHttpServerForkedTest.groovy renamed to dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/groovy/TomcatAppSecInactiveHttpServerForkedTest.groovy

File renamed without changes.

0 commit comments

Comments
 (0)