You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/02/03 17:02:44 UTC
[camel] branch master updated (9f57ae2 -> 3fb91b1)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 9f57ae2 Fixed test
new 5097893 Upgrade Localstack image to 0.12.6
new 3fb91b1 Upgrade Localstack image to 0.12.6 for SQS too
The 2 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:
.../apache/camel/catalog/schemas/camel-spring.xsd | 20 ++------------------
.../camel/test/infra/aws2/services/AWSContainer.java | 2 +-
.../aws2/services/AWSSQSLocalContainerService.java | 2 +-
3 files changed, 4 insertions(+), 20 deletions(-)
[camel] 01/02: Upgrade Localstack image to 0.12.6
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5097893d9d859bea3e3ff1a893b3938f6720b729
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 3 17:56:45 2021 +0100
Upgrade Localstack image to 0.12.6
---
.../apache/camel/catalog/schemas/camel-spring.xsd | 20 ++------------------
.../camel/test/infra/aws2/services/AWSContainer.java | 2 +-
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index d7cdfbd..c4815a3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -6651,15 +6651,7 @@ Class name of the java type to use when unmarshalling.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="jsonViewTypeName" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-When marshalling a POJO to JSON you might want to exclude certain fields from
-the JSON output. With Jackson you can use JSON views to accomplish this. This
-option is to refer to the class which has JsonView annotations.
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
+ <xs:attribute name="jsonView" type="xs:string"/>
<xs:attribute name="include" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
@@ -6974,15 +6966,7 @@ Class name of the java type to use when unmarshalling.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="jsonViewTypeName" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-When marshalling a POJO to JSON you might want to exclude certain fields from
-the JSON output. With Jackson you can use JSON views to accomplish this. This
-option is to refer to the class which has JsonView annotations.
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
+ <xs:attribute name="jsonView" type="xs:string"/>
<xs:attribute name="include" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
index 24d2979..3a456d3 100644
--- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
+++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
@@ -35,7 +35,7 @@ import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
behave as in runtime.
*/
public class AWSContainer extends GenericContainer<AWSContainer> {
- private static final String LOCALSTACK_CONTAINER = "localstack/localstack:0.12.5";
+ private static final String LOCALSTACK_CONTAINER = "localstack/localstack:0.12.6";
private static final Logger LOG = LoggerFactory.getLogger(AWSLocalContainerService.class);
private static final int SERVICE_PORT = 4566;
[camel] 02/02: Upgrade Localstack image to 0.12.6 for SQS too
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3fb91b127f4932287b0f9a3c3276cc136657629a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 3 17:57:07 2021 +0100
Upgrade Localstack image to 0.12.6 for SQS too
---
.../camel/test/infra/aws2/services/AWSSQSLocalContainerService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java
index bc0215c..86214bd 100644
--- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java
+++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java
@@ -20,6 +20,6 @@ package org.apache.camel.test.infra.aws2.services;
public class AWSSQSLocalContainerService extends AWSLocalContainerService {
public AWSSQSLocalContainerService() {
- super("localstack/localstack:0.12.5", Service.SQS);
+ super("localstack/localstack:0.12.6", Service.SQS);
}
}