v0.9.1 release

.github/workflows/release.yml

@@ -3,6 +3,7 @@ on:
   push:
   pull_request:
     branches: [ master ]
+  workflow_dispatch:
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -130,7 +131,7 @@ jobs:
           ./gradlew kte-example:test
   publish:
     needs:  [build, test-jte, test-kte, test-thymeleaf-kotlin, test-thymeleaf-java]
-    if: github.ref_type == 'tag' || contains(github.ref_name, 'SNAPSHOT')
+    if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
       - name: checkout

README.md

@@ -227,7 +227,7 @@ spring.view-component.local-development=true
     <summary>Gradle</summary>
 
 ```kotlin
-implementation("de.tschuehly:spring-view-component-thymeleaf:0.9.0")
+implementation("de.tschuehly:spring-view-component-thymeleaf:0.9.1")
 sourceSets {
     main {
         resources {
@@ -249,7 +249,7 @@ sourceSets {
     <dependency>
       <groupId>de.tschuehly</groupId>
       <artifactId>spring-view-component-thymeleaf</artifactId>
-      <version>0.9.0</version>
+      <version>0.9.1</version>
     </dependency>
   </dependencies>
   <build>
@@ -289,7 +289,7 @@ plugins {
     id("gg.jte.gradle") version("3.2.1")
 }
 
-implementation("de.tschuehly:spring-view-component-jte:0.9.0")
+implementation("de.tschuehly:spring-view-component-jte:0.9.1")
 
 jte{
     generate()
@@ -308,7 +308,7 @@ jte{
     <dependency>
       <groupId>de.tschuehly</groupId>
       <artifactId>spring-view-component-jte</artifactId>
-      <version>0.9.0</version>
+      <version>0.9.1</version>
     </dependency>
   </dependencies>
   <build>
@@ -352,7 +352,7 @@ plugins {
 }
 
 dependencies {
-    implementation("de.tschuehly:spring-view-component-kte:0.9.0")
+    implementation("de.tschuehly:spring-view-component-kte:0.9.1")
 }
 
 jte {

core/build.gradle.kts

@@ -1,10 +1,10 @@
 import org.jreleaser.model.Active
 
 plugins {
-    id("org.springframework.boot") version "3.5.6"
+    id("org.springframework.boot") version "4.0.3"
     id("io.spring.dependency-management") version "1.1.7"
-    kotlin("jvm") version "2.2.20"
-    kotlin("plugin.spring") version "2.2.20"
+    kotlin("jvm") version "2.2.21"
+    kotlin("plugin.spring") version "2.2.21"
 
     id("maven-publish")
     id("org.jreleaser") version "1.20.0"
@@ -13,7 +13,7 @@ plugins {
 }
 
 group = "de.tschuehly"
-version = "0.9.0"
+version = "0.9.1"
 java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
@@ -22,15 +22,16 @@ repositories {
 }
 
 dependencies {
-    implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("org.springframework.boot:spring-boot-starter-aop")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
+    implementation("org.springframework.boot:spring-boot-starter-aspectj")
     compileOnly("org.springframework.boot:spring-boot-devtools")
     implementation("io.projectreactor:reactor-core")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     testFixturesImplementation("org.springframework.boot:spring-boot-starter-test")
-    testFixturesImplementation("org.springframework.boot:spring-boot-starter-web")
+    testFixturesImplementation("org.springframework.boot:spring-boot-resttestclient")
+    testFixturesImplementation("org.springframework.boot:spring-boot-starter-webmvc")
     testFixturesImplementation("org.springframework.boot:spring-boot-devtools")
 
 }

core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/IViewContext.kt

@@ -1,5 +1,6 @@
 package de.tschuehly.spring.viewcomponent.core
 
+import org.springframework.beans.factory.getBean
 import org.springframework.context.ApplicationContext
 
 interface IViewContext {

core/src/testFixtures/kotlin/de/tschuehly/spring/viewcomponent/core/IntegrationTestBase.kt

@@ -4,11 +4,13 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.web.client.TestRestTemplate
+import org.springframework.boot.resttestclient.TestRestTemplate
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate
 import org.springframework.http.HttpMethod
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 
+@AutoConfigureTestRestTemplate
 abstract class IntegrationTestBase {
     @Autowired
     lateinit var testRestTemplate: TestRestTemplate

examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

examples/jte-example/build.gradle.kts

@@ -2,7 +2,7 @@ import kotlin.io.path.Path
 
 plugins {
     java
-    id("org.springframework.boot") version "3.5.6"
+    id("org.springframework.boot") version "4.0.3"
     id("io.spring.dependency-management") version "1.1.7"
     id("gg.jte.gradle") version("3.2.1")
 }
@@ -24,17 +24,18 @@ repositories {
 }
 
 dependencies {
-    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
 
-    implementation("de.tschuehly:spring-view-component-jte:0.9.0")
+    implementation("de.tschuehly:spring-view-component-jte:0.9.1")
 
     implementation("org.webjars.npm:htmx.org:1.9.11")
     implementation("org.webjars:webjars-locator-lite:1.1.0")
     runtimeOnly("org.springframework.boot:spring-boot-devtools")
-
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
+    testImplementation("org.springframework.boot:spring-boot-restclient")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testRuntimeOnly("org.springframework.boot:spring-boot-devtools")
-    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.9.0"))
+    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.9.1"))
 }
 
 tasks.withType<Test> {

examples/jte-example/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.3</version>
+    <version>4.0.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>de.tschuehly.example</groupId>
@@ -15,12 +15,12 @@
 	<description>JTE Example</description>
 	<properties>
 		<java.version>17</java.version>
-    <view.component.version>0.9.0</view.component.version>
+    <view.component.version>0.9.1</view.component.version>
 	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+      <artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
 
 		<dependency>
@@ -53,6 +53,16 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-restclient</artifactId>
+      <scope>test</scope>
+    </dependency>
 
 	</dependencies>
 	<build>

examples/kte-example/build.gradle.kts

@@ -3,11 +3,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import kotlin.io.path.Path
 
 plugins {
-    id("org.springframework.boot") version "3.5.6"
+    id("org.springframework.boot") version "4.0.3"
     id("io.spring.dependency-management") version "1.1.7"
-    kotlin("jvm") version "2.2.20"
-    kotlin("plugin.spring") version "2.2.20"
-    kotlin("kapt") version "2.2.20"
+    kotlin("jvm") version "2.2.21"
+    kotlin("plugin.spring") version "2.2.21"
+    kotlin("kapt") version "2.2.21"
     id("gg.jte.gradle") version("3.2.1")
 }
 
@@ -31,23 +31,24 @@ repositories {
 }
 
 dependencies {
-    implementation("de.tschuehly:spring-view-component-kte:0.9.0")
-    implementation("de.tschuehly:spring-view-component-core:0.9.0")
-    implementation("io.github.wimdeblauwe:htmx-spring-boot:4.0.1")
+    implementation("de.tschuehly:spring-view-component-kte:0.9.1")
+    implementation("de.tschuehly:spring-view-component-core:0.9.1")
+    implementation("io.github.wimdeblauwe:htmx-spring-boot:5.0.0")
 
     implementation("org.webjars.npm:htmx.org:1.9.11")
     implementation("org.webjars:webjars-locator-lite:1.1.0")
 
     implementation("org.springframework.boot:spring-boot-starter")
-    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-devtools")
 
     implementation("org.jetbrains.kotlin:kotlin-reflect")
-
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
+    testImplementation("org.springframework.boot:spring-boot-restclient")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.boot:spring-boot-devtools")
-    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.9.0"))
+    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.9.1"))
 }
 
 kotlin {

examples/kte-example/src/main/kotlin/de/tschuehly/kteviewcomponentexample/web/layout/LayoutViewComponent.kte

@@ -1,4 +1,6 @@
-@param layoutView:  de.tschuehly.kteviewcomponentexample.web.layout.LayoutViewComponent.LayoutView
+@import de.tschuehly.kteviewcomponentexample.web.layout.LayoutViewComponent
+
+@param layoutView: de.tschuehly.kteviewcomponentexample.web.layout.LayoutViewComponent.LayoutView
 <html>
 
 <nav>

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

@@ -1,6 +1,6 @@
 plugins {
     java
-    id("org.springframework.boot") version "3.5.6"
+    id("org.springframework.boot") version "4.0.3"
     id("io.spring.dependency-management") version "1.1.7"
 }
 
@@ -28,15 +28,17 @@ repositories {
 }
 
 dependencies {
-    implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("de.tschuehly:spring-view-component-thymeleaf:0.9.0")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
+    implementation("de.tschuehly:spring-view-component-thymeleaf:0.9.1")
 
     implementation("org.webjars.npm:htmx.org:1.9.11")
     implementation("org.webjars:webjars-locator-lite:1.1.0")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
+    testImplementation("org.springframework.boot:spring-boot-restclient")
     testImplementation("org.springframework.boot:spring-boot-devtools")
-    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.9.0"))
+    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.9.1"))
 }
 
 tasks.withType<Test> {