From c49ad7080e598ff4490881056efb15b38d1ed1b5 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Thu, 22 Aug 2024 16:58:21 +0800 Subject: [PATCH] update --- com.xxl.job.admin/build-common.gradle | 19 ------------------- com.xxl.job.admin/build-jetty.gradle | 15 --------------- com.xxl.job.admin/build-tomcat.gradle | 7 ------- com.xxl.job.admin/build-undertow.gradle | 15 --------------- com.xxl.job.core/build.gradle | 8 -------- com.xxl.job.executor/build-common.gradle | 19 ------------------- com.xxl.job.executor/build-jetty.gradle | 15 --------------- com.xxl.job.executor/build-tomcat.gradle | 7 ------- com.xxl.job.executor/build-undertow.gradle | 15 --------------- settings.gradle | 3 --- 10 files changed, 123 deletions(-) delete mode 100644 com.xxl.job.admin/build-common.gradle delete mode 100644 com.xxl.job.admin/build-jetty.gradle delete mode 100644 com.xxl.job.admin/build-tomcat.gradle delete mode 100644 com.xxl.job.admin/build-undertow.gradle delete mode 100644 com.xxl.job.core/build.gradle delete mode 100644 com.xxl.job.executor/build-common.gradle delete mode 100644 com.xxl.job.executor/build-jetty.gradle delete mode 100644 com.xxl.job.executor/build-tomcat.gradle delete mode 100644 com.xxl.job.executor/build-undertow.gradle diff --git a/com.xxl.job.admin/build-common.gradle b/com.xxl.job.admin/build-common.gradle deleted file mode 100644 index f6cfe3d5..00000000 --- a/com.xxl.job.admin/build-common.gradle +++ /dev/null @@ -1,19 +0,0 @@ -/** - * 设置打包文件的运行时目标环境(target) - * 设置方式: 通过命令行 -D 传入目标环境参数 - * 打包命令如下: - * 1. gradle bootwar # 默认, target=tomcat - * 2. gradle bootwar -Dtarget=undertow # undertow, target=undertow - * 3. gradle bootwar -Dtarget=jetty # jetty, target=jetty - */ -def target =System.getProperty("target") ?: "undertow"; -System.setProperty('target',target); - -// 根据 targetRuntime 变量的值执行实际的 build.gradle -apply from: "build-${target}.gradle" - -// 应用启动项目无需发布到仓库中 -publishPublicationPublicationToMavenRepository.enabled=false - -// 开启 docker 镜像生成任务 -jibBuildTar.enabled =true \ No newline at end of file diff --git a/com.xxl.job.admin/build-jetty.gradle b/com.xxl.job.admin/build-jetty.gradle deleted file mode 100644 index 337e18ac..00000000 --- a/com.xxl.job.admin/build-jetty.gradle +++ /dev/null @@ -1,15 +0,0 @@ -println "[Jetty] 环境 ......" - -configurations { - all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-coe" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" -} - -dependencies { - implementation("org.springframework.boot:spring-boot-starter-jetty") - - providedRuntime( - "org.springframework.boot:spring-boot-starter-jetty", - ) -} diff --git a/com.xxl.job.admin/build-tomcat.gradle b/com.xxl.job.admin/build-tomcat.gradle deleted file mode 100644 index a9d85e43..00000000 --- a/com.xxl.job.admin/build-tomcat.gradle +++ /dev/null @@ -1,7 +0,0 @@ -println "[Tomcat] 环境 ......" - -dependencies { - providedRuntime( - "org.springframework.boot:spring-boot-starter-tomcat", - ) -} diff --git a/com.xxl.job.admin/build-undertow.gradle b/com.xxl.job.admin/build-undertow.gradle deleted file mode 100644 index 2ef429e7..00000000 --- a/com.xxl.job.admin/build-undertow.gradle +++ /dev/null @@ -1,15 +0,0 @@ -println "[Undertow] 环境 ......" - -configurations { - all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-coe" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" -} - -dependencies { - implementation("org.springframework.boot:spring-boot-starter-undertow") - - providedRuntime( - "org.springframework.boot:spring-boot-starter-undertow", - ) -} diff --git a/com.xxl.job.core/build.gradle b/com.xxl.job.core/build.gradle deleted file mode 100644 index 270d4b5b..00000000 --- a/com.xxl.job.core/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -dependencies { - api( - "org.springframework.boot:spring-boot-starter-web", - "io.netty:netty-codec-http", - "com.google.code.gson:gson", - "org.codehaus.groovy:groovy", - ) -} \ No newline at end of file diff --git a/com.xxl.job.executor/build-common.gradle b/com.xxl.job.executor/build-common.gradle deleted file mode 100644 index f6cfe3d5..00000000 --- a/com.xxl.job.executor/build-common.gradle +++ /dev/null @@ -1,19 +0,0 @@ -/** - * 设置打包文件的运行时目标环境(target) - * 设置方式: 通过命令行 -D 传入目标环境参数 - * 打包命令如下: - * 1. gradle bootwar # 默认, target=tomcat - * 2. gradle bootwar -Dtarget=undertow # undertow, target=undertow - * 3. gradle bootwar -Dtarget=jetty # jetty, target=jetty - */ -def target =System.getProperty("target") ?: "undertow"; -System.setProperty('target',target); - -// 根据 targetRuntime 变量的值执行实际的 build.gradle -apply from: "build-${target}.gradle" - -// 应用启动项目无需发布到仓库中 -publishPublicationPublicationToMavenRepository.enabled=false - -// 开启 docker 镜像生成任务 -jibBuildTar.enabled =true \ No newline at end of file diff --git a/com.xxl.job.executor/build-jetty.gradle b/com.xxl.job.executor/build-jetty.gradle deleted file mode 100644 index 337e18ac..00000000 --- a/com.xxl.job.executor/build-jetty.gradle +++ /dev/null @@ -1,15 +0,0 @@ -println "[Jetty] 环境 ......" - -configurations { - all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-coe" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" -} - -dependencies { - implementation("org.springframework.boot:spring-boot-starter-jetty") - - providedRuntime( - "org.springframework.boot:spring-boot-starter-jetty", - ) -} diff --git a/com.xxl.job.executor/build-tomcat.gradle b/com.xxl.job.executor/build-tomcat.gradle deleted file mode 100644 index a9d85e43..00000000 --- a/com.xxl.job.executor/build-tomcat.gradle +++ /dev/null @@ -1,7 +0,0 @@ -println "[Tomcat] 环境 ......" - -dependencies { - providedRuntime( - "org.springframework.boot:spring-boot-starter-tomcat", - ) -} diff --git a/com.xxl.job.executor/build-undertow.gradle b/com.xxl.job.executor/build-undertow.gradle deleted file mode 100644 index 2ef429e7..00000000 --- a/com.xxl.job.executor/build-undertow.gradle +++ /dev/null @@ -1,15 +0,0 @@ -println "[Undertow] 环境 ......" - -configurations { - all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-coe" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" -} - -dependencies { - implementation("org.springframework.boot:spring-boot-starter-undertow") - - providedRuntime( - "org.springframework.boot:spring-boot-starter-undertow", - ) -} diff --git a/settings.gradle b/settings.gradle index 9217d254..ffc24cf2 100755 --- a/settings.gradle +++ b/settings.gradle @@ -2,9 +2,6 @@ include ':app.engine.rule' include ':app.platform' include ':app.platform.scheduler.executor' include ':app.platform.scheduler.manager' -include ':com.xxl.job.admin' -include ':com.xxl.job.core' -include ':com.xxl.job.executor' include ':erm' include ':erm.api' include ':erm.frontend'