[karaf] branch master updated (eb44bd3 -> 0485f44)

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.


    from eb44bd3  [KARAF-6963] First send SIGTERM, only SIGKILL if not shutting down nicely (#1269)
     new 46709ca  KARAF-6925 - Initial attempt at supporting spring-security-crypto
     new 0485f44  Merge pull request #1259 from coheigea/KARAF-6925

The 8548 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:
 assemblies/features/standard/pom.xml               |   7 ++
 .../features/standard/src/main/feature/feature.xml |   7 ++
 bom/pom.xml                                        |   5 +
 jaas/pom.xml                                       |   1 +
 jaas/{jasypt => spring-security-crypto}/pom.xml    |  23 ++--
 .../spring_security_crypto}/impl/Activator.java    |   6 +-
 .../impl/SpringSecurityCryptoEncryption.java       | 122 +++++++++++++++++++++
 .../SpringSecurityCryptoEncryptionService.java}    |   7 +-
 .../src/main/resources/OSGI-INF/bundle.info        |  12 +-
 .../impl/SpringSecurityCryptoEncryptionTest.java   |  63 +++++++++++
 .../src/test/resources/log4j.properties            |   0
 11 files changed, 236 insertions(+), 17 deletions(-)
 copy jaas/{jasypt => spring-security-crypto}/pom.xml (86%)
 copy jaas/{jasypt/src/main/java/org/apache/karaf/jaas/jasypt => spring-security-crypto/src/main/java/org/apache/karaf/jaas/spring_security_crypto}/impl/Activator.java (89%)
 create mode 100644 jaas/spring-security-crypto/src/main/java/org/apache/karaf/jaas/spring_security_crypto/impl/SpringSecurityCryptoEncryption.java
 copy jaas/{modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryptionService.java => spring-security-crypto/src/main/java/org/apache/karaf/jaas/spring_security_crypto/impl/SpringSecurityCryptoEncryptionService.java} (80%)
 copy {deployer/spring => jaas/spring-security-crypto}/src/main/resources/OSGI-INF/bundle.info (66%)
 create mode 100644 jaas/spring-security-crypto/src/test/java/org/apache/karaf/jaas/spring_security_crypto/impl/SpringSecurityCryptoEncryptionTest.java
 copy jaas/{jasypt => spring-security-crypto}/src/test/resources/log4j.properties (100%)