This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jasypt.
commit b6fd8a5397f2f4098730a401be0247582f09bb6b Merge: 6556a58 50e1f74 Author: Emmanuel Bourg <[email protected]> Date: Wed May 18 11:54:59 2016 +0200 Merge tag 'upstream/1.9.2' Upstream version 1.9.2 .cvsignore | 5 - ChangeLog.txt | 47 ++ RELEASING.txt | 13 +- pom.xml | 432 ++---------- src/assembly/dist.xml | 69 -- src/main/bin/decrypt.bat | 20 - src/main/bin/decrypt.sh | 26 - src/main/bin/digest.bat | 20 - src/main/bin/digest.sh | 26 - src/main/bin/encrypt.bat | 20 - src/main/bin/encrypt.sh | 26 - src/main/bin/listAlgorithms.bat | 20 - src/main/bin/listAlgorithms.sh | 26 - .../java/org/jasypt/digest/PooledByteDigester.java | 2 - .../org/jasypt/digest/PooledStringDigester.java | 3 - .../org/jasypt/digest/StandardByteDigester.java | 24 +- .../config/EnvironmentStringDigesterConfig.java | 1 - .../digest/config/SimpleStringDigesterConfig.java | 1 - .../jasypt/digest/config/StringDigesterConfig.java | 1 - .../pbe/PooledPBEBigDecimalEncryptor.java | 2 - .../pbe/PooledPBEBigIntegerEncryptor.java | 2 - .../encryption/pbe/PooledPBEByteEncryptor.java | 1 - .../encryption/pbe/PooledPBEStringEncryptor.java | 4 +- .../pbe/StandardPBEBigDecimalEncryptor.java | 4 +- .../pbe/StandardPBEBigIntegerEncryptor.java | 4 +- .../encryption/pbe/StandardPBEByteEncryptor.java | 170 +++-- .../encryption/pbe/StandardPBEStringEncryptor.java | 60 +- .../PasswordAlreadyCleanedException.java | 4 +- .../EncryptedPasswordC3P0ConnectionProvider.java | 149 ---- ...tedPasswordDriverManagerConnectionProvider.java | 147 ---- .../encryptor/HibernatePBEBigDecimalEncryptor.java | 350 ---------- .../encryptor/HibernatePBEBigIntegerEncryptor.java | 349 ---------- .../encryptor/HibernatePBEByteEncryptor.java | 347 ---------- .../encryptor/HibernatePBEEncryptorRegistry.java | 341 ---------- .../encryptor/HibernatePBEStringEncryptor.java | 412 ------------ .../type/AbstractEncryptedAsStringType.java | 289 -------- .../type/EncryptedBigDecimalAsStringType.java | 115 ---- .../hibernate/type/EncryptedBigDecimalType.java | 376 ----------- .../type/EncryptedBigIntegerAsStringType.java | 115 ---- .../hibernate/type/EncryptedBigIntegerType.java | 327 --------- .../jasypt/hibernate/type/EncryptedBinaryType.java | 400 ----------- .../type/EncryptedBooleanAsStringType.java | 115 ---- .../hibernate/type/EncryptedByteAsStringType.java | 115 ---- .../type/EncryptedCalendarAsStringType.java | 165 ----- .../hibernate/type/EncryptedDateAsStringType.java | 126 ---- .../type/EncryptedDoubleAsStringType.java | 114 ---- .../hibernate/type/EncryptedFloatAsStringType.java | 115 ---- .../type/EncryptedIntegerAsStringType.java | 116 ---- .../hibernate/type/EncryptedLongAsStringType.java | 116 ---- .../hibernate/type/EncryptedShortAsStringType.java | 117 ---- .../jasypt/hibernate/type/EncryptedStringType.java | 115 ---- .../org/jasypt/hibernate/type/ParameterNaming.java | 129 ---- .../intf/service/JasyptStatelessService.java | 1 - .../java/org/jasypt/normalization/Normalizer.java | 89 ++- .../jasypt/properties/EncryptableProperties.java | 96 ++- ...rator.java => ByteArrayFixedSaltGenerator.java} | 26 +- .../jasypt/salt/FixedByteArraySaltGenerator.java | 5 + .../FixedSaltGenerator.java} | 32 +- .../org/jasypt/salt/FixedStringSaltGenerator.java | 5 + .../java/org/jasypt/salt/RandomSaltGenerator.java | 1 - ...enerator.java => StringFixedSaltGenerator.java} | 61 +- ...ncryptablePreferencesPlaceholderConfigurer.java | 110 --- .../EncryptablePropertyOverrideConfigurer.java | 113 ---- .../EncryptablePropertyPlaceholderConfigurer.java | 125 ---- ...ervletContextPropertyPlaceholderConfigurer.java | 127 ---- .../jasypt/spring/security/PBEPasswordEncoder.java | 253 ------- .../jasypt/spring/security/PasswordEncoder.java | 236 ------- .../spring/security2/PBEPasswordEncoder.java | 252 ------- .../jasypt/spring/security2/PasswordEncoder.java | 235 ------- .../spring/security3/PBEPasswordEncoder.java | 252 ------- .../jasypt/spring/security3/PasswordEncoder.java | 235 ------- .../security3/TokenBasedRememberMeServices.java | 161 ----- src/main/java/org/jasypt/util/digest/Digester.java | 1 - .../password/ConfigurablePasswordEncryptor.java | 1 - .../WebPBEInitializationContextListener.java | 1 - .../jasypt/web/pbeconfig/WebPBEInitializer.java | 1 - src/main/java/org/jasypt/wicket/JasyptCrypt.java | 120 ---- .../java/org/jasypt/wicket/JasyptCryptFactory.java | 87 --- src/main/javadoc/overview.html | 71 -- src/site/apt/advancedconfiguration.apt | 75 --- src/site/apt/bouncy-castle.apt | 104 --- src/site/apt/changelog.apt | 304 --------- src/site/apt/cli.apt | 320 --------- src/site/apt/contributing.apt | 118 ---- src/site/apt/dependencies.apt | 27 - src/site/apt/download.apt | 20 - src/site/apt/easy-usage.apt | 286 -------- src/site/apt/encrypting-binaries.apt | 153 ----- src/site/apt/encrypting-configuration.apt | 332 --------- src/site/apt/encrypting-numbers.apt | 178 ----- src/site/apt/encrypting-passwords.apt | 180 ----- src/site/apt/encrypting-texts.apt | 158 ----- src/site/apt/features.apt | 132 ---- src/site/apt/general-usage.apt | 254 ------- src/site/apt/hibernate3.apt | 252 ------- src/site/apt/index.apt | 74 -- src/site/apt/jaxb.apt | 228 ------- src/site/apt/lite.apt | 42 -- src/site/apt/mailinglists.apt | 26 - src/site/apt/maven.apt | 71 -- src/site/apt/non-default-providers.apt | 107 --- src/site/apt/seam2.apt | 225 ------- src/site/apt/spring.apt | 43 -- src/site/apt/springsecurity.apt | 261 ------- src/site/apt/tapestry.apt | 13 - src/site/apt/team.apt | 40 -- src/site/apt/webconfiguration.apt | 172 ----- src/site/apt/whatsnew17.apt | 240 ------- src/site/apt/wicket.apt | 125 ---- src/site/fml/faq.fml | 608 ----------------- src/site/other/Password Encryption.svg | 748 --------------------- src/site/other/google-analytics.txt | 6 - src/site/resources/css/site.css | 1 - src/site/resources/images/.cvsignore | 1 - src/site/resources/images/jasypt.png | Bin 7410 -> 0 bytes src/site/resources/images/jasypt_advantages.png | Bin 16253 -> 0 bytes src/site/resources/images/jasypt_advantages3.png | Bin 15111 -> 0 bytes src/site/resources/images/jasypt_advantages_2.png | Bin 16319 -> 0 bytes src/site/resources/images/passwordEncryption.png | Bin 27503 -> 0 bytes src/site/resources/images/webConfig.png | Bin 17941 -> 0 bytes src/site/site.xml | 105 --- src/site/xdoc/howtoencryptuserpasswords.xml | 570 ---------------- ...ryptorFixedSalt2BackwardsCompatibilityTest.java | 285 ++++++++ ...ryptorFixedSalt3BackwardsCompatibilityTest.java | 296 ++++++++ ...cryptorFixedSaltBackwardsCompatibilityTest.java | 287 ++++++++ .../jasypt/normalization/NormalizationTest.java | 38 +- .../properties/EncryptablePropertiesTest.java | 98 +++ ...cryptablePropertyPlaceholderConfigurerTest.java | 147 ---- src/test/resources/props.properties | 2 + 129 files changed, 1470 insertions(+), 15072 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jasypt.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
