diff --git a/jasypt/pom.xml b/jasypt/pom.xml
deleted file mode 100644
index 7e0c51f0b9..0000000000
--- a/jasypt/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- parent-modules
- com.baeldung
- 1.0.0-SNAPSHOT
-
- 4.0.0
-
- jasypt
-
-
-
- org.jasypt
- jasypt
- ${jasypt.version}
-
-
- junit
- junit
- ${junit.version}
- test
-
-
-
-
- 1.9.2
- 4.12
-
-
-
-
\ No newline at end of file
diff --git a/libraries/pom.xml b/libraries/pom.xml
index ee93ee934f..05f8dc47cf 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -31,6 +31,11 @@
cglib
${cglib.version}
+
+ org.jasypt
+ jasypt
+ ${jasypt.version}
+
junit
junit
@@ -42,6 +47,7 @@
3.2.4
4.12
+ 1.9.2
diff --git a/jasypt/src/test/java/org/baeldung/jasypt/JasyptTest.java b/libraries/src/test/java/com/baeldung/jasypt/JasyptTest.java
similarity index 66%
rename from jasypt/src/test/java/org/baeldung/jasypt/JasyptTest.java
rename to libraries/src/test/java/com/baeldung/jasypt/JasyptTest.java
index c4bed5de83..fbfa7f823d 100644
--- a/jasypt/src/test/java/org/baeldung/jasypt/JasyptTest.java
+++ b/libraries/src/test/java/com/baeldung/jasypt/JasyptTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.jasypt;
+package com.baeldung.jasypt;
import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
@@ -8,27 +8,25 @@ import org.jasypt.util.text.BasicTextEncryptor;
import org.junit.Ignore;
import org.junit.Test;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.*;
import static junit.framework.TestCase.assertEquals;
public class JasyptTest {
@Test
- public void givenTextPassword_whenDecrypt_thenCompareToEncrypted() {
+ public void givenTextPrivateData_whenDecrypt_thenCompareToEncrypted() {
//given
BasicTextEncryptor textEncryptor = new BasicTextEncryptor();
- String password = "secret-pass";
- textEncryptor.setPasswordCharArray("some-random-password".toCharArray());
+ String privateData = "secret-data";
+ textEncryptor.setPasswordCharArray("some-random-data".toCharArray());
//when
- String myEncryptedText = textEncryptor.encrypt(password);
- assertNotSame(password, myEncryptedText); //myEncryptedText can be save in db
+ String myEncryptedText = textEncryptor.encrypt(privateData);
+ assertNotSame(privateData, myEncryptedText); //myEncryptedText can be save in db
//then
String plainText = textEncryptor.decrypt(myEncryptedText);
- assertEquals(plainText, password);
+ assertEquals(plainText, privateData);
}
@Test
@@ -61,38 +59,38 @@ public class JasyptTest {
@Test
@Ignore("should have installed local_policy.jar")
- public void givenTextPassword_whenDecrypt_thenCompareToEncryptedWithCustomAlgorithm() {
+ public void givenTextPrivateData_whenDecrypt_thenCompareToEncryptedWithCustomAlgorithm() {
//given
StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
- String password = "secret-pass";
- encryptor.setPassword("secret-pass");
+ String privateData = "secret-data";
+ encryptor.setPassword("some-random-data");
encryptor.setAlgorithm("PBEWithMD5AndTripleDES");
//when
String encryptedText = encryptor.encrypt("secret-pass");
- assertNotSame(password, encryptedText);
+ assertNotSame(privateData, encryptedText);
//then
String plainText = encryptor.decrypt(encryptedText);
- assertEquals(plainText, password);
+ assertEquals(plainText, privateData);
}
@Test
@Ignore("should have installed local_policy.jar")
- public void givenTextPassword_whenDecryptOnHighPerformance_thenDecrypt(){
+ public void givenTextPrivateData_whenDecryptOnHighPerformance_thenDecrypt(){
//given
- String password = "secret-pass";
+ String privateData = "secret-data";
PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
encryptor.setPoolSize(4);
- encryptor.setPassword(password);
+ encryptor.setPassword("some-random-data");
encryptor.setAlgorithm("PBEWithMD5AndTripleDES");
//when
- String encryptedText = encryptor.encrypt(password);
- assertNotSame(password, encryptedText);
+ String encryptedText = encryptor.encrypt(privateData);
+ assertNotSame(privateData, encryptedText);
//then
String plainText = encryptor.decrypt(encryptedText);
- assertEquals(plainText, password);
+ assertEquals(plainText, privateData);
}
}
diff --git a/pom.xml b/pom.xml
index 9c24200a0b..5230a680fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,6 @@
javaslang
javax-servlets
javaxval
- jasypt
jaxb
jee7
jjwt