commit bfb691183c1a97b6a4d82af84df0cc05508b0602 parent 69555ae3617ba05fd9d8a4c30cc97729aacedb01 Author: Kevin Corvisier <git@kevincorvisier.fr> Date: Sat, 18 Jan 2025 21:49:58 +0900 Update dependencies Diffstat:
8 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml @@ -12,12 +12,12 @@ <maven.compiler.target>17</maven.compiler.target> <maven.compiler.source>17</maven.compiler.source> - <htmlunit-driver.version>3.58.0</htmlunit-driver.version> - <junit.version>5.11.2</junit.version> - <logback.version>1.2.10</logback.version> - <lombok.version>1.18.22</lombok.version> - <sqlite-jdbc.version>3.45.0.0</sqlite-jdbc.version> - <spring.version>6.1.14</spring.version> + <htmlunit-driver.version>4.13.0</htmlunit-driver.version> + <junit.version>5.11.4</junit.version> + <logback.version>1.5.16</logback.version> + <lombok.version>1.18.36</lombok.version> + <sqlite-jdbc.version>3.48.0.0</sqlite-jdbc.version> + <spring.version>6.2.2</spring.version> </properties> <dependencyManagement> @@ -55,7 +55,7 @@ <dependency> <groupId>jakarta.validation</groupId> <artifactId>jakarta.validation-api</artifactId> - <version>2.0.2</version> + <version>3.1.0</version> </dependency> <dependency> @@ -137,5 +137,4 @@ </plugin> </plugins> </build> - </project> \ No newline at end of file diff --git a/src/main/java/fr/kevincorvisier/mtg/dd/Cache.java b/src/main/java/fr/kevincorvisier/mtg/dd/Cache.java @@ -12,7 +12,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; import org.apache.commons.io.output.StringBuilderWriter; import org.springframework.beans.factory.annotation.Value; @@ -21,6 +20,7 @@ import org.springframework.stereotype.Service; import fr.kevincorvisier.mtg.dd.model.DeckContent; import fr.kevincorvisier.mtg.dd.mtgo.MagicOnlineFileReader; import fr.kevincorvisier.mtg.dd.mtgo.MagicOnlineFileWriter; +import jakarta.validation.constraints.NotNull; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/fr/kevincorvisier/mtg/dd/consumers/DefaultDecklistConsumer.java b/src/main/java/fr/kevincorvisier/mtg/dd/consumers/DefaultDecklistConsumer.java @@ -14,7 +14,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -26,6 +25,7 @@ import fr.kevincorvisier.mtg.dd.model.DeckComparator; import fr.kevincorvisier.mtg.dd.model.DeckMetadata; import fr.kevincorvisier.mtg.dd.mtgo.MagicOnlineFileWriter; import fr.kevincorvisier.mtg.dd.validation.DeckValidator; +import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -150,7 +150,6 @@ public class DefaultDecklistConsumer implements DecklistConsumer, StopCondition } @Nullable - @SuppressWarnings("null") private static String sanitize(@Nullable String s) { if (s == null) diff --git a/src/main/java/fr/kevincorvisier/mtg/dd/downloaders/TcdecksDecklistDownloader.java b/src/main/java/fr/kevincorvisier/mtg/dd/downloaders/TcdecksDecklistDownloader.java @@ -9,8 +9,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.validation.constraints.NotNull; - import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; @@ -21,6 +19,7 @@ import fr.kevincorvisier.mtg.dd.Crawler; import fr.kevincorvisier.mtg.dd.StopCondition; import fr.kevincorvisier.mtg.dd.consumers.DecklistConsumersService; import fr.kevincorvisier.mtg.dd.model.DeckMetadataFactory; +import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/fr/kevincorvisier/mtg/dd/model/Deck.java b/src/main/java/fr/kevincorvisier/mtg/dd/model/Deck.java @@ -1,7 +1,6 @@ package fr.kevincorvisier.mtg.dd.model; -import javax.validation.constraints.NotNull; - +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NonNull; diff --git a/src/main/java/fr/kevincorvisier/mtg/dd/model/DeckMetadata.java b/src/main/java/fr/kevincorvisier/mtg/dd/model/DeckMetadata.java @@ -3,8 +3,7 @@ package fr.kevincorvisier.mtg.dd.model; import java.net.URL; import java.time.LocalDate; -import javax.validation.constraints.NotNull; - +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NonNull; diff --git a/src/main/java/fr/kevincorvisier/mtg/dd/model/DeckMetadataFactory.java b/src/main/java/fr/kevincorvisier/mtg/dd/model/DeckMetadataFactory.java @@ -4,11 +4,10 @@ import java.net.URL; import java.time.LocalDate; import java.util.Map; -import javax.validation.constraints.NotNull; - import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import jakarta.validation.constraints.NotNull; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/test/java/fr/kevincorvisier/mtg/dd/consumers/DefaultDecklistConsumerTest.java b/src/test/java/fr/kevincorvisier/mtg/dd/consumers/DefaultDecklistConsumerTest.java @@ -6,11 +6,10 @@ import java.net.MalformedURLException; import java.net.URL; import java.time.LocalDate; -import javax.validation.constraints.NotNull; - import org.junit.jupiter.api.Test; import fr.kevincorvisier.mtg.dd.model.DeckMetadata; +import jakarta.validation.constraints.NotNull; class DefaultDecklistConsumerTest { @@ -19,7 +18,6 @@ class DefaultDecklistConsumerTest { assertEquals("2024-05-04_LukasKovarik_Burn.txt", DefaultDecklistConsumer.getFilename(deck("2024-05-04", "Lukáš Kovařík", "Burn"))); assertEquals("2024-06-08_MichalRadecki_Goblins.txt", DefaultDecklistConsumer.getFilename(deck("2024-06-08", "Michał Radecki", "Goblins"))); - } @Test