Skip to content

Commit 65fab21

Browse files
authored
Moves the Data Prepper test projects into a single project and updates the project naming to follow the pattern used in data-prepper-plugins. (opensearch-project#5726)
Signed-off-by: David Venable <dlv@amazon.com>
1 parent d72e8f9 commit 65fab21

64 files changed

Lines changed: 74 additions & 71 deletions

File tree

Some content is hidden

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

build-resources.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ext.coreProjects = [
1212
project(':data-prepper-main'),
1313
project(':data-prepper-pipeline-parser'),
1414
project(':data-prepper-plugins'),
15-
project(':data-prepper-test-common'),
16-
project(':data-prepper-test-event'),
15+
project(':data-prepper-test:test-common'),
16+
project(':data-prepper-test:test-event'),
1717
project(':data-prepper-plugin-framework'),
1818
project(':data-prepper-plugin-schema'),
1919
project(':data-prepper-plugin-schema-cli')

data-prepper-api/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
implementation libs.commons.lang3
1717
implementation 'jakarta.validation:jakarta.validation-api:3.0.2'
1818
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
19-
testImplementation project(':data-prepper-test-common')
19+
testImplementation project(':data-prepper-test:test-common')
2020
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
2121
testImplementation libs.commons.io
2222
}

data-prepper-core/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ dependencies {
6161
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
6262
testImplementation testLibs.junit.vintage
6363
testImplementation libs.commons.lang3
64-
testImplementation project(':data-prepper-test-event')
65-
testImplementation project(':data-prepper-test-common')
64+
testImplementation project(':data-prepper-test:test-event')
65+
testImplementation project(':data-prepper-test:test-common')
6666
testImplementation project(':data-prepper-api').sourceSets.test.output
6767
}
6868

data-prepper-plugins/aggregate-processor/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
dependencies {
1111
implementation project(':data-prepper-api')
1212
implementation project(':data-prepper-plugins:common')
13-
implementation project(':data-prepper-test-common')
13+
implementation project(':data-prepper-test:test-common')
1414
implementation project(':data-prepper-expression')
1515
implementation project(':data-prepper-plugins:otel-proto-common')
1616
implementation project(':data-prepper-plugins:otel-metrics-raw-processor')

data-prepper-plugins/anomaly-detector-processor/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99

1010
dependencies {
1111
implementation project(':data-prepper-api')
12-
implementation project(':data-prepper-test-common')
12+
implementation project(':data-prepper-test:test-common')
1313
implementation project(':data-prepper-plugins:common')
1414
implementation 'com.fasterxml.jackson.core:jackson-databind'
1515
implementation 'io.micrometer:micrometer-core'

data-prepper-plugins/avro-codecs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
implementation 'software.amazon.awssdk:apache-client'
1212
testImplementation 'org.json:json:20240205'
1313
testImplementation project(':data-prepper-plugins:common')
14-
testImplementation project(':data-prepper-test-event')
14+
testImplementation project(':data-prepper-test:test-event')
1515
}
1616

1717
test {

data-prepper-plugins/aws-lambda/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
testCompileOnly 'org.projectlombok:lombok:1.18.20'
2828
testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
2929
testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
30-
testImplementation project(':data-prepper-test-common')
30+
testImplementation project(':data-prepper-test:test-common')
3131
testImplementation testLibs.slf4j.simple
3232
}
3333

data-prepper-plugins/aws-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
implementation 'org.hibernate.validator:hibernate-validator:8.0.2.Final'
1111
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
1212
testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
13-
testImplementation project(':data-prepper-test-common')
13+
testImplementation project(':data-prepper-test:test-common')
1414
}
1515

1616
test {

data-prepper-plugins/cloudwatch-logs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
implementation libs.commons.lang3
3939
implementation 'org.projectlombok:lombok:1.18.26'
4040
implementation 'org.hibernate.validator:hibernate-validator:8.0.0.Final'
41-
testImplementation project(path: ':data-prepper-test-common')
41+
testImplementation project(path: ':data-prepper-test:test-common')
4242
compileOnly 'org.projectlombok:lombok:1.18.24'
4343
annotationProcessor 'org.projectlombok:lombok:1.18.24'
4444
}

data-prepper-plugins/common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
implementation 'org.xerial.snappy:snappy-java:1.1.10.7'
2424
implementation libs.armeria.core
2525
testImplementation project(':data-prepper-plugins:blocking-buffer')
26-
testImplementation project(':data-prepper-test-event')
26+
testImplementation project(':data-prepper-test:test-event')
2727
testImplementation libs.commons.io
2828
}
2929

0 commit comments

Comments
 (0)