This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 88dd47ba3a1 CAMEL-20917: fix lots of NPEs introduced by the fix
add 61d97a34564 Separated PGPDataFormat into camel-cypto-pgp (#14651)
No new revisions were added by this update.
Summary of changes:
bom/camel-bom/pom.xml | 5 +++++
catalog/camel-allcomponents/pom.xml | 5 +++++
.../resources/org/apache/camel/catalog/dataformats/pgp.json | 2 +-
components/{camel-crypto => camel-crypto-pgp}/pom.xml | 11 +++--------
.../camel/converter/crypto/PGPDataFormatConfigurer.java | 0
.../META-INF/org/apache/camel/converter/crypto/pgp.json | 2 +-
.../services/org/apache/camel/configurer/pgp-dataformat | 0
.../services/org/apache/camel/dataformat.properties | 7 +++++++
.../META-INF/services/org/apache/camel/dataformat/pgp | 0
.../src/main/docs/pgp-dataformat.adoc | 2 +-
.../converter/crypto/DefaultPGPPassphraseAccessor.java | 0
.../camel/converter/crypto/DefaultPGPPublicKeyAccessor.java | 0
.../camel/converter/crypto/DefaultPGPSecretKeyAccessor.java | 0
.../org/apache/camel/converter/crypto/PGPDataFormat.java | 0
.../apache/camel/converter/crypto/PGPDataFormatUtil.java | 0
.../camel/converter/crypto/PGPKeyAccessDataFormat.java | 0
.../camel/converter/crypto/PGPPassphraseAccessor.java | 0
.../apache/camel/converter/crypto/PGPPublicKeyAccessor.java | 0
.../apache/camel/converter/crypto/PGPSecretKeyAccessor.java | 0
.../crypto/PGPSecretKeyAndPrivateKeyAndUserId.java | 0
.../camel/converter/crypto/AbstractPGPDataFormatTest.java | 0
.../camel/converter/crypto/PGPDataFormatDynamicTest.java | 0
.../camel/converter/crypto/PGPDataFormatElGamalTest.java | 0
.../apache/camel/converter/crypto/PGPDataFormatTest.java | 0
.../camel/converter/crypto/PGPDataFormatWithProvider.java | 0
.../crypto/SpringPGPDataFormatNoPassPhraseTest.java | 0
.../camel/converter/crypto/SpringPGPDataFormatTest.java | 0
.../crypto/SpringPGPDataFormatNoPassPhraseTest.xml | 0
.../camel/component/crypto/SpringPGPDataFormatTest.xml | 0
.../org/apache/camel/component/crypto/camel-private.pgp | Bin
.../org/apache/camel/component/crypto/camel-public.pgp | Bin
.../org/apache/camel/component/crypto/pubring-ElGamal.gpg | Bin
.../resources/org/apache/camel/component/crypto/pubring.gpg | Bin
.../org/apache/camel/component/crypto/pubringSubKeys.gpg | Bin
.../org/apache/camel/component/crypto/secring-ElGamal.gpg | Bin
.../resources/org/apache/camel/component/crypto/secring.gpg | Bin
.../org/apache/camel/component/crypto/secringSubKeys.gpg | Bin
components/camel-crypto/pom.xml | 5 -----
.../services/org/apache/camel/dataformat.properties | 2 +-
components/pom.xml | 1 +
docs/components/modules/dataformats/examples/json/pgp.json | 2 +-
.../modules/dataformats/pages/pgp-dataformat.adoc | 2 +-
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 4 ++++
parent/pom.xml | 5 +++++
44 files changed, 36 insertions(+), 19 deletions(-)
copy components/{camel-crypto => camel-crypto-pgp}/pom.xml (87%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/generated/java/org/apache/camel/converter/crypto/PGPDataFormatConfigurer.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/generated/resources/META-INF/org/apache/camel/converter/crypto/pgp.json
(99%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/generated/resources/META-INF/services/org/apache/camel/configurer/pgp-dataformat
(100%)
create mode 100644
components/camel-crypto-pgp/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
rename components/{camel-crypto =>
camel-crypto-pgp}/src/generated/resources/META-INF/services/org/apache/camel/dataformat/pgp
(100%)
copy components/{camel-crypto =>
camel-crypto-pgp}/src/main/docs/pgp-dataformat.adoc (99%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPassphraseAccessor.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/PGPPublicKeyAccessor.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAccessor.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAndPrivateKeyAndUserId.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatWithProvider.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatNoPassPhraseTest.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatTest.java
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/SpringPGPDataFormatNoPassPhraseTest.xml
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/SpringPGPDataFormatTest.xml
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/camel-private.pgp
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/camel-public.pgp
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/pubring-ElGamal.gpg
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/pubring.gpg
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/pubringSubKeys.gpg
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/secring-ElGamal.gpg
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/secring.gpg
(100%)
rename components/{camel-crypto =>
camel-crypto-pgp}/src/test/resources/org/apache/camel/component/crypto/secringSubKeys.gpg
(100%)
