From 4f073f56b7f174bb1c9ab6543eff1f447753c403 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Mon, 14 Feb 2022 14:36:08 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-9267=20=E6=8B=86=E5=88=86third.jar?= =?UTF-8?q?=E4=B8=BAthird.jar=20+=20cbb.jar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step0-jdk11.gradle | 56 +++++++--------- build.third_step0.gradle | 114 ++++++++++++++------------------- 2 files changed, 71 insertions(+), 99 deletions(-) diff --git a/build.third_step0-jdk11.gradle b/build.third_step0-jdk11.gradle index fd284fa04..63391cb03 100644 --- a/build.third_step0-jdk11.gradle +++ b/build.third_step0-jdk11.gradle @@ -7,7 +7,7 @@ tasks.withType(JavaCompile){ } configurations.all { - resolutionStrategy.cacheChangingModulesFor 0, 'seconds' + resolutionStrategy.cacheChangingModulesFor 0, 'seconds' } //源码版本 sourceCompatibility=11 @@ -24,8 +24,8 @@ jar{ } repositories { - mavenCentral() - maven { url "http://mvn.finedevelop.com/repository/maven-public/" } + mavenCentral() + maven { url "http://mvn.finedevelop.com/repository/maven-public/" } maven { url "http://mvn.finedevelop.com/repository/fanruan/" } } @@ -52,7 +52,7 @@ def maven_version="${version}-${MVN_BRANCH}-SNAPSHOT" def jar_version = version configurations { - // thirdjar + // thirdjar // sigar essential } @@ -63,32 +63,32 @@ String essentialVersion = findProperty("essentialVersion") //指定依赖 dependencies{ compileOnly "com.fr.essential:fine-essential:${essentialVersion}" - // thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" + // thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" // sigar "com.fr.third:sigar:1.6.0" - testCompile 'junit:junit:4.12' + testCompile 'junit:junit:4.12' } publishing { - publications { - third(MavenPublication) { - groupId "com.fr.third" - artifactId "fine-third" - version maven_version - from components.java - } - } - repositories { + publications { + third(MavenPublication) { + groupId "com.fr.third" + artifactId "fine-third" + version maven_version + from components.java + } + } + repositories { maven { - - url "http://mvn.finedevelop.com/repository/fanruan/" - credentials { - username = findProperty("NEXUS_USERNAME") - password = findProperty("NEXUS_PASSWORD") - } - + + url "http://mvn.finedevelop.com/repository/fanruan/" + credentials { + username = findProperty("NEXUS_USERNAME") + password = findProperty("NEXUS_PASSWORD") + } + } - } + } } task unpack(type:Copy) { @@ -118,18 +118,8 @@ task unpack(type:Copy) { zipTree(file) } } - -} -// 将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..4cb7a7c2b 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -7,7 +7,7 @@ tasks.withType(JavaCompile){ } configurations.all { - resolutionStrategy.cacheChangingModulesFor 0, 'seconds' + resolutionStrategy.cacheChangingModulesFor 0, 'seconds' } //源码版本 sourceCompatibility=1.8 @@ -23,8 +23,8 @@ jar{ } repositories { - mavenCentral() - maven { url "http://mvn.finedevelop.com/repository/maven-public/" } + mavenCentral() + maven { url "http://mvn.finedevelop.com/repository/maven-public/" } maven { url "http://mvn.finedevelop.com/repository/fanruan/" } } @@ -54,11 +54,11 @@ def indexV = branchName.indexOf( "%2F"); String branchNameUpperCase = "RELEASE" if(indexV != -1){ - version= branchName.substring(indexV+3, branchName.length()).toUpperCase() + version= branchName.substring(indexV+3, branchName.length()).toUpperCase() branchNameUpperCase = branchName.substring(0, indexV).toUpperCase() maven_version_build = project.version +"-" + branchNameUpperCase +"-SNAPSHOT" } else { - version= branchName + version= branchName maven_version_build = project.version +"-SNAPSHOT" } @@ -66,7 +66,7 @@ def maven_version="${version}.${formattedDate}" def jar_version = version configurations { - // thirdjar + // thirdjar // sigar essential } @@ -78,64 +78,61 @@ 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" + // thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" // sigar "com.fr.third:sigar:1.6.0" - testCompile 'junit:junit:4.12' + testCompile 'junit:junit:4.12' } publishing { - publications { - third(MavenPublication) { - groupId "com.fr.third" - artifactId "fine-third" - version maven_version - ext.repo = 'release' - from components.java - } - - third_build(MavenPublication) { - groupId "com.fr.third" - artifactId project.hasProperty("withCBB") ? "fine-third" : "fine-third-without-cbb" - version maven_version_build - ext.repo = 'snapshot' - from components.java - } - } - repositories { + publications { + third(MavenPublication) { + groupId "com.fr.third" + artifactId "fine-third" + version maven_version + ext.repo = 'release' + from components.java + } + + third_build(MavenPublication) { + groupId "com.fr.third" + artifactId "fine-third" + version maven_version_build + ext.repo = 'snapshot' + from components.java + } + } + repositories { maven { - name "release" - url "http://mvn.finedevelop.com/repository/fanruan-release/" - credentials { - username = findProperty("NEXUS_USERNAME") - password = findProperty("NEXUS_PASSWORD") - } - + name "release" + url "http://mvn.finedevelop.com/repository/fanruan-release/" + credentials { + username = findProperty("NEXUS_USERNAME") + password = findProperty("NEXUS_PASSWORD") + } + } maven { - name "snapshot" - url "http://mvn.finedevelop.com/repository/fanruan/" - credentials { - username = findProperty("NEXUS_USERNAME") - password = findProperty("NEXUS_PASSWORD") - } - + name "snapshot" + url "http://mvn.finedevelop.com/repository/fanruan/" + credentials { + username = findProperty("NEXUS_USERNAME") + password = findProperty("NEXUS_PASSWORD") + } + } - } + } } afterEvaluate { - tasks.withType(PublishToMavenRepository) { task -> - if (task.publication.hasProperty('repo') && task.publication.repo != task.repository.name) { - task.enabled = false - task.group = null - } - } + tasks.withType(PublishToMavenRepository) { task -> + if (task.publication.hasProperty('repo') && task.publication.repo != task.repository.name) { + task.enabled = false + task.group = null + } + } } task unpack(type:Copy) { @@ -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