From 71ebd0e50afffd482352a969176a7772efd31a5e Mon Sep 17 00:00:00 2001 From: tschuehly Date: Mon, 8 Apr 2024 20:41:25 +0200 Subject: [PATCH] release: v0.7.4 hotfix jte autoconfiguration --- core/build.gradle.kts | 4 ++-- examples/jte-example/build.gradle.kts | 6 +++--- examples/jte-example/pom.xml | 2 +- examples/kte-example/build.gradle.kts | 6 +++--- examples/thymeleaf-java-example/build.gradle.kts | 6 +++--- examples/thymeleaf-java-example/pom.xml | 2 +- examples/thymeleaf-kotlin-example/build.gradle.kts | 6 +++--- jte/jte-compiler/build.gradle.kts | 2 +- jte/jte/build.gradle.kts | 4 ++-- .../jte/JteViewComponentAutoConfiguration.kt | 9 ++------- jte/kte/build.gradle.kts | 6 +++--- thymeleaf/build.gradle.kts | 4 ++-- 12 files changed, 26 insertions(+), 31 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 4b681db..8fd0688 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -14,7 +14,7 @@ plugins { } group = "de.tschuehly" -version = "0.7.3" +version = "0.7.4" java.sourceCompatibility = JavaVersion.VERSION_17 repositories { @@ -34,7 +34,7 @@ dependencies { testFixturesImplementation("org.springframework.boot:spring-boot-starter-web") testFixturesImplementation("org.springframework.boot:spring-boot-devtools") - implementation("de.tschuehly:spring-view-component-jte-compiler:0.7.3") + implementation("de.tschuehly:spring-view-component-jte-compiler:0.7.4") } diff --git a/examples/jte-example/build.gradle.kts b/examples/jte-example/build.gradle.kts index c059228..8020dbb 100644 --- a/examples/jte-example/build.gradle.kts +++ b/examples/jte-example/build.gradle.kts @@ -19,15 +19,15 @@ repositories { dependencies { implementation("org.springframework.boot:spring-boot-starter-web") - implementation("de.tschuehly:spring-view-component-jte:0.7.3") - annotationProcessor("de.tschuehly:spring-view-component-core:0.7.3") + implementation("de.tschuehly:spring-view-component-jte:0.7.4") + annotationProcessor("de.tschuehly:spring-view-component-core:0.7.4") implementation("org.webjars.npm:htmx.org:1.9.11") implementation("org.webjars:webjars-locator-core:0.58") testImplementation("org.springframework.boot:spring-boot-starter-test") testRuntimeOnly("org.springframework.boot:spring-boot-devtools") - testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.3")) + testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.4")) } tasks.withType { diff --git a/examples/jte-example/pom.xml b/examples/jte-example/pom.xml index fee0151..5e8927a 100644 --- a/examples/jte-example/pom.xml +++ b/examples/jte-example/pom.xml @@ -15,7 +15,7 @@ JTE Example 17 - 0.7.3 + 0.7.4 diff --git a/examples/kte-example/build.gradle.kts b/examples/kte-example/build.gradle.kts index f23b035..e80991d 100644 --- a/examples/kte-example/build.gradle.kts +++ b/examples/kte-example/build.gradle.kts @@ -20,8 +20,8 @@ repositories { } dependencies { - implementation("de.tschuehly:spring-view-component-kte:0.7.3") - kapt("de.tschuehly:spring-view-component-core:0.7.3") + implementation("de.tschuehly:spring-view-component-kte:0.7.4") + kapt("de.tschuehly:spring-view-component-core:0.7.4") implementation("io.github.wimdeblauwe:htmx-spring-boot:3.1.1") implementation("org.webjars.npm:htmx.org:1.9.11") @@ -36,7 +36,7 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.boot:spring-boot-devtools") - testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.3")) + testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.4")) } tasks.withType { diff --git a/examples/thymeleaf-java-example/build.gradle.kts b/examples/thymeleaf-java-example/build.gradle.kts index 5de7975..1f26284 100644 --- a/examples/thymeleaf-java-example/build.gradle.kts +++ b/examples/thymeleaf-java-example/build.gradle.kts @@ -19,15 +19,15 @@ repositories { dependencies { implementation("org.springframework.boot:spring-boot-starter-web") developmentOnly("org.springframework.boot:spring-boot-devtools") - implementation("de.tschuehly:spring-view-component-thymeleaf:0.7.3") - annotationProcessor("de.tschuehly:spring-view-component-core:0.7.3") + implementation("de.tschuehly:spring-view-component-thymeleaf:0.7.4") + annotationProcessor("de.tschuehly:spring-view-component-core:0.7.4") implementation("org.webjars.npm:htmx.org:1.9.11") implementation("org.webjars:webjars-locator-core:0.58") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.boot:spring-boot-devtools") - testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.3")) + testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.4")) } tasks.withType { diff --git a/examples/thymeleaf-java-example/pom.xml b/examples/thymeleaf-java-example/pom.xml index c489dc3..c7e8d40 100644 --- a/examples/thymeleaf-java-example/pom.xml +++ b/examples/thymeleaf-java-example/pom.xml @@ -15,7 +15,7 @@ Thymeleaf Java Example 17 - 0.7.3 + 0.7.4 diff --git a/examples/thymeleaf-kotlin-example/build.gradle.kts b/examples/thymeleaf-kotlin-example/build.gradle.kts index 98945f7..75a0363 100644 --- a/examples/thymeleaf-kotlin-example/build.gradle.kts +++ b/examples/thymeleaf-kotlin-example/build.gradle.kts @@ -24,8 +24,8 @@ repositories { } dependencies { - implementation("de.tschuehly:spring-view-component-thymeleaf:0.7.3") - kapt("de.tschuehly:spring-view-component-core:0.7.3") + implementation("de.tschuehly:spring-view-component-thymeleaf:0.7.4") + kapt("de.tschuehly:spring-view-component-core:0.7.4") implementation("org.webjars.npm:htmx.org:1.9.2") implementation("org.webjars:webjars-locator:0.47") @@ -41,7 +41,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") testImplementation("org.springframework.boot:spring-boot-devtools") - testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.3")) + testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.4")) } tasks.withType { diff --git a/jte/jte-compiler/build.gradle.kts b/jte/jte-compiler/build.gradle.kts index 705ede7..caf2873 100644 --- a/jte/jte-compiler/build.gradle.kts +++ b/jte/jte-compiler/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } group = "de.tschuehly" -version = "0.7.3" +version = "0.7.4" java.sourceCompatibility = JavaVersion.VERSION_17 repositories { diff --git a/jte/jte/build.gradle.kts b/jte/jte/build.gradle.kts index e7a875d..efd9caa 100644 --- a/jte/jte/build.gradle.kts +++ b/jte/jte/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } group = "de.tschuehly" -version = "0.7.3" +version = "0.7.4" java.sourceCompatibility = JavaVersion.VERSION_17 repositories { @@ -21,7 +21,7 @@ repositories { } dependencies { api("gg.jte:jte:3.1.9") - api("de.tschuehly:spring-view-component-core:0.7.3") + api("de.tschuehly:spring-view-component-core:0.7.4") implementation("gg.jte:jte-spring-boot-starter-3:3.1.9") implementation("org.springframework.boot:spring-boot-starter-web") diff --git a/jte/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentAutoConfiguration.kt b/jte/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentAutoConfiguration.kt index 8049317..19124d2 100644 --- a/jte/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentAutoConfiguration.kt +++ b/jte/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentAutoConfiguration.kt @@ -6,7 +6,6 @@ import de.tschuehly.spring.viewcomponent.core.component.ViewComponentProperties import gg.jte.ContentType import gg.jte.TemplateEngine import gg.jte.springframework.boot.autoconfigure.JteViewResolver -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.ApplicationContext import org.springframework.context.annotation.Bean @@ -19,8 +18,7 @@ import java.nio.file.Paths @Import(ViewComponentAutoConfiguration::class) @EnableConfigurationProperties(ViewComponentProperties::class) class JteViewComponentAutoConfiguration( - private val viewComponentProperties: ViewComponentProperties, - private val applicationContext: ApplicationContext + private val viewComponentProperties: ViewComponentProperties ) { @Bean fun jteViewContextAspect(templateEngine: TemplateEngine): JteViewContextAspect { @@ -28,10 +26,7 @@ class JteViewComponentAutoConfiguration( } @Bean - @ConditionalOnMissingBean( - JteViewResolver::class - ) - fun jteViewResolver(templateEngine: TemplateEngine): JteViewResolver { + fun jteViewComponentResolver(templateEngine: TemplateEngine): JteViewResolver { if(!StringUtils.hasText(viewComponentProperties.jteTemplateSuffix)){ throw ViewComponentException("You need to set jteTemplateSuffix") } diff --git a/jte/kte/build.gradle.kts b/jte/kte/build.gradle.kts index 9326140..cb21f6f 100644 --- a/jte/kte/build.gradle.kts +++ b/jte/kte/build.gradle.kts @@ -13,15 +13,15 @@ plugins { } group = "de.tschuehly" -version = "0.7.3" +version = "0.7.4" java.sourceCompatibility = JavaVersion.VERSION_17 repositories { mavenCentral() } dependencies { - api("de.tschuehly:spring-view-component-core:0.7.3") - api("de.tschuehly:spring-view-component-jte:0.7.3") + api("de.tschuehly:spring-view-component-core:0.7.4") + api("de.tschuehly:spring-view-component-jte:0.7.4") api("gg.jte:jte-kotlin:3.1.9") testImplementation("org.springframework.boot:spring-boot-starter-actuator") diff --git a/thymeleaf/build.gradle.kts b/thymeleaf/build.gradle.kts index 2da6ead..ffa3414 100644 --- a/thymeleaf/build.gradle.kts +++ b/thymeleaf/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } group = "de.tschuehly" -version = "0.7.3" +version = "0.7.4" java.sourceCompatibility = JavaVersion.VERSION_17 repositories { @@ -21,7 +21,7 @@ repositories { } dependencies { - api("de.tschuehly:spring-view-component-core:0.7.3") + api("de.tschuehly:spring-view-component-core:0.7.4") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-thymeleaf") implementation("org.springframework.boot:spring-boot-devtools")