From 419f406418bfdc3b115f0d9217ede1d387ff1402 Mon Sep 17 00:00:00 2001
From: lidongy <1879087903@qq.com>
Date: Fri, 11 Feb 2022 17:02:53 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-9267=20feat:=20=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84CBB=E7=BB=84=E4=BB=B6=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E8=BF=87=E4=BA=8E=E5=86=97=E6=9D=82=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=B3=95=E7=B2=BE=E7=AE=80=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.third_step0-jdk11.gradle | 10 ----------
 build.third_step0.gradle       | 22 ++--------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/build.third_step0-jdk11.gradle b/build.third_step0-jdk11.gradle
index fd284fa04..5e281c1d0 100644
--- a/build.third_step0-jdk11.gradle
+++ b/build.third_step0-jdk11.gradle
@@ -121,15 +121,5 @@ task unpack(type:Copy) {
 	
 }
 
-// 将essential依赖等级的jar全部解压到classes下
-task unpackEssential(type:Copy) {
-	for (File file : configurations.essential.files) {
-		from zipTree(file)
-	}
-	into classesDir
-}
-
-jar.dependsOn unpackEssential
-
 jar.dependsOn unpack
 
diff --git a/build.third_step0.gradle b/build.third_step0.gradle
index 6ba98602f..26a3e633f 100644
--- a/build.third_step0.gradle
+++ b/build.third_step0.gradle
@@ -78,9 +78,6 @@ String cbbVersion = findProperty("cbbVersion")
 //指定依赖
 dependencies{
 	essential "com.fr.essential:fine-essential:${essentialVersion}"
-	essential "com.fr.cbb:fine-scheduler:${cbbVersion}"
-	essential "com.fr.cbb:fine-function:${cbbVersion}"
-	essential "com.fr.cbb:fine-sql:${cbbVersion}"
     // thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	// sigar "com.fr.third:sigar:1.6.0"
     testCompile 'junit:junit:4.12'
@@ -99,7 +96,7 @@ publishing {
 
 	third_build(MavenPublication) {
             groupId "com.fr.third"
-            artifactId project.hasProperty("withCBB") ? "fine-third" : "fine-third-without-cbb"
+            artifactId "fine-third"
             version maven_version_build
 	    ext.repo = 'snapshot'
             from components.java
@@ -167,19 +164,4 @@ task unpack(type:Copy) {
 	}
 }
 
-// 将essential依赖等级的jar全部解压到classes下
-task unpackEssential(type:Copy) {
-	if (project.hasProperty("withCBB")) {
-		for (File file : configurations.essential.files) {
-			from (zipTree(file)) {
-				exclude "META-INF/versions/11/*"
-				exclude "META-INF/maven/com.zaxxer/**"
-			}
-		}
-		into classesDir
-	}
-}
-
-unpackEssential.dependsOn unpack
-
-jar.dependsOn unpackEssential
\ No newline at end of file
+jar.dependsOn unpack
\ No newline at end of file