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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new bf57e1a Regen
bf57e1a is described below
commit bf57e1ad92ad066ea54e462fb8b64c3caccd96bc
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Jan 29 10:58:08 2020 +0100
Regen
---
.../apache/camel/springboot/catalog/dataformats/crypto.json | 2 +-
components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
.../crypto/springboot/CryptoDataFormatConfiguration.java | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 5 -----
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/crypto.json
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/crypto.json
index c3fbc75..b169a39 100644
---
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/crypto.json
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/crypto.json
@@ -23,7 +23,7 @@
"algorithmParameterRef": { "kind": "attribute", "displayName": "Algorithm
Parameter Ref", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "A JCE
AlgorithmParameterSpec used to initialize the Cipher. Will lookup the type
using the given name as a java.security.spec.AlgorithmParameterSpec type." },
"buffersize": { "kind": "attribute", "displayName": "Buffersize",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "secret": false, "description": "The size of the buffer
used in the signature process." },
"macAlgorithm": { "kind": "attribute", "displayName": "Mac Algorithm",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "defaultValue": "HmacSHA1",
"description": "The JCE algorithm name indicating the Message Authentication
algorithm." },
- "shouldAppendHMAC": { "kind": "attribute", "displayName": "Should Append
HMAC", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "secret": false, "defaultValue": true, "description":
"Flag indicating that a Message Authentication Code should be calculated and
appended to the encrypted data." },
+ "shouldAppendHMAC": { "kind": "attribute", "displayName": "Should Append
HMAC", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "secret": false, "defaultValue": false, "description":
"Flag indicating that a Message Authentication Code should be calculated and
appended to the encrypted data." },
"inline": { "kind": "attribute", "displayName": "Inline", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"secret": false, "defaultValue": false, "description": "Flag indicating that
the configured IV should be inlined into the encrypted data stream. Is by
default false." },
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type
Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "secret": false, "defaultValue": false, "description":
"Whether the data format should set the Content-Type header with the type from
the data format if the data format is capable of doing so. For example
application\/xml for data formats marshalling to XML, or application\/json for
data formats marshalling to JS [...]
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Sets the value of the id property." }
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 47eae69..d834111 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConfiguration.java
b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConfiguration.java
index cd24307..14fed12 100644
---
a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConfiguration.java
+++
b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConfiguration.java
@@ -73,7 +73,7 @@ public class CryptoDataFormatConfiguration
* Flag indicating that a Message Authentication Code should be calculated
* and appended to the encrypted data.
*/
- private Boolean shouldAppendHMAC = true;
+ private Boolean shouldAppendHMAC = false;
/**
* Flag indicating that the configured IV should be inlined into the
* encrypted data stream. Is by default false.
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 4850215..c7a57b6 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -1797,11 +1797,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>target</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.camel.tests</groupId>
<artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
<version>3.1.0-SNAPSHOT</version>
