You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/10/31 19:00:50 UTC
[camel-quarkus] 19/19: Upgrade Camel to 3.18.3
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0f16a16d919f70efa64750bfb3cc2e171759b0bf
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Oct 31 14:17:47 2022 +0000
Upgrade Camel to 3.18.3
---
docs/antora.yml | 4 ++--
.../storage/blob/it/AzureStorageBlobResource.java | 22 ++++++++++++----------
.../storage/blob/it/AzureStorageBlobTest.java | 4 ++--
pom.xml | 9 +++++----
poms/bom/pom.xml | 10 ++++++++++
poms/bom/src/main/generated/flattened-full-pom.xml | 9 +++++++++
.../src/main/generated/flattened-reduced-pom.xml | 9 +++++++++
.../generated/flattened-reduced-verbose-pom.xml | 9 +++++++++
8 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index f6495bfcbb..278855cb80 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -25,9 +25,9 @@ asciidoc:
requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'"
# Project versions
- camel-version: 3.18.2 # replace ${camel.version}
+ camel-version: 3.18.3 # replace ${camel.version}
camel-docs-version: 3.18.x # replace ${camel.docs.components.version}
- quarkus-version: 2.13.2.Final # replace ${quarkus.version}
+ quarkus-version: 2.13.3.Final # replace ${quarkus.version}
graalvm-version: 22.2.0 # replace ${graalvm.version}
graalvm-docs-version: 22.2
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java b/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
index 793d943051..73ffe06e8c 100644
--- a/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
+++ b/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
@@ -48,6 +49,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import com.azure.core.http.rest.PagedIterable;
import com.azure.storage.blob.changefeed.models.BlobChangefeedEvent;
import com.azure.storage.blob.changefeed.models.BlobChangefeedEventType;
import com.azure.storage.blob.models.BlobContainerItem;
@@ -56,8 +58,8 @@ import com.azure.storage.blob.models.BlobStorageException;
import com.azure.storage.blob.models.Block;
import com.azure.storage.blob.models.BlockList;
import com.azure.storage.blob.models.BlockListType;
-import com.azure.storage.blob.models.PageList;
import com.azure.storage.blob.models.PageRange;
+import com.azure.storage.blob.models.PageRangeItem;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ConsumerTemplate;
@@ -319,18 +321,18 @@ public class AzureStorageBlobResource {
@Produces(MediaType.APPLICATION_JSON)
public JsonObject getPageBlobRanges(@QueryParam("pageStart") int start, @QueryParam("pageEnd") int end) {
PageRange pageRange = new PageRange().setStart(start).setEnd(end);
- PageList pageList = producerTemplate.requestBodyAndHeader("direct:getPageBlobRanges", null,
- BlobConstants.PAGE_BLOB_RANGE, pageRange, PageList.class);
+ PagedIterable pageIterable = producerTemplate.requestBodyAndHeader("direct:getPageBlobRanges", null,
+ BlobConstants.PAGE_BLOB_RANGE, pageRange, PagedIterable.class);
JsonObjectBuilder objectBuilder = Json.createObjectBuilder();
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
- pageList.getPageRange()
- .stream()
- .map(pr -> Json.createObjectBuilder()
- .add("start", pr.getStart())
- .add("end", pr.getEnd())
- .build())
- .forEach(arrayBuilder::add);
+ ((Stream<PageRangeItem>) pageIterable
+ .stream())
+ .map(pr -> Json.createObjectBuilder()
+ .add("offset", pr.getRange().getOffset())
+ .add("length", pr.getRange().getLength())
+ .build())
+ .forEach(arrayBuilder::add);
objectBuilder.add("ranges", arrayBuilder.build());
return objectBuilder.build();
diff --git a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
index f55e462205..816dc7a20a 100644
--- a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
+++ b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
@@ -299,8 +299,8 @@ class AzureStorageBlobTest {
.get("/azure-storage-blob/page/blob")
.then()
.statusCode(200)
- .body("ranges[0].start", is(0),
- "ranges[0].end", is(511));
+ .body("ranges[0].offset", is(0),
+ "ranges[0].length", is(512));
// Resize
RestAssured.given()
diff --git a/pom.xml b/pom.xml
index 2880dbaffc..eb8db29b00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.18.2</version>
+ <version>3.18.3</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -40,7 +40,7 @@
<!-- Primary dependencies - maintained manually -->
<camel.major.minor>3.18</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
- <camel.version>${camel.major.minor}.2</camel.version>
+ <camel.version>${camel.major.minor}.3</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 -->
@@ -79,6 +79,7 @@
<cassandra-driver-test.version>3.7.1</cassandra-driver-test.version><!-- Keep in sync with testcontainers instead of Debezium bom -->
<bouncycastle.version>1.70</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on -->
<caffeine.version>2.9.3</caffeine.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.github.ben-manes.caffeine:caffeine -->
+ <californium-scandium.version>${californium-scandium-version}</californium-scandium.version> <!-- TODO: https://github.com/apache/camel-quarkus/issues/4226 -->
<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 -->
<commons-collections.version>3.2.2</commons-collections.version><!-- used by hbase, should be pretty stable as commons-collections are not developed actively anymore -->
@@ -124,7 +125,7 @@
<kotlin.version>1.7.20</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<kryo.version>2.24.0</kryo.version><!-- @sync org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo -->
<libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark -->
- <msal4j.version>1.12.0</msal4j.version><!-- @sync com.azure:azure-identity:${azure-identity-version} dep:com.microsoft.azure:msal4j -->
+ <msal4j.version>1.13.1</msal4j.version><!-- @sync com.azure:azure-identity:${azure-identity-version} dep:com.microsoft.azure:msal4j -->
<mvel2.version>2.4.14.Final</mvel2.version><!-- @sync org.apache.camel:camel-dependencies:${camel.version} prop:mvel-version -->
<okio.version>${squareup-okio-version}</okio.version>
<opencensus.version>0.31.0</opencensus.version><!-- Mess in Google cloud. Keep in sync with version used in com.google.http-client:google-http-client -->
@@ -138,7 +139,7 @@
<snakeyaml.version>1.33</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<tablesaw.version>0.43.1</tablesaw.version>
<threetenbp.version>1.6.0</threetenbp.version>
- <xalan.version>${xalan-version}</xalan.version>
+ <xalan.version>2.7.2</xalan.version><!-- Xalan should be removed as is in Camel, but it is not possible. https://github.com/apache/camel-quarkus/issues/4065-->
<xchange.version>${xchange-version}</xchange.version>
<xerces.version>${xerces-version}</xerces.version>
<xmlgraphics-commons.version>2.7</xmlgraphics-commons.version><!-- @sync org.apache.xmlgraphics:fop-parent:${fop-version} prop:xmlgraphics.commons.version -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 474fabae48..26a212fd5a 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1398,6 +1398,10 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>californium-legal</artifactId>
+ <groupId>org.eclipse.californium</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -10264,6 +10268,12 @@
<artifactId>stax2-api</artifactId>
<version>${stax2.version}</version>
</dependency>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/4226 -->
+ <dependency>
+ <groupId>org.eclipse.californium</groupId>
+ <artifactId>element-connector</artifactId>
+ <version>${californium-scandium.version}</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 0f279340e9..000f004d28 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1337,6 +1337,10 @@
<groupId>jakarta.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.xml.bind-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.californium</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>californium-legal</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -10216,6 +10220,11 @@
<artifactId>stax2-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.eclipse.californium</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>element-connector</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.7.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>org.eclipse.jgit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index d127a0ac89..65413b7c38 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1337,6 +1337,10 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.californium</groupId>
+ <artifactId>californium-legal</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -10211,6 +10215,11 @@
<artifactId>stax2-api</artifactId>
<version>4.2</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.californium</groupId>
+ <artifactId>element-connector</artifactId>
+ <version>2.7.3</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 84aa6f2896..7a5d4822c8 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -1337,6 +1337,10 @@
<groupId>jakarta.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.xml.bind-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.californium</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>californium-legal</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -10211,6 +10215,11 @@
<artifactId>stax2-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.eclipse.californium</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>element-connector</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.7.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>org.eclipse.jgit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->