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

Upgrade quarkus version to 2.9.1.Final #473

Merged
merged 3 commits into from
May 27, 2022
Merged
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
6 changes: 3 additions & 3 deletions .github/workflows/daily.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- cron: '0 23 * * *'
jobs:
quarkus-main-build:
name: Quarkus 2.7 build
name: Quarkus main build
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -28,7 +28,7 @@ jobs:
check-latest: true
- name: Build Quarkus main
run: |
git clone https://github.com/quarkusio/quarkus.git && cd quarkus && git checkout 2.7 && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations
git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations
- name: Tar Maven Repo
shell: bash
run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
# password: ${{ secrets.CI_REGISTRY_PASSWORD }}
- name: Build Quarkus CLI
run: |
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && git checkout 2.7 && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
- name: Install Quarkus CLI
run: |
cat <<EOF > ./quarkus-dev-cli
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: |
mvn -V -B -s .github/mvn-settings.xml verify -Pframework,examples -Dvalidate-format -DskipTests -DskipITs
quarkus-main-build:
name: Quarkus 2.7 build
name: Quarkus main build
runs-on: ubuntu-latest
needs: validate-format
strategy:
Expand All @@ -50,7 +50,7 @@ jobs:
check-latest: true
- name: Build Quarkus main
run: |
git clone https://github.com/quarkusio/quarkus.git && cd quarkus && git checkout 2.7 && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations
git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations
- name: Tar Maven Repo
shell: bash
run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
run: tar -xzf maven-repo.tgz -C ~
- name: Build Quarkus CLI
run: |
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && git checkout 2.7 && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
- name: Install Quarkus CLI
run: |
cat <<EOF > ./quarkus-dev-cli
Expand Down
2 changes: 1 addition & 1 deletion examples/kafka-registry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- with this, you don't have to use avro-maven-plugin -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-avro</artifactId>
<artifactId>quarkus-confluent-registry-avro</artifactId>
</dependency>
<!-- Confluent AVRO libraries -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@
import io.quarkus.test.bootstrap.KafkaService;
import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot;
import io.quarkus.test.services.KafkaContainer;
import io.quarkus.test.services.QuarkusApplication;
import io.quarkus.test.services.containers.model.KafkaVendor;

@QuarkusScenario
// TODO https://github.com/quarkusio/quarkus/issues/25814
@DisabledOnQuarkusSnapshot(reason = "Apicurio 2.2.3.Final used in upstream is not compatible with Quarkus 2.9.2.Final")
public class StrimziKafkaWithRegistryMessagingIT {

@KafkaContainer(vendor = KafkaVendor.STRIMZI, withRegistry = true, registryPath = "/apis/registry/v2")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@DisabledOnQuarkusVersion(version = "1\\..*", reason = "Quarkus CLI has been reworked in 2.x")
public class QuarkusCliClientIT {

static final String RESTEASY_EXTENSION = "quarkus-resteasy";
static final String RESTEASY_REACTIVE_EXTENSION = "quarkus-resteasy-reactive";
static final String SMALLRYE_HEALTH_EXTENSION = "quarkus-smallrye-health";
static final int CMD_DELAY_SEC = 3;

Expand Down Expand Up @@ -64,15 +64,15 @@ public void shouldAddAndRemoveExtensions() throws InterruptedException {
// Create application
QuarkusCliRestService app = cliClient.createApplication("app");

// By default, it installs only "quarkus-resteasy"
assertInstalledExtensions(app, RESTEASY_EXTENSION);
// By default, it installs only "quarkus-resteasy-reactive"
assertInstalledExtensions(app, RESTEASY_REACTIVE_EXTENSION);

// Let's install Quarkus Smallrye Health
QuarkusCliClient.Result result = app.installExtension(SMALLRYE_HEALTH_EXTENSION);
assertTrue(result.isSuccessful(), SMALLRYE_HEALTH_EXTENSION + " was not installed. Output: " + result.getOutput());

// Verify both extensions now
assertInstalledExtensions(app, RESTEASY_EXTENSION, SMALLRYE_HEALTH_EXTENSION);
assertInstalledExtensions(app, RESTEASY_REACTIVE_EXTENSION, SMALLRYE_HEALTH_EXTENSION);

// The health endpoint should be now available
app.start();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<htmlunit.version>2.61.0</htmlunit.version>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>2.7.5.Final</quarkus.platform.version>
<quarkus.platform.version>2.9.2.Final</quarkus.platform.version>
<exclude.tests.with.tags>quarkus-cli</exclude.tests.with.tags>
<include.tests>**/*IT.java</include.tests>
<exclude.openshift.tests>**/OpenShift*IT.java</exclude.openshift.tests>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
public class QuarkusCliClientIT {

static final String RESTEASY_SPRING_WEB_EXTENSION = "quarkus-spring-web";
static final String RESTEASY_EXTENSION = "quarkus-resteasy";
static final String RESTEASY_JACKSON_EXTENSION = "quarkus-resteasy-jackson";
static final String RESTEASY_REACTIVE_EXTENSION = "quarkus-resteasy-reactive";
static final String RESTEASY_REACTIVE_JACKSON_EXTENSION = "quarkus-resteasy-reactive-jackson";
static final String SMALLRYE_HEALTH_EXTENSION = "quarkus-smallrye-health";
static final int CMD_DELAY_SEC = 3;

Expand Down Expand Up @@ -80,10 +80,10 @@ public void shouldCreateApplicationWithCodeStarter() {
// Create application with Resteasy Jackson
QuarkusCliRestService app = cliClient.createApplication("app",
QuarkusCliClient.CreateApplicationRequest.defaults().withExtensions(RESTEASY_SPRING_WEB_EXTENSION,
RESTEASY_JACKSON_EXTENSION));
RESTEASY_REACTIVE_JACKSON_EXTENSION));

// Verify By default, it installs only "quarkus-resteasy"
assertInstalledExtensions(app, RESTEASY_SPRING_WEB_EXTENSION, RESTEASY_JACKSON_EXTENSION);
assertInstalledExtensions(app, RESTEASY_SPRING_WEB_EXTENSION, RESTEASY_REACTIVE_JACKSON_EXTENSION);

// Start using DEV mode
app.start();
Expand All @@ -97,15 +97,15 @@ public void shouldAddAndRemoveExtensions() throws InterruptedException {
// Create application
QuarkusCliRestService app = cliClient.createApplication("app");

// By default, it installs only "quarkus-resteasy"
assertInstalledExtensions(app, RESTEASY_EXTENSION);
// By default, it installs only "quarkus-resteasy-reactive"
assertInstalledExtensions(app, RESTEASY_REACTIVE_EXTENSION);

// Let's install Quarkus Smallrye Health
QuarkusCliClient.Result result = app.installExtension(SMALLRYE_HEALTH_EXTENSION);
assertTrue(result.isSuccessful(), SMALLRYE_HEALTH_EXTENSION + " was not installed. Output: " + result.getOutput());

// Verify both extensions now
assertInstalledExtensions(app, RESTEASY_EXTENSION, SMALLRYE_HEALTH_EXTENSION);
assertInstalledExtensions(app, RESTEASY_REACTIVE_EXTENSION, SMALLRYE_HEALTH_EXTENSION);

// The health endpoint should be now available
app.start();
Expand Down
2 changes: 1 addition & 1 deletion quarkus-test-service-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<artifactId>quarkus-test-service-kafka</artifactId>
<name>Quarkus - Test Framework - Service - Kafka</name>
<properties>
<strimzi.testcontainers.version>0.25.0</strimzi.testcontainers.version>
<strimzi.testcontainers.version>0.100.0</strimzi.testcontainers.version>
<log4j.version>2.17.2</log4j.version>
</properties>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ protected String getKafkaVersion() {
return StringUtils.defaultIfBlank(model.getVersion(), model.getVendor().getDefaultVersion());
}

protected String getKafkaImageName() {
return StringUtils.defaultIfBlank(model.getImage(), model.getVendor().getImage());
}

protected String getKafkaRegistryImage() {
return model.getRegistryImageVersion();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public String getHost(Protocol protocol) {

@Override
protected GenericContainer<?> initKafkaContainer() {
ExtendedStrimziKafkaContainer container = new ExtendedStrimziKafkaContainer(getKafkaVersion());
ExtendedStrimziKafkaContainer container = new ExtendedStrimziKafkaContainer(getKafkaImageName(), getKafkaVersion());
if (StringUtils.isNotEmpty(getServerProperties())) {
container.useCustomServerProperties();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public enum KafkaRegistry {
CONFLUENT("confluentinc/cp-schema-registry", "6.1.1", "/", 8081),
APICURIO("quay.io/apicurio/apicurio-registry-mem", "2.0.1.Final", "/api", 8080);
APICURIO("quay.io/apicurio/apicurio-registry-mem", "2.1.5.Final", "/apis", 8080);

private final String image;
private final String defaultVersion;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.github.dockerjava.api.command.InspectContainerResponse;

import io.quarkus.test.services.containers.model.KafkaVendor;
import io.strimzi.StrimziKafkaContainer;
import io.strimzi.test.container.StrimziKafkaContainer;

/**
* Extend the functionality of io.strimzi.StrimziKafkaContainer with:
Expand All @@ -21,8 +21,8 @@ public class ExtendedStrimziKafkaContainer extends StrimziKafkaContainer {

private boolean useCustomServerProperties = false;

public ExtendedStrimziKafkaContainer(String version) {
super(version);
public ExtendedStrimziKafkaContainer(String name, String version) {
super(String.format("%s:%s", name, version));
}

public void useCustomServerProperties() {
Expand Down