Skip to content

Commit 71ebd0e

Browse files
tschuehlytschuehly
committed
release: v0.7.4
hotfix jte autoconfiguration
1 parent 0e88cb3 commit 71ebd0e

File tree

12 files changed

+26
-31
lines changed

12 files changed

+26
-31
lines changed

‎core/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
}
1515

1616
group = "de.tschuehly"
17-
version = "0.7.3"
17+
version = "0.7.4"
1818
java.sourceCompatibility = JavaVersion.VERSION_17
1919

2020
repositories {
@@ -34,7 +34,7 @@ dependencies {
3434
testFixturesImplementation("org.springframework.boot:spring-boot-starter-web")
3535
testFixturesImplementation("org.springframework.boot:spring-boot-devtools")
3636

37-
implementation("de.tschuehly:spring-view-component-jte-compiler:0.7.3")
37+
implementation("de.tschuehly:spring-view-component-jte-compiler:0.7.4")
3838

3939
}
4040

‎examples/jte-example/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ repositories {
1919
dependencies {
2020
implementation("org.springframework.boot:spring-boot-starter-web")
2121

22-
implementation("de.tschuehly:spring-view-component-jte:0.7.3")
23-
annotationProcessor("de.tschuehly:spring-view-component-core:0.7.3")
22+
implementation("de.tschuehly:spring-view-component-jte:0.7.4")
23+
annotationProcessor("de.tschuehly:spring-view-component-core:0.7.4")
2424

2525
implementation("org.webjars.npm:htmx.org:1.9.11")
2626
implementation("org.webjars:webjars-locator-core:0.58")
2727

2828
testImplementation("org.springframework.boot:spring-boot-starter-test")
2929
testRuntimeOnly("org.springframework.boot:spring-boot-devtools")
30-
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.3"))
30+
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.4"))
3131
}
3232

3333
tasks.withType<Test> {

‎examples/jte-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<description>JTE Example</description>
1616
<properties>
1717
<java.version>17</java.version>
18-
<view.component.version>0.7.3</view.component.version>
18+
<view.component.version>0.7.4</view.component.version>
1919
</properties>
2020
<dependencies>
2121
<dependency>

‎examples/kte-example/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ repositories {
2020
}
2121

2222
dependencies {
23-
implementation("de.tschuehly:spring-view-component-kte:0.7.3")
24-
kapt("de.tschuehly:spring-view-component-core:0.7.3")
23+
implementation("de.tschuehly:spring-view-component-kte:0.7.4")
24+
kapt("de.tschuehly:spring-view-component-core:0.7.4")
2525
implementation("io.github.wimdeblauwe:htmx-spring-boot:3.1.1")
2626

2727
implementation("org.webjars.npm:htmx.org:1.9.11")
@@ -36,7 +36,7 @@ dependencies {
3636

3737
testImplementation("org.springframework.boot:spring-boot-starter-test")
3838
testImplementation("org.springframework.boot:spring-boot-devtools")
39-
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.3"))
39+
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.4"))
4040
}
4141

4242
tasks.withType<KotlinCompile> {

‎examples/thymeleaf-java-example/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ repositories {
1919
dependencies {
2020
implementation("org.springframework.boot:spring-boot-starter-web")
2121
developmentOnly("org.springframework.boot:spring-boot-devtools")
22-
implementation("de.tschuehly:spring-view-component-thymeleaf:0.7.3")
23-
annotationProcessor("de.tschuehly:spring-view-component-core:0.7.3")
22+
implementation("de.tschuehly:spring-view-component-thymeleaf:0.7.4")
23+
annotationProcessor("de.tschuehly:spring-view-component-core:0.7.4")
2424

2525
implementation("org.webjars.npm:htmx.org:1.9.11")
2626
implementation("org.webjars:webjars-locator-core:0.58")
2727
testImplementation("org.springframework.boot:spring-boot-starter-test")
2828

2929
testImplementation("org.springframework.boot:spring-boot-devtools")
30-
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.3"))
30+
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.4"))
3131
}
3232

3333
tasks.withType<Test> {

‎examples/thymeleaf-java-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<description>Thymeleaf Java Example</description>
1616
<properties>
1717
<java.version>17</java.version>
18-
<view.component.version>0.7.3</view.component.version>
18+
<view.component.version>0.7.4</view.component.version>
1919
</properties>
2020
<dependencies>
2121
<dependency>

‎examples/thymeleaf-kotlin-example/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ repositories {
2424
}
2525

2626
dependencies {
27-
implementation("de.tschuehly:spring-view-component-thymeleaf:0.7.3")
28-
kapt("de.tschuehly:spring-view-component-core:0.7.3")
27+
implementation("de.tschuehly:spring-view-component-thymeleaf:0.7.4")
28+
kapt("de.tschuehly:spring-view-component-core:0.7.4")
2929

3030
implementation("org.webjars.npm:htmx.org:1.9.2")
3131
implementation("org.webjars:webjars-locator:0.47")
@@ -41,7 +41,7 @@ dependencies {
4141
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
4242

4343
testImplementation("org.springframework.boot:spring-boot-devtools")
44-
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.3"))
44+
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.7.4"))
4545
}
4646

4747
tasks.withType<KotlinCompile> {

‎jte/jte-compiler/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "de.tschuehly"
12-
version = "0.7.3"
12+
version = "0.7.4"
1313
java.sourceCompatibility = JavaVersion.VERSION_17
1414

1515
repositories {

‎jte/jte/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ plugins {
1313
}
1414

1515
group = "de.tschuehly"
16-
version = "0.7.3"
16+
version = "0.7.4"
1717
java.sourceCompatibility = JavaVersion.VERSION_17
1818

1919
repositories {
2020
mavenCentral()
2121
}
2222
dependencies {
2323
api("gg.jte:jte:3.1.9")
24-
api("de.tschuehly:spring-view-component-core:0.7.3")
24+
api("de.tschuehly:spring-view-component-core:0.7.4")
2525

2626
implementation("gg.jte:jte-spring-boot-starter-3:3.1.9")
2727
implementation("org.springframework.boot:spring-boot-starter-web")

‎jte/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentAutoConfiguration.kt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import de.tschuehly.spring.viewcomponent.core.component.ViewComponentProperties
66
import gg.jte.ContentType
77
import gg.jte.TemplateEngine
88
import gg.jte.springframework.boot.autoconfigure.JteViewResolver
9-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
109
import org.springframework.boot.context.properties.EnableConfigurationProperties
1110
import org.springframework.context.ApplicationContext
1211
import org.springframework.context.annotation.Bean
@@ -19,19 +18,15 @@ import java.nio.file.Paths
1918
@Import(ViewComponentAutoConfiguration::class)
2019
@EnableConfigurationProperties(ViewComponentProperties::class)
2120
class JteViewComponentAutoConfiguration(
22-
private val viewComponentProperties: ViewComponentProperties,
23-
private val applicationContext: ApplicationContext
21+
private val viewComponentProperties: ViewComponentProperties
2422
) {
2523
@Bean
2624
fun jteViewContextAspect(templateEngine: TemplateEngine): JteViewContextAspect {
2725
return JteViewContextAspect(templateEngine, viewComponentProperties)
2826
}
2927

3028
@Bean
31-
@ConditionalOnMissingBean(
32-
JteViewResolver::class
33-
)
34-
fun jteViewResolver(templateEngine: TemplateEngine): JteViewResolver {
29+
fun jteViewComponentResolver(templateEngine: TemplateEngine): JteViewResolver {
3530
if(!StringUtils.hasText(viewComponentProperties.jteTemplateSuffix)){
3631
throw ViewComponentException("You need to set jteTemplateSuffix")
3732
}

0 commit comments

Comments
 (0)