You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2019/01/09 12:51:03 UTC
[camel] branch master updated (9274287 -> afd71b3)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 9274287 Upgrade Wiremock to version 2.20.0
new 9033c69 Don't output debug info to the console for the camel-crypto-cms component
new afd71b3 Fixing javadoc links
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/component/crypto/cms/crypt/RecipientInfo.java | 8 +++++---
components/camel-crypto-cms/src/test/resources/log4j2.properties | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
[camel] 01/02: Don't output debug info to the console for the
camel-crypto-cms component
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9033c6961b79feb052868905dadb04f750887758
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jan 9 12:43:35 2019 +0000
Don't output debug info to the console for the camel-crypto-cms component
---
components/camel-crypto-cms/src/test/resources/log4j2.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-crypto-cms/src/test/resources/log4j2.properties b/components/camel-crypto-cms/src/test/resources/log4j2.properties
index c55bc31..24b27c0 100644
--- a/components/camel-crypto-cms/src/test/resources/log4j2.properties
+++ b/components/camel-crypto-cms/src/test/resources/log4j2.properties
@@ -25,5 +25,5 @@ appender.out.name = out
appender.out.layout.type = PatternLayout
appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
rootLogger.level = DEBUG
-#rootLogger.appenderRef.file.ref = file
-rootLogger.appenderRef.out.ref = out
+rootLogger.appenderRef.file.ref = file
+#rootLogger.appenderRef.out.ref = out
[camel] 02/02: Fixing javadoc links
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit afd71b3eb80f13ee9c02984f517fa9e0a270c40c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jan 9 12:50:42 2019 +0000
Fixing javadoc links
---
.../apache/camel/component/crypto/cms/crypt/RecipientInfo.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/RecipientInfo.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/RecipientInfo.java
index 06110a4..5fc4fb5 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/RecipientInfo.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/RecipientInfo.java
@@ -39,9 +39,11 @@ package org.apache.camel.component.crypto.cms.crypt;
* <li>password based encryption: the content-encryption key is encrypted with
* key-encryption key derived from a password. The RecipientInfo is using a key
* derivation algorithm like PBKDF2 as specified by <a href =
- * http://www.ietf.org/rfc/rfc2898.txt" target="_blank">RFC 2898</a> (PKCS#5)
- * and a key encryption algorithm like PWRI-KEK as specified by <a href =
- * http://www.ietf.org/rfc/rfc3211.txt" target="_blank">RFC 3211</a>.
+ * "http://www.ietf.org/rfc/rfc2898.txt" target="_blank"
+ * rel="noopener noreferrer">RFC 2898</a> (PKCS#5) and a key encryption
+ * algorithm like PWRI-KEK as specified by <a href =
+ * "http://www.ietf.org/rfc/rfc3211.txt" target="_blank"
+ * rel="noopener noreferrer">RFC 3211</a>.
* <li>any other technique: based on private, user defined key management
* techniques
* </ul>