Skip to content

Commit 65191fd

Browse files
gtiwari333gtiwari333
committed
spring boot 4 migration
1 parent ce907d5 commit 65191fd

File tree

21 files changed

+115
-116
lines changed

21 files changed

+115
-116
lines changed

‎common/pom.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,11 @@
6464
<scope>provided</scope>
6565
</dependency>
6666
<dependency>
67-
<groupId>com.fasterxml.jackson.core</groupId>
67+
<groupId>tools.jackson.core</groupId>
6868
<artifactId>jackson-databind</artifactId>
6969
<optional>true</optional>
7070
<scope>provided</scope>
71-
</dependency>
72-
<dependency>
73-
<groupId>com.fasterxml.jackson.datatype</groupId>
74-
<artifactId>jackson-datatype-jsr310</artifactId>
75-
<optional>true</optional>
76-
<scope>provided</scope>
71+
<version>3.0.3</version>
7772
</dependency>
7873
</dependencies>
7974

‎common/src/main/java/gt/common/test/TestUtil.java‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package gt.common.test;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
4-
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
4+
import tools.jackson.databind.ObjectMapper;
65
import org.springframework.web.bind.annotation.GetMapping;
76

87
import java.io.File;
@@ -27,22 +26,19 @@ public static File fileFromClassPath(String name) {
2726
}
2827
}
2928

30-
public static byte[] convertObjectToJsonBytes(Object object)
31-
throws IOException {
32-
ObjectMapper mapper = new ObjectMapper();
33-
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
34-
35-
JavaTimeModule module = new JavaTimeModule();
36-
mapper.registerModule(module);
37-
38-
return mapper.writeValueAsBytes(object);
39-
}
40-
41-
public static byte[] createByteArray(int size, String data) {
42-
byte[] byteArray = new byte[size];
43-
for (int i = 0; i < size; i++) {
44-
byteArray[i] = Byte.parseByte(data, 2);
45-
}
46-
return byteArray;
47-
}
29+
// public static byte[] convertObjectToJsonBytes(Object object)
30+
// throws IOException {
31+
// ObjectMapper mapper = new ObjectMapper();
32+
// mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
33+
//
34+
// return mapper.writeValueAsBytes(object);
35+
// }
36+
37+
// public static byte[] createByteArray(int size, String data) {
38+
// byte[] byteArray = new byte[size];
39+
// for (int i = 0; i < size; i++) {
40+
// byteArray[i] = Byte.parseByte(data, 2);
41+
// }
42+
// return byteArray;
43+
// }
4844
}

‎content-checker/content-checker-service/pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,32 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-starter-web</artifactId>
30+
<artifactId>spring-boot-starter-webmvc</artifactId>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.springdoc</groupId>
3434
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
3535
</dependency>
3636

3737
<!-- tracing -->
38+
<dependency>
39+
<groupId>org.springframework.boot</groupId>
40+
<artifactId>spring-boot-micrometer-tracing-brave</artifactId>
41+
</dependency>
3842
<dependency>
3943
<groupId>org.springframework.boot</groupId>
4044
<artifactId>spring-boot-starter-actuator</artifactId>
4145
</dependency>
4246
<dependency>
43-
<groupId>io.micrometer</groupId>
44-
<artifactId>micrometer-tracing-bridge-brave</artifactId>
47+
<groupId>org.springframework.boot</groupId>
48+
<artifactId>spring-boot-starter-zipkin</artifactId>
4549
</dependency>
4650
<dependency>
47-
<groupId>io.zipkin.reporter2</groupId>
48-
<artifactId>zipkin-reporter-brave</artifactId>
51+
<groupId>io.micrometer</groupId>
52+
<artifactId>micrometer-tracing-bridge-brave</artifactId>
4953
</dependency>
54+
55+
5056
<dependency>
5157
<groupId>org.springframework.boot</groupId>
5258
<artifactId>spring-boot-starter-artemis</artifactId>
@@ -57,12 +63,6 @@
5763
<optional>true</optional>
5864
<scope>provided</scope>
5965
</dependency>
60-
<dependency>
61-
<groupId>org.springdoc</groupId>
62-
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
63-
<version>${springdoc-openapi-ui.version}</version>
64-
<optional>true</optional>
65-
</dependency>
6666

6767
<!-- test dependencies -->
6868
<dependency>

‎content-checker/content-checker-service/src/main/java/gt/contentchecker/JMSConfig.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package gt.contentchecker;
22

33
import jakarta.jms.ConnectionFactory;
4-
import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer;
4+
import org.springframework.boot.jms.autoconfigure.DefaultJmsListenerContainerFactoryConfigurer;
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.context.annotation.Configuration;
77
import org.springframework.jms.annotation.EnableJms;
88
import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
99
import org.springframework.jms.config.JmsListenerContainerFactory;
10-
import org.springframework.jms.support.converter.MappingJackson2MessageConverter;
10+
import org.springframework.jms.support.converter.JacksonJsonMessageConverter;
1111
import org.springframework.jms.support.converter.MessageConverter;
1212
import org.springframework.jms.support.converter.MessageType;
1313

@@ -25,7 +25,7 @@ public JmsListenerContainerFactory<?> myFactory(ConnectionFactory connectionFact
2525

2626
@Bean
2727
public MessageConverter jacksonJmsMessageConverter() {
28-
var converter = new MappingJackson2MessageConverter();
28+
var converter = new JacksonJsonMessageConverter();
2929
converter.setTargetType(MessageType.TEXT);
3030
converter.setTypeIdPropertyName("_type");
3131
return converter;

‎content-checker/content-checker-service/src/main/resources/application.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ management:
2222
tracing:
2323
sampling:
2424
probability: 1.0
25-
zipkin:
26-
tracing:
27-
endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
2825
health:
2926
jms:
3027
enabled: true
28+
tracing.export.zipkin.endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans

‎email/email-service/pom.xml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<properties>
1616
<app.version>${project.parent.version}</app.version>
17-
<spring-cloud.version>2025.0.0</spring-cloud.version>
17+
<spring-cloud.version>2025.1.0</spring-cloud.version>
1818
</properties>
1919

2020

@@ -29,7 +29,7 @@
2929
</dependency>
3030
<dependency>
3131
<groupId>org.springframework.boot</groupId>
32-
<artifactId>spring-boot-starter-web</artifactId>
32+
<artifactId>spring-boot-starter-webmvc</artifactId>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.springframework.boot</groupId>
@@ -45,18 +45,24 @@
4545
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
4646
</dependency>
4747
<!-- tracing -->
48+
<dependency>
49+
<groupId>org.springframework.boot</groupId>
50+
<artifactId>spring-boot-micrometer-tracing-brave</artifactId>
51+
</dependency>
4852
<dependency>
4953
<groupId>org.springframework.boot</groupId>
5054
<artifactId>spring-boot-starter-actuator</artifactId>
5155
</dependency>
5256
<dependency>
53-
<groupId>io.micrometer</groupId>
54-
<artifactId>micrometer-tracing-bridge-brave</artifactId>
57+
<groupId>org.springframework.boot</groupId>
58+
<artifactId>spring-boot-starter-zipkin</artifactId>
5559
</dependency>
5660
<dependency>
57-
<groupId>io.zipkin.reporter2</groupId>
58-
<artifactId>zipkin-reporter-brave</artifactId>
61+
<groupId>io.micrometer</groupId>
62+
<artifactId>micrometer-tracing-bridge-brave</artifactId>
5963
</dependency>
64+
65+
6066
<!-- processors/code generators -->
6167
<dependency>
6268
<groupId>org.projectlombok</groupId>
@@ -85,7 +91,8 @@
8591
</dependency>
8692
<dependency>
8793
<groupId>org.testcontainers</groupId>
88-
<artifactId>junit-jupiter</artifactId>
94+
<artifactId>testcontainers-junit-jupiter</artifactId>
95+
<version>2.0.2</version>
8996
</dependency>
9097

9198
<!-- test only dependencies -->

‎email/email-service/src/main/resources/application.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ spring:
99

1010
server:
1111
port: 8085
12-
error:
13-
include-stacktrace: never
14-
include-exception: true
15-
include-binding-errors: always
16-
include-message: always
1712
logging:
1813
level:
1914
org.springframework.web: INFO
@@ -24,8 +19,14 @@ management:
2419
tracing:
2520
sampling:
2621
probability: 1.0
27-
zipkin:
28-
tracing:
29-
endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
22+
tracing.export.zipkin.endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
23+
24+
spring.web.error.include-binding-errors: always
25+
26+
spring.web.error.include-exception: true
27+
28+
spring.web.error.include-message: always
29+
30+
spring.web.error.include-stacktrace: never
3031

3132

‎main-app/main-orm-jooq/pom.xml‎

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

1515
<properties>
1616
<app.version>${project.parent.version}</app.version>
17-
<spring-security.version>6.5.7</spring-security.version>
17+
<spring-security.version>7.0.0</spring-security.version>
1818
</properties>
1919

2020
<dependencies>
@@ -101,7 +101,7 @@
101101
<property>
102102
<key>hibernate.implicit_naming_strategy</key>
103103
<value>
104-
org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
104+
org.springframework.boot.hibernate.SpringImplicitNamingStrategy
105105
</value>
106106
</property>
107107
<property>

‎main-app/main-orm/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<properties>
1616
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
17-
<spring-framework.version>6.2.15</spring-framework.version>
17+
<spring-framework.version>7.0.2</spring-framework.version>
1818
</properties>
1919

2020
<dependencies>

‎main-app/main-orm/src/main/resources/liquibase-jpa-diff.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ driver=com.mysql.cj.jdbc.Driver
55
url=jdbc:mysql://localhost:3306/seedapp?allowPublicKeyRetrieval=true
66
username=root
77
password=password
8-
referenceUrl=hibernate:spring:gt.app.domain?dialect=org.hibernate.dialect.MySQLDialect&hibernate.physical_naming_strategy=gt.app.hibernate.PrefixedNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
8+
referenceUrl=hibernate:spring:gt.app.domain?dialect=org.hibernate.dialect.MySQLDialect&hibernate.physical_naming_strategy=gt.app.hibernate.PrefixedNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy
99

10-
#referenceUrl=hibernate:spring:gt.app.domain?dialect=${liquibase-plugin.hibernate-dialect}&amp;hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
10+
#referenceUrl=hibernate:spring:gt.app.domain?dialect=${liquibase-plugin.hibernate-dialect}&amp;hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy
1111
## the default naming strategies are configured here: org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties.Naming.applyNamingStrategies
1212
## we have to map the same for liquibase so that it will generate the column/tables that's compatible with Spring-Data-JPA
1313

0 commit comments

Comments
 (0)