This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 82c129e4f5c377d612a4159fa64e951a4a695a7a Author: James Netherton <[email protected]> AuthorDate: Fri Oct 8 11:40:29 2021 +0100 Upgrade Camel to 3.13.0 --- docs/antora-playbook-dev.yml | 2 +- docs/antora-playbook.yml | 6 ++--- docs/antora.yml | 4 ++-- .../reference/extensions/aws-secrets-manager.adoc | 2 +- .../ROOT/pages/reference/extensions/rest.adoc | 2 +- .../atlasmap/deployment/AtlasmapProcessor.java | 3 --- .../quarkus/component/mllp/it/MllpResource.java | 28 +++++++--------------- .../camel/quarkus/component/mllp/it/MllpTest.java | 9 ------- pom.xml | 9 ++++--- 9 files changed, 20 insertions(+), 45 deletions(-) diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml index d4ab0d0..97ac4b9 100644 --- a/docs/antora-playbook-dev.yml +++ b/docs/antora-playbook-dev.yml @@ -26,7 +26,7 @@ content: start_path: docs - url: [email protected]:apache/camel.git branches: - - camel-3.12.x # replace ${camel.docs.branch} + - camel-3.13.x # replace ${camel.docs.branch} start_paths: - docs/components - url: [email protected]:apache/camel.git diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml index 880abf2..2a31202 100644 --- a/docs/antora-playbook.yml +++ b/docs/antora-playbook.yml @@ -33,7 +33,7 @@ content: # The version/branch of main camel 'components' this version of camel-quarkus uses - url: https://github.com/apache/camel.git branches: - - camel-3.12.x # replace ${camel.docs.branch} + - camel-3.13.x # replace ${camel.docs.branch} start_paths: # eip - core/camel-core-engine/src/main/docs @@ -50,8 +50,8 @@ content: # The camel-spring-boot version corresponding to the main camel 'components' version/branch - url: https://github.com/apache/camel-spring-boot.git branches: - - camel-spring-boot-3.12.x # replace ${camel.sb.docs.branch} - start_path: docs/components + - camel-spring-boot-3.13.x # replace ${camel.sb.docs.branch} + start_path: docs asciidoc: attributes: diff --git a/docs/antora.yml b/docs/antora.yml index 0d3237b..176dd9f 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -26,8 +26,8 @@ asciidoc: target-maven-version: 3.8.1 # replace ${target-maven-version} quarkus-version: 2.4.0.Final # replace ${quarkus.version} # attributes used in xrefs to other Antora components - cq-camel-components: 3.12.x@components # replace ${camel.docs.components.xref} + cq-camel-components: 3.13.x@components # replace ${camel.docs.components.xref} quarkus-examples-version: latest # indexTable common - indexer-version: 3.12.x # replace ${camel.docs.components.version} + indexer-version: 3.13.x # replace ${camel.docs.components.version} indexer-component: components diff --git a/docs/modules/ROOT/pages/reference/extensions/aws-secrets-manager.adoc b/docs/modules/ROOT/pages/reference/extensions/aws-secrets-manager.adoc index 19e3151..cfd26f3 100644 --- a/docs/modules/ROOT/pages/reference/extensions/aws-secrets-manager.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/aws-secrets-manager.adoc @@ -18,7 +18,7 @@ Manage AWS Secrets Manager services using AWS SDK version 2.x. == What's inside -* xref:{cq-camel-components}::aws-secrets-manager-component.adoc[AWS Secrets Manager component], URI syntax: `aws-secrets-manager://label` +* xref:{cq-camel-components}::aws-secrets-manager-component.adoc[AWS Secrets Manager component], URI syntax: `aws-secrets-manager:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/rest.adoc b/docs/modules/ROOT/pages/reference/extensions/rest.adoc index aa25eaa..a84a98a 100644 --- a/docs/modules/ROOT/pages/reference/extensions/rest.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/rest.adoc @@ -20,7 +20,7 @@ Expose REST services and their OpenAPI Specification or call external REST servi == What's inside * xref:{cq-camel-components}::rest-component.adoc[REST component], URI syntax: `rest:method:path:uriTemplate` -* xref:{cq-camel-components}::rest-api-component.adoc[REST API component], URI syntax: `rest-api:path/contextIdPattern` +* xref:{cq-camel-components}::rest-api-component.adoc[REST API component], URI syntax: `rest-api:path` Please refer to the above links for usage and configuration details. diff --git a/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java b/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java index 9ba0849..0789a2c 100644 --- a/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java +++ b/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java @@ -25,7 +25,6 @@ import java.util.stream.Stream; import io.atlasmap.core.DefaultAtlasContextFactory; import io.atlasmap.core.DefaultAtlasModuleInfo; import io.atlasmap.csv.module.CsvModule; -import io.atlasmap.dfdl.module.DfdlModule; import io.atlasmap.java.module.JavaModule; import io.atlasmap.json.module.JsonModule; import io.atlasmap.mxbean.AtlasContextFactoryMXBean; @@ -63,7 +62,6 @@ class AtlasmapProcessor { items.add(new ReflectiveClassBuildItem(false, false, DefaultAtlasModuleInfo.class)); items.add(new ReflectiveClassBuildItem(true, false, JsonModule.class)); items.add(new ReflectiveClassBuildItem(true, false, CsvModule.class)); - items.add(new ReflectiveClassBuildItem(true, false, DfdlModule.class)); items.add(new ReflectiveClassBuildItem(true, false, JavaModule.class)); items.add(new ReflectiveClassBuildItem(true, false, XmlModule.class)); items.add(new ReflectiveClassBuildItem(false, true, false, AtlasContextFactoryMXBean.class)); @@ -85,7 +83,6 @@ class AtlasmapProcessor { indexDependency.produce(new IndexDependencyBuildItem("io.atlasmap", "atlas-java-model")); indexDependency.produce(new IndexDependencyBuildItem("io.atlasmap", "atlas-json-model")); indexDependency.produce(new IndexDependencyBuildItem("io.atlasmap", "atlas-csv-model")); - indexDependency.produce(new IndexDependencyBuildItem("io.atlasmap", "atlas-dfdl-model")); } @BuildStep diff --git a/integration-tests/mllp/src/main/java/org/apache/camel/quarkus/component/mllp/it/MllpResource.java b/integration-tests/mllp/src/main/java/org/apache/camel/quarkus/component/mllp/it/MllpResource.java index 720014d..c90ba32 100644 --- a/integration-tests/mllp/src/main/java/org/apache/camel/quarkus/component/mllp/it/MllpResource.java +++ b/integration-tests/mllp/src/main/java/org/apache/camel/quarkus/component/mllp/it/MllpResource.java @@ -16,11 +16,9 @@ */ package org.apache.camel.quarkus.component.mllp.it; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.ws.rs.GET; +import javax.inject.Named; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -43,16 +41,6 @@ public class MllpResource { @Inject CamelContext context; - @PostConstruct - public void init() { - System.setProperty(MllpComponent.MLLP_DEFAULT_CHARSET_PROPERTY, "UTF-8"); - } - - @PreDestroy - public void preDestroy() { - System.clearProperty(MllpComponent.MLLP_DEFAULT_CHARSET_PROPERTY); - } - @Path("/send") @POST @Produces(MediaType.TEXT_PLAIN) @@ -72,13 +60,6 @@ public class MllpResource { mockEndpoint.assertIsSatisfied(5000); } - @Path("/charset/default") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String getDefaultCharset() { - return MllpComponent.getDefaultCharset().name(); - } - @Path("/charset/msh18") @POST @Produces(MediaType.TEXT_PLAIN) @@ -88,4 +69,11 @@ public class MllpResource { String ack = exchange.getMessage().getHeader(MllpConstants.MLLP_ACKNOWLEDGEMENT_STRING, String.class); return ack.split("\r")[0]; } + + @Named("mllp") + MllpComponent component() { + MllpComponent component = new MllpComponent(); + component.setDefaultCharset("UTF-8"); + return component; + } } diff --git a/integration-tests/mllp/src/test/java/org/apache/camel/quarkus/component/mllp/it/MllpTest.java b/integration-tests/mllp/src/test/java/org/apache/camel/quarkus/component/mllp/it/MllpTest.java index e029585..e85f3ca 100644 --- a/integration-tests/mllp/src/test/java/org/apache/camel/quarkus/component/mllp/it/MllpTest.java +++ b/integration-tests/mllp/src/test/java/org/apache/camel/quarkus/component/mllp/it/MllpTest.java @@ -21,7 +21,6 @@ import io.restassured.RestAssured; import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; @QuarkusTest class MllpTest { @@ -76,12 +75,4 @@ class MllpTest { .body(containsString("ÏNHOUSE")) .statusCode(200); } - - @Test - public void testDefaultCharsetFromSystemProperty() { - RestAssured.get("/mllp/charset/default") - .then() - .body(is("UTF-8")) - .statusCode(200); - } } diff --git a/pom.xml b/pom.xml index bfe9109..01c3259 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-dependencies</artifactId> - <version>3.12.0</version> + <version>3.13.0-SNAPSHOT</version> </parent> <groupId>org.apache.camel.quarkus</groupId> @@ -39,13 +39,12 @@ <properties> <!-- Primary dependencies - maintained manually --> - <camel.major.minor>3.12</camel.major.minor> <!-- run after each change: cd docs && mvnd validate --> - <camel.version>${camel.major.minor}.0</camel.version> + <camel.major.minor>3.13</camel.major.minor> <!-- run after each change: cd docs && mvnd validate --> + <camel.version>${camel.major.minor}.0-SNAPSHOT</camel.version> <camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml --> <camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml --> <camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable camel branch on which our Antora docs depends --> <camel.sb.docs.branch>camel-spring-boot-${camel.major.minor}.x</camel.sb.docs.branch><!-- The stable camel-spring-boot branch on which our Antora docs depends --> - <cassandra-quarkus.version>1.1.1</cassandra-quarkus.version><!-- https://repo1.maven.org/maven2/com/datastax/oss/quarkus/cassandra-quarkus-bom/ --> <debezium.version>1.6.1.Final</debezium.version><!-- May go back to Camel's ${debezium-version} when they are in sync https://repo1.maven.org/maven2/io/debezium/debezium-bom/ --> <optaplanner.version>8.9.1.Final</optaplanner.version><!-- May go back to Camel's ${optaplanner-version} when they are in sync https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ --> @@ -62,7 +61,7 @@ <antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others --> <avro.version>1.10.2</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro --> <aws-java-sdk.version>1.11.714</aws-java-sdk.version> - <azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version> + <azure-core.version>1.21.0</azure-core.version><!-- @sync com.azure:azure-storage-blob:${azure-storage-blob-version} dep:com.azure:azure-core --> <bouncycastle.version>1.69</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on --> <commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version> <commons-cli.version>1.4</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core -->
