Skip to content

Commit

Permalink
update for Spring Boot 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
darbyluv2code committed Jan 11, 2025
2 parents 2865fc4 + e7a7549 commit f7c9180
Show file tree
Hide file tree
Showing 1,852 changed files with 17,695 additions and 18,958 deletions.
24 changes: 22 additions & 2 deletions 2.00-starting-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.2</version>
<version>3.4.0</version>
<relativePath/>
</parent>

Expand All @@ -15,7 +15,8 @@
<version>1.0.0</version>

<properties>
<java.version>17</java.version>
<java.version>23</java.version>
<argLine></argLine>
</properties>

<dependencies>
Expand All @@ -31,6 +32,25 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>properties</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.2</version>
<version>3.4.0</version>
<relativePath/>
</parent>

Expand All @@ -15,7 +15,8 @@
<version>1.0.0</version>

<properties>
<java.version>17</java.version>
<java.version>23</java.version>
<argLine></argLine>
</properties>

<dependencies>
Expand All @@ -37,7 +38,27 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>properties</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
</plugin>
</plugins>

</build>

</project>
24 changes: 22 additions & 2 deletions 2.20-starting-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.2</version>
<version>3.4.0</version>
<relativePath/>
</parent>

Expand All @@ -15,7 +15,8 @@
<version>1.0.0</version>

<properties>
<java.version>17</java.version>
<java.version>23</java.version>
<argLine></argLine>
</properties>

<dependencies>
Expand All @@ -37,6 +38,25 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>properties</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.2</version>
<version>3.4.0</version>
<relativePath/>
</parent>

Expand All @@ -15,7 +15,8 @@
<version>1.0.0</version>

<properties>
<java.version>17</java.version>
<java.version>23</java.version>
<argLine></argLine>
</properties>

<dependencies>
Expand All @@ -37,6 +38,25 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>properties</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import org.mockito.Mock;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.bean.override.mockito.MockitoBean;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
Expand All @@ -31,7 +31,7 @@ public class MockAnnotationTest {
StudentGrades studentGrades;

// @Mock
@MockBean
@MockitoBean
private ApplicationDao applicationDao;

// @InjectMocks
Expand Down
28 changes: 24 additions & 4 deletions 3.00-starting-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.2</version>
<version>3.4.0</version>
<relativePath/>
</parent>

Expand All @@ -16,7 +16,8 @@
<packaging>war</packaging>

<properties>
<java.version>17</java.version>
<java.version>23</java.version>
<argLine></argLine>
</properties>

<dependencies>
Expand All @@ -41,8 +42,8 @@

<!-- mysql java connector -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>

Expand All @@ -66,6 +67,25 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>properties</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.luv2code.springmvc.models;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Table(name = "student")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.luv2code.springmvc.models;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Table(name = "history_grade")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.luv2code.springmvc.models;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Table(name = "math_grade")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.luv2code.springmvc.models;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Table(name = "science_grade")
Expand Down

This file was deleted.

Loading

0 comments on commit f7c9180

Please sign in to comment.