personalweb

archived
git clone git://git.wimdupont.com/personalweb.git
Log | Files | Refs | LICENSE

commit e4b5fc4a20bbc419ddf688e5a7cf458cc6b95464
parent 96314fbded71b4e9be796900382451e982b335d4
Author: Wim Dupont <wim@wimdupont.com>
Date:   Sun,  4 Dec 2022 08:14:49 +0100

sb3 upgrade


Former-commit-id: acfefbe016c51d723397a7a4a1db6cea16bbeb8a
Diffstat:
Mpom.xml | 5+----
Msrc/main/java/com/wimdupont/personalweb/model/dao/Book.java | 6+++---
Msrc/main/java/com/wimdupont/personalweb/service/AdocConverter.java | 2+-
Msrc/main/java/com/wimdupont/personalweb/service/BlogArticleGenerator.java | 3+--
Msrc/main/java/com/wimdupont/personalweb/service/BookService.java | 2+-
5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.5</version> + <version>3.0.0</version> </parent> <groupId>com.wimdupont</groupId> <artifactId>personalweb</artifactId> @@ -18,7 +18,6 @@ <asciidoctorj.version>2.5.7</asciidoctorj.version> <rome.version>1.0</rome.version> <rome.rometools.version>1.18.0</rome.rometools.version> - <flyway.version>9.6.0</flyway.version> </properties> <dependencies> @@ -83,12 +82,10 @@ <dependency> <groupId>org.flywaydb</groupId> <artifactId>flyway-core</artifactId> - <version>${flyway.version}</version> </dependency> <dependency> <groupId>org.flywaydb</groupId> <artifactId>flyway-mysql</artifactId> - <version>${flyway.version}</version> </dependency> <dependency> <groupId>org.asciidoctor</groupId> diff --git a/src/main/java/com/wimdupont/personalweb/model/dao/Book.java b/src/main/java/com/wimdupont/personalweb/model/dao/Book.java @@ -1,14 +1,14 @@ package com.wimdupont.personalweb.model.dao; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; @Entity @Builder diff --git a/src/main/java/com/wimdupont/personalweb/service/AdocConverter.java b/src/main/java/com/wimdupont/personalweb/service/AdocConverter.java @@ -1,12 +1,12 @@ package com.wimdupont.personalweb.service; +import jakarta.transaction.Transactional; import lombok.extern.slf4j.Slf4j; import org.asciidoctor.Asciidoctor; import org.asciidoctor.Options; import org.asciidoctor.SafeMode; import org.springframework.stereotype.Service; -import javax.transaction.Transactional; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/com/wimdupont/personalweb/service/BlogArticleGenerator.java b/src/main/java/com/wimdupont/personalweb/service/BlogArticleGenerator.java @@ -1,15 +1,14 @@ package com.wimdupont.personalweb.service; import com.wimdupont.personalweb.util.Constants; +import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import javax.transaction.Transactional; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/src/main/java/com/wimdupont/personalweb/service/BookService.java b/src/main/java/com/wimdupont/personalweb/service/BookService.java @@ -2,11 +2,11 @@ package com.wimdupont.personalweb.service; import com.wimdupont.personalweb.model.dao.Book; import com.wimdupont.personalweb.repository.BookRepository; +import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import javax.transaction.Transactional; import java.util.List; @Service