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

Merge pull request #9564 from nguyennamthai/BAEL-4068-v2

Browse Source 
Bael 4068 v2
This commit is contained in:
Jonathan Cook 2020-06-23 21:55:34 +02:00 committed by GitHub
commit 1751937ca2
8 changed files with 67 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -655,6 +655,7 @@
<module>spring-data-rest</module> <module>spring-data-rest</module>
<module>spring-data-rest-querydsl</module> <module>spring-data-rest-querydsl</module>
<module>spring-di</module> <module>spring-di</module>
<module>spring-di-2</module>
<module>spring-dispatcher-servlet</module> <module>spring-dispatcher-servlet</module>
<module>spring-drools</module> <module>spring-drools</module>

65
spring-di-2/pom.xml Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-di-2</artifactId>
<version>1.0-SNAPSHOT</version>
<name>spring-di-2</name>
<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-spring-5</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-spring-5</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>${spring.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>${aspectj-plugin.version}</version>
<configuration>
<complianceLevel>${java.version}</complianceLevel>
<aspectLibraries>
<aspectLibrary>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
</aspectLibrary>
</aspectLibraries>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
<aspectj-plugin.version>1.11</aspectj-plugin.version>
</properties>
</project>

0
spring-di/src/main/java/com/baeldung/di/aspectj/AspectJConfig.java → spring-di-2/src/main/java/com/baeldung/di/aspectj/AspectJConfig.java
View File

0
spring-di/src/main/java/com/baeldung/di/aspectj/IdService.java → spring-di-2/src/main/java/com/baeldung/di/aspectj/IdService.java
View File

0
spring-di/src/main/java/com/baeldung/di/aspectj/PersonEntity.java → spring-di-2/src/main/java/com/baeldung/di/aspectj/PersonEntity.java
View File

0
spring-di/src/main/java/com/baeldung/di/aspectj/PersonObject.java → spring-di-2/src/main/java/com/baeldung/di/aspectj/PersonObject.java
View File

0
spring-di/src/test/java/com/baeldung/di/aspectj/PersonUnitTest.java → spring-di-2/src/test/java/com/baeldung/di/aspectj/PersonUnitTest.java
View File

33
spring-di/pom.xml
View File

@ -68,11 +68,6 @@
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
<version>${spring-boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId> <artifactId>spring-boot-test</artifactId>
@ -95,11 +90,7 @@
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<version>${aspectjweaver.version}</version> <version>${aspectjweaver.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- Spring --> <!-- Spring -->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>org.springframework</groupId>--> <!-- <groupId>org.springframework</groupId>-->
@ -138,27 +129,6 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>${aspectj-plugin.version}</version>
<configuration>
<complianceLevel>${java.version}</complianceLevel>
<aspectLibraries>
<aspectLibrary>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
</aspectLibrary>
</aspectLibraries>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
@ -194,7 +164,6 @@
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<assertj.version>3.12.2</assertj.version> <assertj.version>3.12.2</assertj.version>
<aspectjweaver.version>1.9.5</aspectjweaver.version> <aspectjweaver.version>1.9.5</aspectjweaver.version>
<aspectj-plugin.version>1.11</aspectj-plugin.version>
</properties> </properties>
</project> </project>