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.

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

Use new test-container.jar and add ITs #2

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 1 addition & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,11 @@ language: java
jobs:
fast_finish: true
include:
- build: ppc64le
os: linux
arch: ppc64le
jdk: openjdk11
script: mvn install -DskipTests -Dmaven.javadoc.skip=true
addons:
apt:
packages:
- maven
- build: s390x
os: linux
arch: s390x
jdk: openjdk11
script: mvn install -DskipTests -Dmaven.javadoc.skip=true
script: mvn install -Dmaven.javadoc.skip=true
addons:
apt:
packages:
Expand Down
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<micrometer.version>1.3.9</micrometer.version>
<jmx-prometheus-collector.version>0.12.0</jmx-prometheus-collector.version>
<commons-cli.version>1.4</commons-cli.version>
<test-container.version>0.25.0</test-container.version>
<test-container.version>0.100.0-rc1</test-container.version>
<jakarta.version>2.3.2</jakarta.version>
<!-- property to skip surefire tests during failsafe execution -->
<!--suppress UnresolvedMavenProperty -->
Expand Down Expand Up @@ -597,4 +597,10 @@
</build>
</profile>
</profiles>
<repositories>
<repository>
<id>staging</id>
<url>https://oss.sonatype.org/content/repositories/iostrimzi-1154</url>
</repository>
</repositories>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import io.micrometer.core.instrument.MeterRegistry;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.strimzi.StrimziKafkaContainer;
import io.strimzi.test.container.StrimziKafkaContainer;
import io.strimzi.kafka.bridge.HealthChecker;
import io.strimzi.kafka.bridge.JmxCollectorRegistry;
import io.strimzi.kafka.bridge.MetricsReporter;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/strimzi/kafka/bridge/http/HttpCorsIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.strimzi.kafka.bridge.http;

import io.micrometer.core.instrument.MeterRegistry;
import io.strimzi.StrimziKafkaContainer;
import io.strimzi.test.container.StrimziKafkaContainer;
import io.strimzi.kafka.bridge.BridgeContentType;
import io.strimzi.kafka.bridge.HealthChecker;
import io.strimzi.kafka.bridge.JmxCollectorRegistry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.strimzi.kafka.bridge.http.base;

import io.strimzi.StrimziKafkaContainer;
import io.strimzi.test.container.StrimziKafkaContainer;
import io.micrometer.core.instrument.MeterRegistry;
import io.strimzi.kafka.bridge.HealthChecker;
import io.strimzi.kafka.bridge.JmxCollectorRegistry;
Expand Down