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:45 UTC
[camel] 01/02: Upgrade Localstack image to 0.12.6
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;