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

Jump to bottom

Mend Fixes: MSK IAM Auth, Testcontainers, ApacheJMeter #577

Merged
merged 3 commits into from
Apr 15, 2024
Merged

Mend Fixes: MSK IAM Auth, Testcontainers, ApacheJMeter #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
545af03
update aws-msk-iam-auth
mikaylathompson Apr 11, 2024
307a5ec
update testcontainers
mikaylathompson Apr 11, 2024
bba99fa
update ApacheJMeter
mikaylathompson Apr 11, 2024
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
2 changes: 1 addition & 1 deletion TrafficCapture/captureKafkaOffloader/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
implementation group: 'org.projectlombok', name:'lombok', version:'1.18.26'
implementation group: 'org.apache.kafka', name:'kafka-clients', version:'3.6.0'
implementation group: 'org.slf4j', name:'slf4j-api', version:'2.0.7'
implementation group: 'software.amazon.msk', name:'aws-msk-iam-auth', version:'1.1.9'
implementation group: 'software.amazon.msk', name:'aws-msk-iam-auth', version:'2.1.0'

testImplementation project(':captureProtobufs')
testImplementation testFixtures(project(path: ':coreUtilities'))
Expand Down
2 changes: 1 addition & 1 deletion TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN mkdir /root/kafka-tools/aws
WORKDIR /root/kafka-tools
# Get kafka distribution and unpack to 'kafka'
RUN wget -qO- https://archive.apache.org/dist/kafka/3.6.0/kafka_2.13-3.6.0.tgz | tar --transform 's!^[^/]*!kafka!' -xvz
RUN wget -O kafka/libs/msk-iam-auth.jar https://github.com/aws/aws-msk-iam-auth/releases/download/v1.1.9/aws-msk-iam-auth-1.1.9-all.jar
RUN wget -O kafka/libs/msk-iam-auth.jar https://github.com/aws/aws-msk-iam-auth/releases/download/v2.1.0/aws-msk-iam-auth-2.1.0-all.jar
WORKDIR /root

# Add Traffic Replayer jars for running KafkaPrinter from this container
Expand Down
8 changes: 4 additions & 4 deletions TrafficCapture/trafficCaptureProxyServer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ dependencies {
testImplementation testFixtures(project(path: ':captureOffloader'))
testImplementation testFixtures(project(path: ':coreUtilities'))
testImplementation group: 'eu.rekawek.toxiproxy', name: 'toxiproxy-java', version: '2.1.7'
testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.19.5'
testImplementation group: 'org.testcontainers', name: 'kafka', version: '1.19.5'
testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.19.5'
testImplementation group: 'org.testcontainers', name: 'toxiproxy', version: '1.19.5'
testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.19.7'
testImplementation group: 'org.testcontainers', name: 'kafka', version: '1.19.7'
testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.19.7'
testImplementation group: 'org.testcontainers', name: 'toxiproxy', version: '1.19.7'
}

tasks.withType(Tar){
Expand Down
6 changes: 3 additions & 3 deletions TrafficCapture/trafficCaptureProxyServerTest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ dependencies {

testCompileOnly 'org.projectlombok:lombok:1.18.28'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.28'
implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: '5.6.2', withoutBom
implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_http', version: '5.6.2', withoutBom
implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_config', version: '5.6.2', withoutBom
implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: '5.6.3', withoutBom
implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_http', version: '5.6.3', withoutBom
implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_config', version: '5.6.3', withoutBom
implementation group: 'com.beust', name: 'jcommander', version: '1.82'

constraints {
Expand Down
8 changes: 4 additions & 4 deletions TrafficCapture/trafficReplayer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dependencies {
implementation group: 'software.amazon.awssdk', name: 'auth', version: '2.20.102'
implementation group: 'software.amazon.awssdk', name: 'sdk-core', version: '2.20.102'
implementation group: 'software.amazon.awssdk', name: 'secretsmanager', version: '2.20.127'
implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '1.1.9'
implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '2.1.0'
implementation 'org.apache.commons:commons-compress:1.26.0'

testFixturesImplementation project(':replayerPlugins:jsonMessageTransformers:jsonMessageTransformerInterface')
Expand All @@ -83,9 +83,9 @@ dependencies {

testImplementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.1'
testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api', version:'5.x.x'
testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.19.5'
testImplementation group: 'org.testcontainers', name: 'kafka', version: '1.19.5'
testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.19.5'
testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.19.7'
testImplementation group: 'org.testcontainers', name: 'kafka', version: '1.19.7'
testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.19.7'
testImplementation group: 'org.mockito', name:'mockito-core', version:'4.6.1'
testImplementation group: 'org.mockito', name:'mockito-junit-jupiter', version:'4.6.1'
testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine', version:'5.x.x'
Expand Down