Update Spring Boot 2.4.3 and Gradle 6.8.2 Jasypt

Jasypt/demo/.gitignore

@@ -13,6 +13,9 @@ build/
 .settings
 .springBeans
 .sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
 
 ### IntelliJ IDEA ###
 .idea

Jasypt/demo/build.gradle.kts

 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "2.3.4.RELEASE"
-    id("io.spring.dependency-management") version "1.0.10.RELEASE"
-    kotlin("jvm") version "1.3.72"
-    kotlin("plugin.spring") version "1.3.72"
+    id("org.springframework.boot") version "2.4.3"
+    id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    kotlin("jvm") version "1.4.30"
+    kotlin("plugin.spring") version "1.4.30"
 }
 
 group = "com.example"
 version = "0.0.1-SNAPSHOT"
 java.sourceCompatibility = JavaVersion.VERSION_11
 
+configurations {
+    compileOnly {
+        extendsFrom(configurations.annotationProcessor.get())
+    }
+}
+
 repositories {
     mavenCentral()
 }
@@ -21,16 +27,11 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.3")
-    implementation("cn.hutool:hutool-crypto:5.4.3")
-    implementation("org.bouncycastle:bcprov-jdk15on:1.66")
-    testImplementation("org.springframework.boot:spring-boot-starter-test") {
-        exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
-    }
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
-    jvmArgs("--jasypt.encryptor.password=test")
+    implementation("cn.hutool:hutool-crypto:5.5.8")
+    implementation("org.bouncycastle:bcprov-jdk15on:1.68")
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 
 tasks.withType<KotlinCompile> {
@@ -39,3 +40,8 @@ tasks.withType<KotlinCompile> {
         jvmTarget = "11"
     }
 }
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+    jvmArgs("--jasypt.encryptor.password=test")
+}

Jasypt/demo/gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Jasypt/demo/src/main/resources/application.yaml → Jasypt/demo/src/main/resources/application.yml

@@ -4,4 +4,4 @@ jasypt:
 #    public-key-string: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCa1t+ORr1UNcBkSd2+12BBo9KeEIqqiHvV3NKnV8aESGvF2hY2lyRvZFTMQ9ShsZSEROxqMneDzg+XGQL0DMT1mPrBJtC5GqVdp0OjwW38PEhbiT8ljmyBCWtPyVwNdqKgHRrFdDasgQsNVfekCib7AhYsdj3zC6DesK2p41/xSQIDAQAB
 #    private-key-string: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJrW345GvVQ1wGRJ3b7XYEGj0p4QiqqIe9Xc0qdXxoRIa8XaFjaXJG9kVMxD1KGxlIRE7Goyd4POD5cZAvQMxPWY+sEm0LkapV2nQ6PBbfw8SFuJPyWObIEJa0/JXA12oqAdGsV0NqyBCw1V96QKJvsCFix2PfMLoN6wranjX/FJAgMBAAECgYAJO/xcK1raPVRqhr87RPQAJimG9LyYXAhqoj9L7J+xvvHyfEWr3sq0+/pUrkztkb4mP0gMM1NOYIksfTjgXiyW01LsIYGGNbBzPZVFHctvqQCMIiBo47w28yIUflVUEu6u+ZdMVusXri8VvisLrNYXRCw8FJDfnFpmcJlFYKy8GwJBAM9RBo4SAY+xQUhuhXOQkLD5gOZoZUZ9OkEh9YTPSMoBgVkLzmqoaksuAoakMDQfjwHpO/TNcdOabbQ+nvrnalcCQQC/MyWw51gyMWOY/ohwm7pw3aoGZLew9E7IeyffXeCoY0u+xJij38PH13rLmz+1CH7x9lzitRpGAiHMeaemJX1fAkAqewrhz7S8MfETm3oC/St46BdOnzOpZv2p3QCHL0ZWBkrv6Shp2Iq3Tv07g6dQ9uqB1L3xYquhVXKHTZGcDhFPAkEAsp6swoSN325GdoKrok/JsHFUyt5CwVyrUR3E1SaVn5oMBC8TzlxYQZTrkdT6gjxqo88dXWoFHowVWTn5xfzWDwJAO3c/CghXIo4pQrqIxC4o1kdxXt8BdOEQxctGu4Do9jIvpiZ9KlHogGYDPdhDiMDeHLp1tRjbJGnsYDFkFiqRzQ==
 #    bean: MyEncryptor
-test: ENC(LQpNWfNyIu5+EEK6D0AH9VwaADJHX+eoTwf83L608AVC9d7M+YvBj9Q9Seos3w9R)
+test: ENC(LQpNWfNyIu5+EEK6D0AH9VwaADJHX+eoTwf83L608AVC9d7M+YvBj9Q9Seos3w9R)
\ No newline at end of file

Jasypt/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt

@@ -4,21 +4,19 @@ import cn.hutool.crypto.SecureUtil
 import org.jasypt.encryption.StringEncryptor
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.test.context.SpringBootTest
 import java.util.*
-import javax.annotation.Resource
 
 @SpringBootTest
 class DemoApplicationTests {
 
     @Autowired
 //    @Resource(name = "MyEncryptor")
-    lateinit var encryptor:StringEncryptor
+    lateinit var encryptor: StringEncryptor
 
     @Value("\${test}")
-    lateinit var value:String
+    lateinit var value: String
 
     @Test
     fun contextLoads() {
@@ -26,14 +24,12 @@ class DemoApplicationTests {
     }
 
     @Test
-    fun decrypt()
-    {
+    fun decrypt() {
         println(value)
     }
 
     @Test
-    fun getPublicKeyAndPrivateKey()
-    {
+    fun getPublicKeyAndPrivateKey() {
         val pair = SecureUtil.generateKeyPair("RSA")
         println(Base64.getEncoder().encodeToString(pair.public.encoded))
         println(Base64.getEncoder().encodeToString(pair.private.encoded))