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 2021/09/03 10:11:30 UTC
[camel-quarkus] branch camel-main updated (ac81826 -> 67af35b)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard ac81826 Adapt to latest Camel API changes
new 67af35b Adapt to latest Camel API changes
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ac81826)
\
N -- N -- N refs/heads/camel-main (67af35b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
extensions-jvm/spark/integration-test/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[camel-quarkus] 01/01: Adapt to latest Camel API changes
Posted by ja...@apache.org.
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 67af35bfeda0d6c24de12b46492ebf52f8b921d1
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Sep 2 08:53:34 2021 +0100
Adapt to latest Camel API changes
---
docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc | 2 +-
docs/modules/ROOT/partials/reference/components/json-patch.adoc | 1 +
extensions-jvm/spark/integration-test/pom.xml | 2 +-
.../test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java | 2 +-
.../quarkus/component/google/pubsub/it/GooglePubsubTestResource.java | 1 +
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc b/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
index ff46990..541a809 100644
--- a/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
@@ -20,7 +20,7 @@ Manage spreadsheets in Google Sheets. Poll for changes in Google Sheets.
== What's inside
* xref:{cq-camel-components}::google-sheets-component.adoc[Google Sheets component], URI syntax: `google-sheets:apiName/methodName`
-* xref:{cq-camel-components}::google-sheets-stream-component.adoc[Google Sheets Stream component], URI syntax: `google-sheets-stream:apiName`
+* xref:{cq-camel-components}::google-sheets-stream-component.adoc[Google Sheets Stream component], URI syntax: `google-sheets-stream:spreadsheetId`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/partials/reference/components/json-patch.adoc b/docs/modules/ROOT/partials/reference/components/json-patch.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/json-patch.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page
diff --git a/extensions-jvm/spark/integration-test/pom.xml b/extensions-jvm/spark/integration-test/pom.xml
index a6056d2..fa65828 100644
--- a/extensions-jvm/spark/integration-test/pom.xml
+++ b/extensions-jvm/spark/integration-test/pom.xml
@@ -100,7 +100,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</argLine>
+ <argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
index e8d2d9e..b7f5fb2 100644
--- a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
+++ b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
@@ -44,7 +44,7 @@ public class As2Sender {
As2Helper.AS2_NAME,
As2Helper.AS2_NAME, AS2MessageStructure.PLAIN,
ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII), null, null, null, null,
- null, As2Helper.DISPOSITION_NOTIFICATION_TO, As2Helper.SIGNED_RECEIPT_MIC_ALGORITHMS, null, null);
+ null, As2Helper.DISPOSITION_NOTIFICATION_TO, As2Helper.SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
}
public interface As2SenderClient {
diff --git a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
index 6e55116..8646edc 100644
--- a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
+++ b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
@@ -61,6 +61,7 @@ public class GooglePubsubTestResource implements QuarkusTestResourceLifecycleMan
"project.id", PROJECT_ID,
"topic.name", TOPIC,
"subscription.name", SUBSCRIPTION,
+ "camel.component.google-pubsub.authenticate", "false",
"camel.component.google-pubsub.endpoint", container.getEmulatorEndpoint());
} catch (Exception e) {
throw new RuntimeException(e);