This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 33b9f9de6696737002d4d91c2ee3c19af77ac549 Author: Luca Burgazzoli <[email protected]> AuthorDate: Thu Jun 10 08:09:31 2021 +0200 deps: update to camel-quarkus 2.0.0-SNAPSHOT as required for yaml dsl --- .../it/RuntimeYamlDeserializationClassicIT.java | 23 --------- .../it/RuntimeYamlDeserializationClassicTest.java | 58 ---------------------- .../it/RuntimeYamlDeserializationFlowIT.java | 23 --------- .../it/RuntimeYamlDeserializationFlowTest.java | 58 ---------------------- pom.xml | 6 +-- 5 files changed, 3 insertions(+), 165 deletions(-) diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationClassicIT.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationClassicIT.java deleted file mode 100644 index cc187e5..0000000 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationClassicIT.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.k.quarkus.it; - -import io.quarkus.test.junit.NativeImageTest; - -@NativeImageTest -public class RuntimeYamlDeserializationClassicIT extends RuntimeYamlDeserializationClassicTest { -} \ No newline at end of file diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationClassicTest.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationClassicTest.java deleted file mode 100644 index 4b4e6a6..0000000 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationClassicTest.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.k.quarkus.it; - -import java.util.Map; - -import javax.ws.rs.core.MediaType; - -import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.QuarkusTestProfile; -import io.quarkus.test.junit.TestProfile; -import io.restassured.path.json.JsonPath; -import org.junit.jupiter.api.Test; - -import static io.restassured.RestAssured.given; -import static org.apache.camel.util.CollectionHelper.mapOf; -import static org.assertj.core.api.Assertions.assertThat; - -@TestProfile(RuntimeYamlDeserializationClassicTest.Profile.class) -@QuarkusTest -public class RuntimeYamlDeserializationClassicTest { - @Test - public void testContextCustomizerFromProperties() { - JsonPath p = given() - .accept(MediaType.APPLICATION_JSON) - .get("/test/inspect") - .then() - .statusCode(200) - .extract() - .body() - .jsonPath(); - - assertThat(p.getMap("global-options")).containsEntry("CamelYamlDslDeserializationMode", "CLASSIC"); - } - - public static class Profile implements QuarkusTestProfile { - @Override - public Map<String, String> getConfigOverrides() { - return mapOf( - "camel.k.yaml.deserialization-mode", "CLASSIC" - ); - } - } -} diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationFlowIT.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationFlowIT.java deleted file mode 100644 index d83acc8..0000000 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationFlowIT.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.k.quarkus.it; - -import io.quarkus.test.junit.NativeImageTest; - -@NativeImageTest -public class RuntimeYamlDeserializationFlowIT extends RuntimeYamlDeserializationFlowTest { -} \ No newline at end of file diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationFlowTest.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationFlowTest.java deleted file mode 100644 index d760cd6..0000000 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationFlowTest.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.k.quarkus.it; - -import java.util.Map; - -import javax.ws.rs.core.MediaType; - -import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.QuarkusTestProfile; -import io.quarkus.test.junit.TestProfile; -import io.restassured.path.json.JsonPath; -import org.junit.jupiter.api.Test; - -import static io.restassured.RestAssured.given; -import static org.apache.camel.util.CollectionHelper.mapOf; -import static org.assertj.core.api.Assertions.assertThat; - -@TestProfile(RuntimeYamlDeserializationFlowTest.Profile.class) -@QuarkusTest -public class RuntimeYamlDeserializationFlowTest { - @Test - public void testContextCustomizerFromProperties() { - JsonPath p = given() - .accept(MediaType.APPLICATION_JSON) - .get("/test/inspect") - .then() - .statusCode(200) - .extract() - .body() - .jsonPath(); - - assertThat(p.getMap("global-options")).containsEntry("CamelYamlDslDeserializationMode", "FLOW"); - } - - public static class Profile implements QuarkusTestProfile { - @Override - public Map<String, String> getConfigOverrides() { - return mapOf( - "camel.k.yaml.deserialization-mode", "FLOW" - ); - } - } -} diff --git a/pom.xml b/pom.xml index 28f2c60..07831a8 100644 --- a/pom.xml +++ b/pom.xml @@ -41,9 +41,9 @@ <camel-version>3.10.0</camel-version> <!-- quarkus --> - <camel-quarkus-version>2.0.0-M1</camel-quarkus-version> - <graalvm-version>21.0.0</graalvm-version> - <quarkus-version>2.0.0.Alpha3</quarkus-version> + <camel-quarkus-version>2.0.0-SNAPSHOT</camel-quarkus-version> + <graalvm-version>21.1.0</graalvm-version> + <quarkus-version>2.0.0.CR3</quarkus-version> <!-- camel-k --> <groovy-version>3.0.7</groovy-version>
