Skip to content

Commit

Permalink
#268 bump up spring and spring-boot versions
Browse files Browse the repository at this point in the history
  • Loading branch information
max402 committed Jul 15, 2024
1 parent 5edf83e commit a68fc72
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 15 deletions.
9 changes: 8 additions & 1 deletion datasafe-rest-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
<description>Spring Boot DataSafe Application</description>

<properties>
<spring-boot.version>3.1.2</spring-boot.version>
<spring-boot.version>3.3.1</spring-boot.version>
<springfox-swagger.version>2.9.2</springfox-swagger.version>
<jjwt.version>0.12.4</jjwt.version>
<spring-restdocs.version>3.0.0</spring-restdocs.version>
<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
<springdoc-openapi-starter-webmvc-ui.version>2.3.0</springdoc-openapi-starter-webmvc-ui.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
</properties>

<dependencies>
Expand Down Expand Up @@ -103,6 +104,12 @@
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>${jjwt.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;

@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
public class DatasafeRestApplication {

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import org.springframework.lang.NonNull;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Slf4j
@Configuration
@RequiredArgsConstructor
public class MvcConfig extends WebMvcConfigurationSupport {
public class MvcConfig implements WebMvcConfigurer {

private final DatasafeProperties datasafeProperties;

Expand Down
13 changes: 12 additions & 1 deletion datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@

<artifactId>datasafe-simple-adapter-spring</artifactId>

<properties>
<spring.framework.version>6.1.10</spring.framework.version>
<spring.framework.boot.version>3.3.1</spring.framework.boot.version>
<snakeyaml.version>2.2</snakeyaml.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -85,7 +91,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.1</version>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -129,6 +135,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions datasafe-storage/datasafe-storage-impl-db/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@

<artifactId>datasafe-storage-impl-db</artifactId>

<properties>
<spring.framework.version>6.1.10</spring.framework.version>
</properties>

<dependencies>
<dependency>
<groupId>de.adorsys</groupId>
Expand All @@ -26,6 +30,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.framework.version}</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
Expand Down
27 changes: 18 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@
<dagger.version>2.50</dagger.version>
<guava.version>32.1.1-jre</guava.version>
<picocli.version>4.0.3</picocli.version>
<jupiter.version>5.10.0</jupiter.version>
<jupiter.version>5.11.0-M2</jupiter.version>
<assertj.version>3.12.2</assertj.version>
<mockito.version>5.5.0</mockito.version>
<surefire.version>3.1.2</surefire.version>
<compress.version>1.26.0</compress.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<deploy.disabled>false</deploy.disabled>
<testcontainers.version>1.18.3</testcontainers.version>
<testcontainers.version>1.19.8</testcontainers.version>
<jacoco.version>0.8.11</jacoco.version>
<commons.io.version>2.5</commons.io.version>
<slf4j-simple.version>2.0.7</slf4j-simple.version>
Expand All @@ -109,8 +109,6 @@
<h2.database>2.2.220</h2.database>
<mysql.version>8.4.0</mysql.version>
<liquibase>4.23.1</liquibase>
<spring.framework.version>6.0.11</spring.framework.version>
<spring.framework.boot.version>3.1.2</spring.framework.boot.version>
<siv-mode.version>1.4.4</siv-mode.version>
<jackson.version>2.16.1</jackson.version>
<keymanagement.version>0.0.11</keymanagement.version>
Expand Down Expand Up @@ -224,11 +222,27 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${amazon.aws.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<version>${amazon.aws.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--
Expand Down Expand Up @@ -318,11 +332,6 @@
<artifactId>liquibase-core</artifactId>
<version>${liquibase}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.framework.version}</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
Expand Down

0 comments on commit a68fc72

Please sign in to comment.