Fix #96: Switched to com.melloware Jasypt for Java8+ support.

ulisesbocchio · Dec 3, 2018 · 5e81467 · 5e81467 · apacheshine · Dec 20, 2018
1 parent 184d375
commit 5e81467
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/...stom-encryptor-no-starter/src/main/java/demo/CustomEncryptorDemoApplicationNoStarter.java b/...stom-encryptor-no-starter/src/main/java/demo/CustomEncryptorDemoApplicationNoStarter.java
@@ -56,6 +56,7 @@ public StringEncryptor stringEncryptor() {
         config.setPoolSize("1");
         config.setProviderName("SunJCE");
         config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator");
+        config.setIvGeneratorClassName("org.jasypt.salt.NoOpIVGenerator");
         config.setStringOutputType("base64");
         encryptor.setConfig(config);
         return encryptor;

diff --git a/...-spring-boot-demo-custom-encryptor/src/main/java/demo/CustomEncryptorDemoApplication.java b/...-spring-boot-demo-custom-encryptor/src/main/java/demo/CustomEncryptorDemoApplication.java
@@ -50,6 +50,7 @@ public StringEncryptor stringEncryptor() {
         config.setPoolSize("1");
         config.setProviderName("SunJCE");
         config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator");
+        config.setIvGeneratorClassName("org.jasypt.salt.NoOpIVGenerator");
         config.setStringOutputType("base64");
         encryptor.setConfig(config);
         return encryptor;

diff --git a/...ring-boot-demo-custom-resolver-bean/src/main/java/demo/MyEncryptablePropertyResolver.java b/...ring-boot-demo-custom-resolver-bean/src/main/java/demo/MyEncryptablePropertyResolver.java
@@ -22,6 +22,7 @@ public MyEncryptablePropertyResolver(String password) {
         config.setPoolSize(1);
         config.setProviderName("SunJCE");
         config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator");
+        config.setIvGeneratorClassName("org.jasypt.salt.NoOpIVGenerator");
         config.setStringOutputType("base64");
         encryptor.setConfig(config);
     }

diff --git a/...pt-spring-boot-demo-custom-resolver/src/main/java/demo/MyEncryptablePropertyResolver.java b/...pt-spring-boot-demo-custom-resolver/src/main/java/demo/MyEncryptablePropertyResolver.java
@@ -21,6 +21,7 @@ public MyEncryptablePropertyResolver(char[] password) {
         config.setPoolSize(1);
         config.setProviderName("SunJCE");
         config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator");
+        config.setIvGeneratorClassName("org.jasypt.salt.NoOpIVGenerator");
         config.setStringOutputType("base64");
         encryptor.setConfig(config);
     }

diff --git a/jasypt-spring-boot-demo-no-password/src/main/resources/application.yml b/jasypt-spring-boot-demo-no-password/src/main/resources/application.yml
@@ -3,5 +3,5 @@ jasypt:
     bean: encryptorBean
     password: ${JASYPT_ENCRYPTOR_PASSWORD:}
 
-username: uli
+test.user: uli
 #password: ENC(nrmZtkF7T0kjG/VodDvBw93Ct8EgjCA+)
diff --git a/jasypt-spring-boot-demo-no-password/src/test/java/demo/NoPasswordDemoApplicationTest.java b/jasypt-spring-boot-demo-no-password/src/test/java/demo/NoPasswordDemoApplicationTest.java
@@ -25,6 +25,6 @@ public class NoPasswordDemoApplicationTest {
 
     @Test
     public void testUsername() {
-        Assert.assertEquals("uli", environment.getProperty("username"));
+        Assert.assertEquals("uli", environment.getProperty("test.user"));
     }
 }
diff --git a/jasypt-spring-boot-demo/src/main/java/demo/DemoApplication.java b/jasypt-spring-boot-demo/src/main/java/demo/DemoApplication.java
@@ -65,6 +65,7 @@ static public StringEncryptor stringEncryptor() {
         config.setPoolSize("1");
         config.setProviderName("SunJCE");
         config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator");
+        config.setIvGeneratorClassName("org.jasypt.salt.NoOpIVGenerator");
         config.setStringOutputType("base64");
         encryptor.setConfig(config);
         return encryptor;

diff --git a/pom.xml b/pom.xml
@@ -14,10 +14,9 @@
         <java.version>1.8</java.version>
         <spring.boot.version>2.1.0.RELEASE</spring.boot.version>
         <spring.cloud.version>Finchley.RELEASE</spring.cloud.version>
-        <jasypt.version>1.9.2</jasypt.version>
         <maven.compiler.version>3.7.0</maven.compiler.version>
         <start-class>Application</start-class>
-        <jasypt.spring.boot.version>2.1.0</jasypt.spring.boot.version>
+        <jasypt.spring.boot.version>2.1.1-SNAPSHOT</jasypt.spring.boot.version>
     </properties>
 
     <modules>
@@ -130,11 +129,6 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring.boot.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jasypt</groupId>
-                <artifactId>jasypt</artifactId>
-                <version>${jasypt.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.github.ulisesbocchio</groupId>
                 <artifactId>jasypt-spring-boot</artifactId>