Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade spring boot to 3.2.5; align dependencies for "order" #29

Merged
merged 6 commits into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@

<!-- Versions. -->
<javaVersion>17</javaVersion>
<springBootVersion>3.0.0</springBootVersion>
<springCloudVersion>2021.0.4</springCloudVersion>
<springBootVersion>3.2.5</springBootVersion>
<springCloudVersion>2023.0.1</springCloudVersion>
<mavenS3WagonVersion>1.3.3</mavenS3WagonVersion>
<springCloudSleuthOtelVersion>1.1.0-M6</springCloudSleuthOtelVersion>
<springDocOpenApiUiVersion>1.6.9</springDocOpenApiUiVersion>
<springDocOpenApiUiVersion>1.8.0</springDocOpenApiUiVersion>
<mavenResourcesPluginVersion>3.2.0</mavenResourcesPluginVersion>
<mavenSurefirePluginVersion>2.22.2</mavenSurefirePluginVersion>
<mavenFailsafePluginVersion>2.22.2</mavenFailsafePluginVersion>
Expand All @@ -67,9 +67,9 @@
<mustacheVersion>0.9.10</mustacheVersion>
<lombokMapstructBindingVersion>0.2.0</lombokMapstructBindingVersion>
<liquibaseSlf4jVersion>4.1.0</liquibaseSlf4jVersion>
<springDocOpenApiStarterWebMvcUiVersion>2.0.0</springDocOpenApiStarterWebMvcUiVersion>
<springDocOpenApiStarterWebMvcUiVersion>2.5.0</springDocOpenApiStarterWebMvcUiVersion>
<guavaVersion>31.1-jre</guavaVersion>
<hibernateTypeVersion>2.20.0</hibernateTypeVersion>
<hypersistenceUtilsHibernate63Version>3.7.5</hypersistenceUtilsHibernate63Version>
<kafkaAvroSerializerVersion>7.3.0</kafkaAvroSerializerVersion>
<avroMavenPluginVersion>1.11.1</avroMavenPluginVersion>
<flywayCoreVersion>9.15.2</flywayCoreVersion>
Expand Down Expand Up @@ -225,13 +225,15 @@
</dependency>

<!--
Use @JsonType
See https://github.com/vladmihalcea/hibernate-types#hibernate-6
-->
Hibernate support for Spring 6
For example, "io.hypersistence.utils.hibernate.type.json.JsonType"
Mind that Hibernate Types has been renamed to Hypersistence Utils.
See https://github.com/vladmihalcea/hypersistence-utils?tab=readme-ov-file#hibernate-64-and-63
-->
<dependency>
<groupId>com.vladmihalcea</groupId>
<artifactId>hibernate-types-60</artifactId>
<version>${hibernateTypeVersion}</version>
<groupId>io.hypersistence</groupId>
<artifactId>hypersistence-utils-hibernate-63</artifactId>
<version>${hypersistenceUtilsHibernate63Version}</version>
</dependency>

<!-- Use "org.apache.avro.specific" and "org.apache.avro.message". -->
Expand Down
12 changes: 7 additions & 5 deletions order/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,14 @@
</dependency>

<!--
Use @JsonType
See https://github.com/vladmihalcea/hibernate-types#hibernate-6
-->
Hibernate support for Spring 6
For example, "io.hypersistence.utils.hibernate.type.json.JsonType"
Mind that Hibernate Types has been renamed to Hypersistence Utils.
See https://github.com/vladmihalcea/hypersistence-utils?tab=readme-ov-file#hibernate-64-and-63
-->
<dependency>
<groupId>com.vladmihalcea</groupId>
<artifactId>hibernate-types-60</artifactId>
<groupId>io.hypersistence</groupId>
<artifactId>hypersistence-utils-hibernate-63</artifactId>
</dependency>

<!-- Use KafkaTemplate -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.emeraldhieu.vinci.order.logic;

import com.vladmihalcea.hibernate.type.json.JsonType;
import io.hypersistence.utils.hibernate.type.json.JsonType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
Expand Down Expand Up @@ -50,7 +50,7 @@ public class Order {
private String externalId;

@Type(JsonType.class)
@Column(nullable = false)
@Column(nullable = false, columnDefinition = "json")
private List<String> products;

@Column(nullable = false)
Expand Down
5 changes: 4 additions & 1 deletion order/src/main/resources/config/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ spring:
# Drop the existing to repopulate the whole database
drop-first: true
# Used for development to update the changelogs continuously
clear-checksums: true
# clear-checksums: true
# Temporarily set it to false to resolve an issue from Liquibase 4.24
# See https://github.com/liquibase/liquibase/issues/5610#issuecomment-2024174007
clear-checksums: false
kafka:
bootstrap-servers: "localhost:9092"
properties:
Expand Down
2 changes: 1 addition & 1 deletion order/src/main/resources/config/application.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
spring:
profiles:
active: local # Activate "local" profile by default
active: local # Activate profile "local" by default
jackson:
default-property-inclusion: non_null
messages:
Expand Down
12 changes: 7 additions & 5 deletions shipping/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,14 @@
</dependency>

<!--
Use @JsonType
See https://github.com/vladmihalcea/hibernate-types#hibernate-6
-->
Hibernate support for Spring 6
For example, "io.hypersistence.utils.hibernate.type.json.JsonType"
Mind that Hibernate Types has been renamed to Hypersistence Utils.
See https://github.com/vladmihalcea/hypersistence-utils?tab=readme-ov-file#hibernate-64-and-63
-->
<dependency>
<groupId>com.vladmihalcea</groupId>
<artifactId>hibernate-types-60</artifactId>
<groupId>io.hypersistence</groupId>
<artifactId>hypersistence-utils-hibernate-63</artifactId>
</dependency>

<!-- Use Flyway -->
Expand Down
Loading