From 5a7343ce9c7a22b485104a34ef00c4b62c009dcb Mon Sep 17 00:00:00 2001
From: renxb <renxb@inspur.com>
Date: Tue, 26 Jul 2022 14:57:58 +0800
Subject: [PATCH] =?UTF-8?q?spring=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 caf-bootstrap/pom.xml | 216 ++++++++++++++++++++++++++++++++++++++----
 pom.xml               |  57 ++++++-----
 2 files changed, 231 insertions(+), 42 deletions(-)

diff --git a/caf-bootstrap/pom.xml b/caf-bootstrap/pom.xml
index d4d55c41..c89b014a 100644
--- a/caf-bootstrap/pom.xml
+++ b/caf-bootstrap/pom.xml
@@ -52,10 +52,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.session</groupId>
 			<artifactId>spring-session-data-redis</artifactId>
@@ -72,14 +68,6 @@
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-base</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
@@ -100,6 +88,187 @@
 			<groupId>io.iec.edp</groupId>
 			<artifactId>caf-multicontext</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+		</dependency>
+
+		<!-- 升级framework后有些版本不匹配，在这强制指定下 -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>${jackson.version}</version>
+
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jdk8</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>${jackson.version}</version>
+
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-base</artifactId>
+			<version>${jackson.version}</version>
+
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-parameter-names</artifactId>
+			<version>${jackson.version}</version>
+
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>${jackson.version}</version>
+
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson.version}</version>
+
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-commons</artifactId>
+			<version>${spring-data-jpa.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-keyvalue</artifactId>
+			<version>${spring-data-jpa.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+			<version>${spring-data-jpa.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-redis</artifactId>
+			<version>${spring-data-jpa.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+			<version>${spring-data-jpa.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-expression</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jcl</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-oxm</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aspects</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<version>${spring-boot.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-config</artifactId>
+			<version>${spring-security.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-core</artifactId>
+			<version>${spring-security.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>${spring-security.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-crypto</artifactId>
+			<version>${spring-security.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.objenesis</groupId>
+			<artifactId>objenesis</artifactId>
+			<version>${objenesis.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>${commons-collections.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -175,7 +344,7 @@
 						</exclude>
 						<exclude>
 							<groupId>io.iec.edp</groupId>
-							<artifactId>caf-commons-multicontext</artifactId>
+							<artifactId>caf-multicontext</artifactId>
 						</exclude>
 						<exclude>
 							<groupId>io.iec.edp</groupId>
@@ -355,15 +524,28 @@
 							<artifactId>spring-boot-starter-tomcat</artifactId>
 						</exclude>
 						<!-- 这俩等着2204发版的时候移除 -->
+						<exclude>
+							<groupId>org.apache.logging.log4j</groupId>
+							<artifactId>log4j-api</artifactId>
+						</exclude>
+						<exclude>
+							<groupId>org.apache.logging.log4j</groupId>
+							<artifactId>log4j-to-slf4j</artifactId>
+						</exclude>
+						<exclude>
+							<groupId>com.alibaba</groupId>
+							<artifactId>fastjson</artifactId>
+						</exclude>
 						<!--						<dependency>-->
-						<!--							<groupId>org.apache.logging.log4j</groupId>-->
-						<!--							<artifactId>log4j-api</artifactId>-->
+						<!--							<groupId>ch.qos.logback</groupId>-->
+						<!--							<artifactId>logback-classic</artifactId>-->
 						<!--						</dependency>-->
 						<!--						<dependency>-->
-						<!--							<groupId>org.apache.logging.log4j</groupId>-->
-						<!--							<artifactId>log4j-to-slf4j</artifactId>-->
+						<!--							<groupId>ch.qos.logback</groupId>-->
+						<!--							<artifactId>logback-core</artifactId>-->
 						<!--						</dependency>-->
 
+
 						<!-- 2110后，去除的大jar包里的第三方依赖，以方便后续升级第三方jar包 -->
 						<!--						<exclude>-->
 						<!--							<groupId>org.apache.cxf</groupId>-->
diff --git a/pom.xml b/pom.xml
index 73b47e35..d71d5951 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,17 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<hibernate-core.version>5.3.10-SR4</hibernate-core.version>
+		<objenesis.version>2.6</objenesis.version>
+		<spring-data-jpa.version>2.2.12.RELEASE</spring-data-jpa.version>
+		<jackson.version>2.13.0</jackson.version>
+		<spring-framework.version>5.3.20</spring-framework.version>
+		<commons-collections.version>3.2.2</commons-collections.version>
+		<spring-boot.version>2.4.13</spring-boot.version>
+		<spring-security.version>5.5.8</spring-security.version>
 		<caf-svc.version>0.3.8</caf-svc.version>
 		<!--		<caf-framework.version>1.0.0-rc.1</caf-framework.version>-->
-		<caf-framework.version>0.9.0</caf-framework.version>
-		<spring-boot.version>2.2.13.RELEASE</spring-boot.version>
+		<caf-framework.version>1.0.0-rc.5</caf-framework.version>
+		<!--		<caf-framework.version>1.0.0-SNAPSHOT</caf-framework.version>-->
 	</properties>
 
 	<url>https://git.iec.io/caf/caf-boot</url>
@@ -156,29 +163,29 @@
 					</execution>
 				</executions>
 			</plugin>
-		    <!--	copyright		-->
-<!--			<plugin>-->
-<!--				<groupId>org.apache.maven.plugins</groupId>-->
-<!--				<artifactId>maven-checkstyle-plugin</artifactId>-->
-<!--				<version>3.0.0</version>-->
-<!--				<executions>-->
-<!--					<execution>-->
-<!--						<id>validate</id>-->
-<!--						<phase>validate</phase>-->
-<!--						<configuration>-->
-<!--							<configLocation>${user.dir}/style/ubml_checkstyle.xml</configLocation>-->
-<!--							<encoding>UTF-8</encoding>-->
-<!--							<consoleOutput>true</consoleOutput>-->
-<!--							<failsOnError>true</failsOnError>-->
-<!--							<failOnViolation>false</failOnViolation>-->
-<!--							<excludes>**/generated/**/*</excludes>-->
-<!--						</configuration>-->
-<!--						<goals>-->
-<!--							<goal>check</goal>-->
-<!--						</goals>-->
-<!--					</execution>-->
-<!--				</executions>-->
-<!--			</plugin>-->
+			<!--	copyright		-->
+			<!--			<plugin>-->
+			<!--				<groupId>org.apache.maven.plugins</groupId>-->
+			<!--				<artifactId>maven-checkstyle-plugin</artifactId>-->
+			<!--				<version>3.0.0</version>-->
+			<!--				<executions>-->
+			<!--					<execution>-->
+			<!--						<id>validate</id>-->
+			<!--						<phase>validate</phase>-->
+			<!--						<configuration>-->
+			<!--							<configLocation>${user.dir}/style/ubml_checkstyle.xml</configLocation>-->
+			<!--							<encoding>UTF-8</encoding>-->
+			<!--							<consoleOutput>true</consoleOutput>-->
+			<!--							<failsOnError>true</failsOnError>-->
+			<!--							<failOnViolation>false</failOnViolation>-->
+			<!--							<excludes>**/generated/**/*</excludes>-->
+			<!--						</configuration>-->
+			<!--						<goals>-->
+			<!--							<goal>check</goal>-->
+			<!--						</goals>-->
+			<!--					</execution>-->
+			<!--				</executions>-->
+			<!--			</plugin>-->
 
 		</plugins>
 	</build>
-- 
Gitee