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 to 2.9.0.Final #3767

Merged
merged 3 commits into from
May 4, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.16.0 # replace ${camel.version}
camel-docs-version: 3.16.x # replace ${camel.docs.components.version}
quarkus-version: 2.9.0.CR1 # replace ${quarkus.version}
quarkus-version: 2.9.0.Final # replace ${quarkus.version}
graalvm-version: 22.0.0.2 # replace ${graalvm.version}
graalvm-docs-version: 22.0
# attributes used in xrefs to other Antora components
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import io.quarkus.test.junit.QuarkusIntegrationTest;

//@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3189")
@QuarkusIntegrationTest
class AtlasmapIT extends AtlasmapTest {

Expand Down
2 changes: 0 additions & 2 deletions integration-tests/debezium/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@


<profiles>
<!-- TODO: "https://github.com/apache/camel-quarkus/issues/3748"
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -151,7 +150,6 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>mysqlDriver</id>
<activation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.camel.quarkus.component.freemarker.it;

import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.DisabledOnIntegrationTest;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
Expand All @@ -28,7 +28,7 @@
class FreemarkerTest {

@Test
@DisabledOnNativeImage // requires allowContextMapAll=true which is unsupported in native mode
@DisabledOnIntegrationTest // requires allowContextMapAll=true which is unsupported in native mode
public void freemarkerLetter() {
RestAssured.given()
.contentType(ContentType.JSON)
Expand All @@ -51,7 +51,7 @@ public void freemarkerDataModel() {
}

@Test
@DisabledOnNativeImage // requires allowContextMapAll=true which is unsupported in native mode
@DisabledOnIntegrationTest // requires allowContextMapAll=true which is unsupported in native mode
public void valuesInProperties() {
RestAssured.given()
.contentType(ContentType.JSON)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.io.IOException;
import java.nio.charset.StandardCharsets;

import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.DisabledOnIntegrationTest;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
Expand Down Expand Up @@ -194,7 +194,7 @@ public void signVerifyTransformsXPath() throws Exception {
assertFalse(verifiedXml.contains("ds:SignatureValue"));
}

@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/2185")
@DisabledOnIntegrationTest("https://github.com/apache/camel-quarkus/issues/2185")
@Test
public void signVerifyTransformsXsltXPath() throws Exception {
String signedXml = RestAssured.given()
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>1.0.2</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
<quarkus.version>2.9.0.CR1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus.version>2.9.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.33.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->

Expand Down Expand Up @@ -96,7 +96,7 @@
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
<hbase.version>${hbase-version}</hbase.version>
<htrace.version>4.2.0-incubating</htrace.version><!-- Mess in hbase transitive deps -->
<infinispan.version>13.0.8.Final</infinispan.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.infinispan:infinispan-core -->
<infinispan.version>13.0.9.Final</infinispan.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.infinispan:infinispan-core -->
<influxdb.version>${influx-java-driver-version}</influxdb.version>
<jackson1.version>1.9.13</jackson1.version><!-- Mess in the transitive dependencies of spark and hbase-testing-util -->
<jackson-asl.version>${jackson1.version}</jackson-asl.version><!-- Can be different from jackson1.version on some occasions -->
Expand Down
2 changes: 1 addition & 1 deletion poms/bom/src/main/generated/flattened-full-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10111,7 +10111,7 @@
<dependency>
<groupId>org.infinispan</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>infinispan-jboss-marshalling</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>13.0.8.Final</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>13.0.9.Final</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.influxdb</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down