diff --git a/.github/workflows/daily.yaml b/.github/workflows/daily.yaml index ec9ddc9c9..b99688fff 100644 --- a/.github/workflows/daily.yaml +++ b/.github/workflows/daily.yaml @@ -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: @@ -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 @@ -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 < ./quarkus-dev-cli diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 87ab9dd67..e9108ec06 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -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: @@ -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 @@ -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 < ./quarkus-dev-cli diff --git a/examples/kafka-registry/pom.xml b/examples/kafka-registry/pom.xml index c9a7e89a2..afb3a8509 100644 --- a/examples/kafka-registry/pom.xml +++ b/examples/kafka-registry/pom.xml @@ -30,7 +30,7 @@ io.quarkus - quarkus-avro + quarkus-confluent-registry-avro diff --git a/examples/kafka-registry/src/test/java/io/quarkus/qe/StrimziKafkaWithRegistryMessagingIT.java b/examples/kafka-registry/src/test/java/io/quarkus/qe/StrimziKafkaWithRegistryMessagingIT.java index cc0a58f90..36dc90229 100644 --- a/examples/kafka-registry/src/test/java/io/quarkus/qe/StrimziKafkaWithRegistryMessagingIT.java +++ b/examples/kafka-registry/src/test/java/io/quarkus/qe/StrimziKafkaWithRegistryMessagingIT.java @@ -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") diff --git a/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java b/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java index e75e8f29e..bdf9e0b36 100644 --- a/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java +++ b/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java @@ -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; @@ -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(); diff --git a/pom.xml b/pom.xml index 8b4a8c54d..540d99800 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 2.61.0 quarkus-bom io.quarkus - 2.7.5.Final + 2.9.2.Final quarkus-cli **/*IT.java **/OpenShift*IT.java diff --git a/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java b/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java index ca211ab6f..0bb7605ef 100644 --- a/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java +++ b/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java @@ -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; @@ -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(); @@ -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(); diff --git a/quarkus-test-service-kafka/pom.xml b/quarkus-test-service-kafka/pom.xml index 1c3613363..d56d01538 100644 --- a/quarkus-test-service-kafka/pom.xml +++ b/quarkus-test-service-kafka/pom.xml @@ -9,7 +9,7 @@ quarkus-test-service-kafka Quarkus - Test Framework - Service - Kafka - 0.25.0 + 0.100.0 2.17.2 diff --git a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/BaseKafkaContainerManagedResource.java b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/BaseKafkaContainerManagedResource.java index a5c46b1c1..9418f3ef0 100644 --- a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/BaseKafkaContainerManagedResource.java +++ b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/BaseKafkaContainerManagedResource.java @@ -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(); } diff --git a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/StrimziKafkaContainerManagedResource.java b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/StrimziKafkaContainerManagedResource.java index 6c5631d03..40549c22e 100644 --- a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/StrimziKafkaContainerManagedResource.java +++ b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/StrimziKafkaContainerManagedResource.java @@ -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(); } diff --git a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaRegistry.java b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaRegistry.java index a71819b32..bcb2d6a6f 100644 --- a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaRegistry.java +++ b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaRegistry.java @@ -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; diff --git a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/strimzi/ExtendedStrimziKafkaContainer.java b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/strimzi/ExtendedStrimziKafkaContainer.java index d09ccce9e..bb717a767 100644 --- a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/strimzi/ExtendedStrimziKafkaContainer.java +++ b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/strimzi/ExtendedStrimziKafkaContainer.java @@ -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: @@ -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() {