This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 76cbfe0a9ac Separated PGPDataFormat into camel-cypto-pgp
76cbfe0a9ac is described below
commit 76cbfe0a9acd5179c19a92bc9354c6bd3f95fe53
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jun 26 13:02:40 2024 +0200
Separated PGPDataFormat into camel-cypto-pgp
---
.../camel/springboot/catalog/dataformats/pgp.json | 2 +-
.../pom.xml | 7 +-
.../src/main/docs/crypto-pgp.json | 115 ++++++++++++
.../springboot/PGPDataFormatAutoConfiguration.java | 0
.../springboot/PGPDataFormatConfiguration.java | 0
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
...rk.boot.autoconfigure.AutoConfiguration.imports | 5 +-
components-starter/camel-crypto-starter/pom.xml | 1 -
.../camel-crypto-starter/src/main/docs/crypto.json | 108 -----------
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 -
components-starter/pom.xml | 1 +
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 10 +
14 files changed, 350 insertions(+), 119 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/pgp.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/pgp.json
index 8c41d74d442..37ae8373181 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/pgp.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/pgp.json
@@ -10,7 +10,7 @@
"javaType": "org.apache.camel.converter.crypto.PGPDataFormat",
"supportLevel": "Stable",
"groupId": "org.apache.camel.springboot",
- "artifactId": "camel-crypto-starter",
+ "artifactId": "camel-crypto-pgp-starter",
"version": "4.7.0-SNAPSHOT",
"modelName": "pgp",
"modelJavaType": "org.apache.camel.model.dataformat.PGPDataFormat"
diff --git a/components-starter/camel-crypto-starter/pom.xml
b/components-starter/camel-crypto-pgp-starter/pom.xml
similarity index 89%
copy from components-starter/camel-crypto-starter/pom.xml
copy to components-starter/camel-crypto-pgp-starter/pom.xml
index 8d3d074fe8f..5fdf093bdfb 100644
--- a/components-starter/camel-crypto-starter/pom.xml
+++ b/components-starter/camel-crypto-pgp-starter/pom.xml
@@ -24,10 +24,9 @@
<artifactId>components-starter</artifactId>
<version>4.7.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-crypto-starter</artifactId>
+ <artifactId>camel-crypto-pgp-starter</artifactId>
<packaging>jar</packaging>
- <name>Camel SB Starters :: Crypto</name>
- <description>Spring-Boot Starter for Camel Cryptographic
Support</description>
+ <name>Camel SB Starters :: Crypto PGP</name>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -36,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-crypto</artifactId>
+ <artifactId>camel-crypto-pgp</artifactId>
<version>${camel-version}</version>
</dependency>
<!--START OF GENERATED CODE-->
diff --git
a/components-starter/camel-crypto-pgp-starter/src/main/docs/crypto-pgp.json
b/components-starter/camel-crypto-pgp-starter/src/main/docs/crypto-pgp.json
new file mode 100644
index 00000000000..5b6cd717934
--- /dev/null
+++ b/components-starter/camel-crypto-pgp-starter/src/main/docs/crypto-pgp.json
@@ -0,0 +1,115 @@
+{
+ "groups": [
+ {
+ "name": "camel.dataformat.pgp",
+ "type":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.customizer",
+ "type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration",
+ "sourceMethod": "getCustomizer()"
+ }
+ ],
+ "properties": [
+ {
+ "name": "camel.dataformat.pgp.algorithm",
+ "type": "java.lang.Integer",
+ "description": "Symmetric key encryption algorithm; possible values are
defined in org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; for example 2 (=
TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only
relevant for encrypting.",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.armored",
+ "type": "java.lang.Boolean",
+ "description": "This option will cause PGP to base64 encode the
encrypted text, making it available for copy\/paste, etc.",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration",
+ "defaultValue": false
+ },
+ {
+ "name": "camel.dataformat.pgp.compression-algorithm",
+ "type": "java.lang.Integer",
+ "description": "Compression algorithm; possible values are defined in
org.bouncycastle.bcpg.CompressionAlgorithmTags; for example 0 (= UNCOMPRESSED),
1 (= ZIP), 2 (= ZLIB), 3 (= BZIP2). Only relevant for encrypting.",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.customizer.enabled",
+ "type": "java.lang.Boolean",
+ "sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
+ },
+ {
+ "name": "camel.dataformat.pgp.enabled",
+ "type": "java.lang.Boolean",
+ "description": "Whether to enable auto configuration of the pgp data
format. This is enabled by default.",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.hash-algorithm",
+ "type": "java.lang.Integer",
+ "description": "Signature hash algorithm; possible values are defined in
org.bouncycastle.bcpg.HashAlgorithmTags; for example 2 (= SHA1), 8 (= SHA256),
9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing.",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.integrity",
+ "type": "java.lang.Boolean",
+ "description": "Adds an integrity check\/sign into the encryption file.
The default value is true.",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration",
+ "defaultValue": true
+ },
+ {
+ "name": "camel.dataformat.pgp.key-file-name",
+ "type": "java.lang.String",
+ "description": "Filename of the keyring; must be accessible as a
classpath resource (but you can specify a location in the file system by using
the file: prefix).",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.key-userid",
+ "type": "java.lang.String",
+ "description": "The user ID of the key in the PGP keyring used during
encryption. Can also be only a part of a user ID. For example, if the user ID
is Test User then you can use the part Test User or to address the user ID.",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.password",
+ "type": "java.lang.String",
+ "description": "Password used when opening the private key (not used for
encryption).",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.provider",
+ "type": "java.lang.String",
+ "description": "Java Cryptography Extension (JCE) provider, default is
Bouncy Castle (BC). Alternatively you can use, for example, the IAIK JCE
provider; in this case the provider must be registered beforehand and the
Bouncy Castle provider must not be registered beforehand. The Sun JCE provider
does not work.",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.signature-key-file-name",
+ "type": "java.lang.String",
+ "description": "Filename of the keyring to use for signing (during
encryption) or for signature verification (during decryption); must be
accessible as a classpath resource (but you can specify a location in the file
system by using the file: prefix).",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.signature-key-ring",
+ "type": "java.lang.String",
+ "description": "Keyring used for signing\/verifying as byte array. You
can not set the signatureKeyFileName and signatureKeyRing at the same time.",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.signature-key-userid",
+ "type": "java.lang.String",
+ "description": "User ID of the key in the PGP keyring used for signing
(during encryption) or signature verification (during decryption). During the
signature verification process the specified User ID restricts the public keys
from the public keyring which can be used for the verification. If no User ID
is specified for the signature verficiation then any public key in the public
keyring can be used for the verification. Can also be only a part of a user ID.
For example, if the us [...]
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.signature-password",
+ "type": "java.lang.String",
+ "description": "Password used when opening the private key used for
signing (during encryption).",
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.pgp.signature-verification-option",
+ "type": "java.lang.String",
+ "description": "Controls the behavior for verifying the signature during
unmarshaling. There are 4 values possible: optional: The PGP message may or may
not contain signatures; if it does contain signatures, then a signature
verification is executed. required: The PGP message must contain at least one
signature; if this is not the case an exception (PGPException) is thrown. A
signature verification is executed. ignore: Contained signatures in the PGP
message are ignored; no signatu [...]
+ "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
+ }
+ ],
+ "hints": []
+}
\ No newline at end of file
diff --git
a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
b/components-starter/camel-crypto-pgp-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
similarity index 100%
rename from
components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
rename to
components-starter/camel-crypto-pgp-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
diff --git
a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatConfiguration.java
b/components-starter/camel-crypto-pgp-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatConfiguration.java
similarity index 100%
rename from
components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatConfiguration.java
rename to
components-starter/camel-crypto-pgp-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatConfiguration.java
diff --git
a/components-starter/camel-crypto-pgp-starter/src/main/resources/META-INF/LICENSE.txt
b/components-starter/camel-crypto-pgp-starter/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 00000000000..6b0b1270ff0
--- /dev/null
+++
b/components-starter/camel-crypto-pgp-starter/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff --git
a/components-starter/camel-crypto-pgp-starter/src/main/resources/META-INF/NOTICE.txt
b/components-starter/camel-crypto-pgp-starter/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 00000000000..2e215bf2e6b
--- /dev/null
+++
b/components-starter/camel-crypto-pgp-starter/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
diff --git
a/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/components-starter/camel-crypto-pgp-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 79%
copy from
components-starter/camel-crypto-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
copy to
components-starter/camel-crypto-pgp-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 826c2728603..d5073a99a6c 100644
---
a/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++
b/components-starter/camel-crypto-pgp-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -15,7 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-org.apache.camel.component.crypto.springboot.DigitalSignatureComponentConverter
-org.apache.camel.component.crypto.springboot.DigitalSignatureComponentAutoConfiguration
-org.apache.camel.converter.crypto.springboot.PGPDataFormatAutoConfiguration
-org.apache.camel.converter.crypto.springboot.CryptoDataFormatAutoConfiguration
+org.apache.camel.converter.crypto.springboot.PGPDataFormatAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/camel-crypto-starter/pom.xml
b/components-starter/camel-crypto-starter/pom.xml
index 8d3d074fe8f..50a57e2cdee 100644
--- a/components-starter/camel-crypto-starter/pom.xml
+++ b/components-starter/camel-crypto-starter/pom.xml
@@ -27,7 +27,6 @@
<artifactId>camel-crypto-starter</artifactId>
<packaging>jar</packaging>
<name>Camel SB Starters :: Crypto</name>
- <description>Spring-Boot Starter for Camel Cryptographic
Support</description>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/components-starter/camel-crypto-starter/src/main/docs/crypto.json
b/components-starter/camel-crypto-starter/src/main/docs/crypto.json
index ebfb3c8d34c..fa30c498ac0 100644
--- a/components-starter/camel-crypto-starter/src/main/docs/crypto.json
+++ b/components-starter/camel-crypto-starter/src/main/docs/crypto.json
@@ -21,17 +21,6 @@
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.converter.crypto.springboot.CryptoDataFormatConfiguration",
"sourceMethod": "getCustomizer()"
- },
- {
- "name": "camel.dataformat.pgp",
- "type":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.customizer",
- "type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration",
- "sourceMethod": "getCustomizer()"
}
],
"properties": [
@@ -245,103 +234,6 @@
"description": "Flag indicating that a Message Authentication Code
should be calculated and appended to the encrypted data.",
"sourceType":
"org.apache.camel.converter.crypto.springboot.CryptoDataFormatConfiguration",
"defaultValue": true
- },
- {
- "name": "camel.dataformat.pgp.algorithm",
- "type": "java.lang.Integer",
- "description": "Symmetric key encryption algorithm; possible values are
defined in org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; for example 2 (=
TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only
relevant for encrypting.",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.armored",
- "type": "java.lang.Boolean",
- "description": "This option will cause PGP to base64 encode the
encrypted text, making it available for copy\/paste, etc.",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration",
- "defaultValue": false
- },
- {
- "name": "camel.dataformat.pgp.compression-algorithm",
- "type": "java.lang.Integer",
- "description": "Compression algorithm; possible values are defined in
org.bouncycastle.bcpg.CompressionAlgorithmTags; for example 0 (= UNCOMPRESSED),
1 (= ZIP), 2 (= ZLIB), 3 (= BZIP2). Only relevant for encrypting.",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.customizer.enabled",
- "type": "java.lang.Boolean",
- "sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
- },
- {
- "name": "camel.dataformat.pgp.enabled",
- "type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the pgp data
format. This is enabled by default.",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.hash-algorithm",
- "type": "java.lang.Integer",
- "description": "Signature hash algorithm; possible values are defined in
org.bouncycastle.bcpg.HashAlgorithmTags; for example 2 (= SHA1), 8 (= SHA256),
9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing.",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.integrity",
- "type": "java.lang.Boolean",
- "description": "Adds an integrity check\/sign into the encryption file.
The default value is true.",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.dataformat.pgp.key-file-name",
- "type": "java.lang.String",
- "description": "Filename of the keyring; must be accessible as a
classpath resource (but you can specify a location in the file system by using
the file: prefix).",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.key-userid",
- "type": "java.lang.String",
- "description": "The user ID of the key in the PGP keyring used during
encryption. Can also be only a part of a user ID. For example, if the user ID
is Test User then you can use the part Test User or to address the user ID.",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.password",
- "type": "java.lang.String",
- "description": "Password used when opening the private key (not used for
encryption).",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.provider",
- "type": "java.lang.String",
- "description": "Java Cryptography Extension (JCE) provider, default is
Bouncy Castle (BC). Alternatively you can use, for example, the IAIK JCE
provider; in this case the provider must be registered beforehand and the
Bouncy Castle provider must not be registered beforehand. The Sun JCE provider
does not work.",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.signature-key-file-name",
- "type": "java.lang.String",
- "description": "Filename of the keyring to use for signing (during
encryption) or for signature verification (during decryption); must be
accessible as a classpath resource (but you can specify a location in the file
system by using the file: prefix).",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.signature-key-ring",
- "type": "java.lang.String",
- "description": "Keyring used for signing\/verifying as byte array. You
can not set the signatureKeyFileName and signatureKeyRing at the same time.",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.signature-key-userid",
- "type": "java.lang.String",
- "description": "User ID of the key in the PGP keyring used for signing
(during encryption) or signature verification (during decryption). During the
signature verification process the specified User ID restricts the public keys
from the public keyring which can be used for the verification. If no User ID
is specified for the signature verficiation then any public key in the public
keyring can be used for the verification. Can also be only a part of a user ID.
For example, if the us [...]
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.signature-password",
- "type": "java.lang.String",
- "description": "Password used when opening the private key used for
signing (during encryption).",
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.pgp.signature-verification-option",
- "type": "java.lang.String",
- "description": "Controls the behavior for verifying the signature during
unmarshaling. There are 4 values possible: optional: The PGP message may or may
not contain signatures; if it does contain signatures, then a signature
verification is executed. required: The PGP message must contain at least one
signature; if this is not the case an exception (PGPException) is thrown. A
signature verification is executed. ignore: Contained signatures in the PGP
message are ignored; no signatu [...]
- "sourceType":
"org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration"
}
],
"hints": []
diff --git
a/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 826c2728603..2ddc3ade65d 100644
---
a/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++
b/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -17,5 +17,4 @@
org.apache.camel.component.crypto.springboot.DigitalSignatureComponentConverter
org.apache.camel.component.crypto.springboot.DigitalSignatureComponentAutoConfiguration
-org.apache.camel.converter.crypto.springboot.PGPDataFormatAutoConfiguration
org.apache.camel.converter.crypto.springboot.CryptoDataFormatAutoConfiguration
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index bbd349b1e89..7e03d8bc7e2 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -177,6 +177,7 @@
<module>camel-couchbase-starter</module>
<module>camel-couchdb-starter</module>
<module>camel-cron-starter</module>
+ <module>camel-crypto-pgp-starter</module>
<module>camel-crypto-starter</module>
<module>camel-csimple-joor-starter</module>
<module>camel-csv-starter</module>
diff --git a/tooling/camel-spring-boot-bom/pom.xml
b/tooling/camel-spring-boot-bom/pom.xml
index 341c3d823d1..a8e9ec298ba 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -408,6 +408,11 @@
<artifactId>camel-cron-starter</artifactId>
<version>4.7.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-crypto-pgp-starter</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-crypto-starter</artifactId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 7b682b878a0..6c67cd44038 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -657,6 +657,11 @@
<artifactId>camel-cron-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-crypto-pgp-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-crypto-starter</artifactId>
@@ -2594,6 +2599,11 @@
<artifactId>camel-crypto</artifactId>
<version>4.7.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-crypto-pgp</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-csimple-joor</artifactId>
