Skip to content

Commit 397f360

Browse files
Angular2GuyAngular2Guy
committed
feat: spring boot 4
1 parent 7000913 commit 397f360

4 files changed

Lines changed: 116 additions & 93 deletions

File tree

‎.idea/kotlinc.xml‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎source-sink/pom.xml‎

Lines changed: 110 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.springframework.boot</groupId>
1717
<artifactId>spring-boot-starter-parent</artifactId>
18-
<version>3.5.6</version>
18+
<version>4.0.0</version>
1919
<relativePath/> <!-- lookup parent from repository -->
2020
</parent>
2121
<groupId>de.xxx</groupId>
@@ -38,107 +38,129 @@
3838
</scm>
3939
<properties>
4040
<jaxb-maven-plugin.version>4.0.8</jaxb-maven-plugin.version>
41-
<java.version>21</java.version>
42-
<kotlin.version>1.9.25</kotlin.version>
41+
<java.version>24</java.version>
42+
<kotlin.version>2.2.21</kotlin.version>
4343
</properties>
4444
<dependencies>
45-
<dependency>
46-
<groupId>org.springframework.boot</groupId>
47-
<artifactId>spring-boot-starter-actuator</artifactId>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.springframework.boot</groupId>
51-
<artifactId>spring-boot-starter-data-jpa</artifactId>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.springframework.boot</groupId>
55-
<artifactId>spring-boot-starter-web</artifactId>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.springframework.boot</groupId>
59-
<artifactId>spring-boot-starter-web-services</artifactId>
60-
</dependency>
61-
<dependency>
62-
<groupId>com.fasterxml.jackson.module</groupId>
63-
<artifactId>jackson-module-kotlin</artifactId>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.jetbrains.kotlin</groupId>
67-
<artifactId>kotlin-reflect</artifactId>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.jetbrains.kotlin</groupId>
71-
<artifactId>kotlin-stdlib</artifactId>
72-
</dependency>
73-
<dependency>
74-
<groupId>org.liquibase</groupId>
75-
<artifactId>liquibase-core</artifactId>
76-
</dependency>
45+
<dependency>
46+
<groupId>org.springframework.boot</groupId>
47+
<artifactId>spring-boot-starter-actuator</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.springframework.boot</groupId>
51+
<artifactId>spring-boot-starter-data-jpa</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.springframework.boot</groupId>
55+
<artifactId>spring-boot-starter-kafka</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.springframework.boot</groupId>
59+
<artifactId>spring-boot-starter-liquibase</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.springframework.boot</groupId>
63+
<artifactId>spring-boot-starter-webmvc</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.springframework.boot</groupId>
67+
<artifactId>spring-boot-starter-webservices</artifactId>
68+
</dependency>
69+
<dependency>
70+
<groupId>com.fasterxml.jackson.module</groupId>
71+
<artifactId>jackson-module-kotlin</artifactId>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.jetbrains.kotlin</groupId>
75+
<artifactId>kotlin-reflect</artifactId>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.jetbrains.kotlin</groupId>
79+
<artifactId>kotlin-stdlib</artifactId>
80+
</dependency>
81+
82+
<dependency>
83+
<groupId>org.postgresql</groupId>
84+
<artifactId>postgresql</artifactId>
85+
<scope>runtime</scope>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.springframework.boot</groupId>
89+
<artifactId>spring-boot-starter-actuator-test</artifactId>
90+
<scope>test</scope>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.springframework.boot</groupId>
94+
<artifactId>spring-boot-starter-kafka-test</artifactId>
95+
<scope>test</scope>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.springframework.boot</groupId>
99+
<artifactId>spring-boot-starter-liquibase-test</artifactId>
100+
<scope>test</scope>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.springframework.boot</groupId>
104+
<artifactId>spring-boot-starter-webmvc-test</artifactId>
105+
<scope>test</scope>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.springframework.boot</groupId>
109+
<artifactId>spring-boot-starter-webservices-test</artifactId>
110+
<scope>test</scope>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.springframework.boot</groupId>
114+
<artifactId>spring-boot-starter-data-jpa-test</artifactId>
115+
<scope>test</scope>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.jetbrains.kotlin</groupId>
119+
<artifactId>kotlin-test-junit5</artifactId>
120+
<scope>test</scope>
121+
</dependency>
122+
<!--
77123
<dependency>
78124
<groupId>org.springframework.kafka</groupId>
79125
<artifactId>spring-kafka</artifactId>
80126
</dependency>
81-
<dependency>
82-
<groupId>org.postgresql</groupId>
83-
<artifactId>postgresql</artifactId>
84-
<scope>runtime</scope>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.springframework.boot</groupId>
88-
<artifactId>spring-boot-starter-test</artifactId>
89-
<scope>test</scope>
90-
</dependency>
91-
<dependency>
92-
<groupId>org.jetbrains.kotlin</groupId>
93-
<artifactId>kotlin-test-junit5</artifactId>
94-
<scope>test</scope>
95-
</dependency>
127+
96128
<dependency>
97129
<groupId>org.springframework.kafka</groupId>
98130
<artifactId>spring-kafka-test</artifactId>
99131
<scope>test</scope>
100132
</dependency>
133+
-->
101134
</dependencies>
102135

103136
<build>
104-
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
105-
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
106-
<plugins>
107-
<plugin>
108-
<groupId>org.springframework.boot</groupId>
109-
<artifactId>spring-boot-maven-plugin</artifactId>
110-
</plugin>
111-
<plugin>
112-
<groupId>org.jetbrains.kotlin</groupId>
113-
<artifactId>kotlin-maven-plugin</artifactId>
114-
<configuration>
115-
<args>
116-
<arg>-Xjsr305=strict</arg>
117-
</args>
118-
<compilerPlugins>
119-
<plugin>spring</plugin>
120-
<plugin>jpa</plugin>
121-
<plugin>all-open</plugin>
122-
</compilerPlugins>
123-
<pluginOptions>
124-
<option>all-open:annotation=jakarta.persistence.Entity</option>
125-
<option>all-open:annotation=jakarta.persistence.MappedSuperclass</option>
126-
<option>all-open:annotation=jakarta.persistence.Embeddable</option>
127-
</pluginOptions>
128-
</configuration>
129-
<dependencies>
130-
<dependency>
131-
<groupId>org.jetbrains.kotlin</groupId>
132-
<artifactId>kotlin-maven-allopen</artifactId>
133-
<version>${kotlin.version}</version>
134-
</dependency>
135-
<dependency>
136-
<groupId>org.jetbrains.kotlin</groupId>
137-
<artifactId>kotlin-maven-noarg</artifactId>
138-
<version>${kotlin.version}</version>
139-
</dependency>
140-
</dependencies>
141-
</plugin>
137+
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
138+
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
139+
<plugins>
140+
<plugin>
141+
<groupId>org.springframework.boot</groupId>
142+
<artifactId>spring-boot-maven-plugin</artifactId>
143+
</plugin>
144+
<plugin>
145+
<groupId>org.jetbrains.kotlin</groupId>
146+
<artifactId>kotlin-maven-plugin</artifactId>
147+
<configuration>
148+
<args>
149+
<arg>-Xjsr305=strict</arg>
150+
<arg>-Xannotation-default-target=param-property</arg>
151+
</args>
152+
<compilerPlugins>
153+
<plugin>spring</plugin>
154+
</compilerPlugins>
155+
</configuration>
156+
<dependencies>
157+
<dependency>
158+
<groupId>org.jetbrains.kotlin</groupId>
159+
<artifactId>kotlin-maven-allopen</artifactId>
160+
<version>${kotlin.version}</version>
161+
</dependency>
162+
</dependencies>
163+
</plugin>
142164
<plugin>
143165
<groupId>org.jvnet.jaxb</groupId>
144166
<artifactId>jaxb-maven-plugin</artifactId>

‎source-sink/src/main/kotlin/de/xxx/sourcesink/adapter/client/SoapClientConfig.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ limitations under the License.
1212
*/
1313
package de.xxx.sourcesink.adapter.client
1414

15-
import de.xxx.sourcesink.adapter.event.KafkaConfig
15+
1616
import jakarta.annotation.PostConstruct
1717
import org.slf4j.Logger
1818
import org.slf4j.LoggerFactory
@@ -42,7 +42,7 @@ class SoapClientConfig {
4242
}
4343

4444
@Bean
45-
fun soapClient(marshaller: Jaxb2Marshaller?): SoapClientBean {
45+
fun soapClient(marshaller: Jaxb2Marshaller): SoapClientBean {
4646
val client = SoapClientBean()
4747
client.setDefaultUri("http://${soapToDbServiceName}:8082/ws")
4848
client.setMarshaller(marshaller)

‎source-sink/src/main/kotlin/de/xxx/sourcesink/domain/client/SoapClient.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ limitations under the License.
1313
package de.xxx.sourcesink.domain.client
1414

1515
import com.baeldung.springsoap.client.gen.GetCountryResponse
16+
import jakarta.xml.bind.Marshaller
1617

1718
interface SoapClient {
1819
fun getCountry(country: String): GetCountryResponse

0 commit comments

Comments
 (0)