iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JAVA-26243] Upgraded spring-di-3 module to spring-boot 3 (#14997)

Browse Source
This commit is contained in:
panos-kakos
2023-11-01 13:00:50 +02:00
committed by GitHub
parent 2f9acfe1d1
commit b696d205f6
17 changed files with 30 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-di-2/pom.xml
+3 -9
View File
@@ -9,9 +9,9 @@
<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-spring-5</artifactId>
<artifactId>parent-spring-6</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-spring-5</relativePath>
<relativePath>../parent-spring-6</relativePath>
</parent>
<dependencyManagement>
@@ -46,11 +46,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>${javax.inject.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -84,9 +79,8 @@
</build>
<properties>
<spring-boot.version>2.6.1</spring-boot.version>
<spring-boot.version>3.1.2</spring-boot.version>
<aspectj-plugin.version>1.14.0</aspectj-plugin.version>
<javax.inject.version>1</javax.inject.version>
<log4j2.version>2.17.1</log4j2.version>
</properties>
spring-di-2/src/main/java/com/baeldung/di/aspectj/PersonEntity.java
+3 -3
View File
@@ -3,9 +3,9 @@ package com.baeldung.di.aspectj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Configurable;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Transient;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Transient;
@Entity
@Configurable(preConstruction = true)
spring-di-2/src/test/java/com/baeldung/wiring/configuration/inject/FieldByNameInjectIntegrationTest.java
+2 -2
View File
@@ -3,8 +3,8 @@ package com.baeldung.wiring.configuration.inject;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import javax.inject.Inject;
import javax.inject.Named;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.junit.Test;
import org.junit.runner.RunWith;
spring-di-2/src/test/java/com/baeldung/wiring/configuration/inject/FieldInjectIntegrationTest.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.baeldung.wiring.configuration.inject;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import javax.inject.Inject;
import jakarta.inject.Inject;
import org.junit.Test;
import org.junit.runner.RunWith;
spring-di-2/src/test/java/com/baeldung/wiring/configuration/inject/FieldQualifierInjectIntegrationTest.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.baeldung.wiring.configuration.inject;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import javax.inject.Inject;
import jakarta.inject.Inject;
import org.junit.Test;
import org.junit.runner.RunWith;
spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/FieldResourceInjectionIntegrationTest.java
+1 -1
View File
@@ -5,7 +5,7 @@ import static org.junit.Assert.assertNotNull;
import java.io.File;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Test;
import org.junit.runner.RunWith;
spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/MethodByQualifierResourceIntegrationTest.java
+1 -1
View File
@@ -9,7 +9,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
import com.baeldung.wiring.configuration.ApplicationContextTestResourceQualifier;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.File;
import static org.junit.Assert.assertEquals;
spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/MethodByTypeResourceIntegrationTest.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
import com.baeldung.wiring.configuration.ApplicationContextTestResourceNameType;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.File;
import static org.junit.Assert.assertEquals;
spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/MethodResourceInjectionIntegrationTest.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
import com.baeldung.wiring.configuration.ApplicationContextTestResourceNameType;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.File;
import static org.junit.Assert.assertEquals;
spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/NamedResourceIntegrationTest.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
import com.baeldung.wiring.configuration.ApplicationContextTestResourceNameType;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.File;
import static org.junit.Assert.assertEquals;
spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/QualifierResourceInjectionIntegrationTest.java
+1 -1
View File
@@ -9,7 +9,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
import com.baeldung.wiring.configuration.ApplicationContextTestResourceQualifier;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.File;
import static org.junit.Assert.assertEquals;
spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/SetterResourceInjectionIntegrationTest.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
import com.baeldung.wiring.configuration.ApplicationContextTestResourceNameType;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.File;
import static org.junit.Assert.assertEquals;