Browse Source

update

main
wangshaoping 7 months ago
parent
commit
182c55905b
  1. 4
      app.irbs/build-common.gradle
  2. 13
      app.irbs/build.gradle
  3. 263
      build.gradle
  4. 6
      gradle.properties

4
app.irbs/build-common.gradle

@ -13,7 +13,7 @@ System.setProperty('target',target);
apply from: "build-${target}.gradle" apply from: "build-${target}.gradle"
// //
publishPublicationPublicationToMavenRepository.enabled=false //publishPublicationPublicationToMavenRepository.enabled=false
// docker // docker
jibBuildTar.enabled =true //jibBuildTar.enabled =true

13
app.irbs/build.gradle

@ -4,13 +4,13 @@ apply plugin: 'com.google.cloud.tools.jib'
apply from: "build-common.gradle" apply from: "build-common.gradle"
dependencies { dependencies {
implementation("org.springframework.boot:spring-boot-starter-web"){ implementation("org.springframework.boot:spring-boot-starter-web"){
exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
} }
} }
dependencies { dependencies {
implementation ( implementation (
"io.sc:io.sc.platform.developer:${platform_version}", "io.sc:io.sc.platform.developer:${platform_version}",
"io.sc:io.sc.platform.app:${platform_version}", "io.sc:io.sc.platform.app:${platform_version}",
"io.sc:io.sc.platform.security.loginform:${platform_version}", "io.sc:io.sc.platform.security.loginform:${platform_version}",
@ -73,7 +73,7 @@ bootWar{
//launchScript() //launchScript()
manifest { manifest {
attributes 'Implementation-Version': archiveVersion, attributes 'Implementation-Version': archiveVersion,
'Implementation-Title': project.name 'Implementation-Title': project.name
} }
} }
@ -82,11 +82,10 @@ bootJar{
//launchScript() //launchScript()
manifest { manifest {
attributes 'Implementation-Version': archiveVersion, attributes 'Implementation-Version': archiveVersion,
'Implementation-Title': project.name 'Implementation-Title': project.name
} }
} }
jib { jib {
outputPaths { outputPaths {
tar = "build/libs/${project.name}-${project.version}-image.tar" tar = "build/libs/${project.name}-${project.version}-image.tar"

263
build.gradle

@ -1,3 +1,5 @@
import org.gradle.api.artifacts.DependencyResolveDetails
apply from: "build-version.gradle" apply from: "build-version.gradle"
def isFrontendProject(currentDir){ def isFrontendProject(currentDir){
@ -42,71 +44,79 @@ subprojects {
apply plugin: 'io.spring.dependency-management' apply plugin: 'io.spring.dependency-management'
apply plugin: "org.asciidoctor.jvm.convert" apply plugin: "org.asciidoctor.jvm.convert"
configurations.all { configurations.all {
// gradle // gradle
//resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' //: 1.1.+ //resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' //: 1.1.+
//resolutionStrategy.cacheChangingModulesFor 0, 'seconds' //: 1.1.2 //resolutionStrategy.cacheChangingModulesFor 0, 'seconds' //: 1.1.2
// //
//exclude group: "org.apache.logging.log4j", module: "log4j-api" // exclude group: "org.apache.logging.log4j", module: "log4j-api"
//exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" // exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
//exclude group: "org.slf4j", module: "slf4j-jdk14" // exclude group: "org.slf4j", module: "slf4j-jdk14"
exclude group: "org.slf4j", module: "slf4j-nop" exclude group: "org.slf4j", module: "slf4j-nop"
}
dependencyManagement { resolutionStrategy.eachDependency { DependencyResolveDetails detail ->
resolutionStrategy { def requested =detail.requested;
// gradle def groupAndName =requested.group + ":" + requested.name;
//cacheDynamicVersionsFor 0, 'seconds' //: 1.1.+ if(PlatformDependencyVersions[groupAndName]!=null){
detail.useVersion(PlatformDependencyVersions[groupAndName]);
}
}
}
dependencyManagement {
resolutionStrategy {
// gradle
//cacheDynamicVersionsFor 0, 'seconds' //: 1.1.+
//cacheChangingModulesFor 0, 'seconds' //: 1.1.2 //cacheChangingModulesFor 0, 'seconds' //: 1.1.2
} }
imports { imports {
//mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_version}" //mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_version}"
mavenBom "com.alibaba.cloud:spring-cloud-alibaba-dependencies:${spring_cloud_alibaba_version}" mavenBom "com.alibaba.cloud:spring-cloud-alibaba-dependencies:${spring_cloud_alibaba_version}"
mavenBom "org.springframework.statemachine:spring-statemachine-bom:${spring_statemachine_version}" mavenBom "org.springframework.statemachine:spring-statemachine-bom:${spring_statemachine_version}"
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* url * url
* url ${repository_url} * url ${repository_url}
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
repositories { repositories {
all { ArtifactRepository repo -> all { ArtifactRepository repo ->
if(repo instanceof MavenArtifactRepository){ if(repo instanceof MavenArtifactRepository){
def url = repo.url.toString() def url = repo.url.toString()
if ( if (
url.startsWith('https://repo1.maven.org/maven2') url.startsWith('https://repo1.maven.org/maven2')
|| url.startsWith('https://jcenter.bintray.com/') || url.startsWith('https://jcenter.bintray.com/')
|| url.startsWith('https://maven.aliyun.com') || url.startsWith('https://maven.aliyun.com')
) { ) {
remove repo remove repo
} }
} }
} }
maven { maven {
allowInsecureProtocol = true allowInsecureProtocol = true
url "${repository_url}" url "${repository_url}"
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* java * java
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
sourceCompatibility ="${java_version}" sourceCompatibility ="${java_version}"
targetCompatibility ="${java_version}" targetCompatibility ="${java_version}"
compileJava.options.encoding ="${java_encoding}" compileJava.options.encoding ="${java_encoding}"
compileTestJava.options.encoding ="${java_encoding}" compileTestJava.options.encoding ="${java_encoding}"
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs += ["-Xlint:deprecation","-Xlint:unchecked"] options.compilerArgs += ["-Xlint:deprecation","-Xlint:unchecked"]
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* *
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
group ="${application_group}" group ="${application_group}"
version ="${application_version}" version ="${application_version}"
if(file('package.json').exists()){ if(file('package.json').exists()){
mkdir 'java-src/main/java'; mkdir 'java-src/main/java';
@ -114,7 +124,7 @@ subprojects {
mkdir 'dist'; mkdir 'dist';
sourceSets.main.java.srcDir 'java-src/main/java' sourceSets.main.java.srcDir 'java-src/main/java'
sourceSets.main.resources.srcDir 'java-src/main/resources' sourceSets.main.resources.srcDir 'java-src/main/resources'
sourceSets.main.resources.srcDir 'dist' sourceSets.main.resources.srcDir 'dist'
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
@ -140,48 +150,48 @@ subprojects {
} }
clean { clean {
delete 'dist' // delete 'dist' //
delete 'bin' // eclipse bin delete 'bin' // eclipse bin
delete 'build' // gradle delete 'build' // gradle
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* eclipse * eclipse
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
eclipse{ eclipse{
jdt{ jdt{
sourceCompatibility ="${java_version}" sourceCompatibility ="${java_version}"
targetCompatibility ="${java_version}" targetCompatibility ="${java_version}"
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* springboot * springboot
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
jar { jar {
// jar // jar
enabled = true enabled = true
archiveClassifier.set("") archiveClassifier.set("")
manifest { manifest {
attributes 'Manifest-Version' : '1.0', attributes 'Manifest-Version' : '1.0',
'Implementation-Title' : name, 'Implementation-Title' : name,
'Implementation-Vendor' : group, 'Implementation-Vendor' : group,
'Implementation-Version': archiveVersion 'Implementation-Version': archiveVersion
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* asciidoctor , asciidoc , jar * asciidoctor , asciidoc , jar
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
asciidoctor { asciidoctor {
baseDirFollowsSourceDir() baseDirFollowsSourceDir()
outputs.upToDateWhen { true } outputs.upToDateWhen { true }
logDocuments = true logDocuments = true
sourceDir = file('asciidoc') sourceDir = file('asciidoc')
sources { sources {
include '*.adoc' include '*.adoc'
} }
outputDir = file("dist/help/" + project.name) outputDir = file("dist/help/" + project.name)
resources { resources {
from(sourceDir) { from(sourceDir) {
@ -191,24 +201,24 @@ subprojects {
} }
asciidoctorj { asciidoctorj {
modules { modules {
diagram.use() diagram.use()
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* , asciidoc web ,便 * , asciidoc web ,便
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
task doc(type: org.asciidoctor.gradle.jvm.AsciidoctorTask){ task doc(type: org.asciidoctor.gradle.jvm.AsciidoctorTask){
baseDirFollowsSourceDir() baseDirFollowsSourceDir()
outputs.upToDateWhen { true } outputs.upToDateWhen { true }
logDocuments = true logDocuments = true
sourceDir = file('asciidoc') sourceDir = file('asciidoc')
sources { sources {
include '*.adoc' include '*.adoc'
} }
outputDir = file("$asciidoc_deploy_dir" + project.name) outputDir = file("$asciidoc_deploy_dir" + project.name)
// asciidoc // asciidoc
// : -D // : -D
@ -222,48 +232,48 @@ subprojects {
} }
} }
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* asciidoctor * asciidoctor
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
processResources { processResources {
dependsOn asciidoctor dependsOn asciidoctor
doLast{ doLast{
// jrebel // jrebel
delete "$buildDir/resources/main/rebel.xml" delete "$buildDir/resources/main/rebel.xml"
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* jrebel.xml (eclipse) * jrebel.xml (eclipse)
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
task jrebelEclipse() {} task jrebelEclipse() {}
tasks.jrebelEclipse.doLast { tasks.jrebelEclipse.doLast {
File resourcesFile =file('src/main/resources') File resourcesFile =file('src/main/resources')
if(resourcesFile!=null && resourcesFile.exists()){ if(resourcesFile!=null && resourcesFile.exists()){
File rebelFile = file('src/main/resources/rebel.xml') File rebelFile = file('src/main/resources/rebel.xml')
rebelFile.withWriter('UTF-8') { writer -> rebelFile.withWriter('UTF-8') { writer ->
writer.write('<?xml version="1.0" encoding="UTF-8"?>\n'); writer.write('<?xml version="1.0" encoding="UTF-8"?>\n');
writer.write('<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">\n'); writer.write('<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">\n');
writer.write('\t<classpath>\n'); writer.write('\t<classpath>\n');
if(file(project.name + '/src/main').exists()){ if(file(project.name + '/src/main').exists()){
writer.write('\t\t<dir name="' + project.projectDir + '/bin/main"/>\n'); writer.write('\t\t<dir name="' + project.projectDir + '/bin/main"/>\n');
} }
if(file(project.name + '/src/generated').exists()){ if(file(project.name + '/src/generated').exists()){
writer.write('\t\t<dir name="' + project.projectDir + '/bin/generated"/>\n'); writer.write('\t\t<dir name="' + project.projectDir + '/bin/generated"/>\n');
} }
writer.write('\t</classpath>\n'); writer.write('\t</classpath>\n');
writer.write('</application>'); writer.write('</application>');
} }
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* jrebel.xml (idea) * jrebel.xml (idea)
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
task jrebelIdea() {} task jrebelIdea() {}
tasks.jrebelIdea.doLast { tasks.jrebelIdea.doLast {
if(isFrontendProject(file('.'))) { if(isFrontendProject(file('.'))) {
File resourcesFile = file('java-src/main/resources') File resourcesFile = file('java-src/main/resources')
if (resourcesFile != null && resourcesFile.exists()) { if (resourcesFile != null && resourcesFile.exists()) {
@ -295,7 +305,7 @@ subprojects {
} }
} }
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* maven publish * maven publish
@ -303,12 +313,12 @@ subprojects {
publishing { publishing {
repositories { repositories {
maven { maven {
allowInsecureProtocol = true // http allowInsecureProtocol = true // http
url = version.contains('SNAPSHOT') ? "${repository_snapshot_url}" : "${repository_release_url}" url = version.contains('SNAPSHOT') ? "${repository_snapshot_url}" : "${repository_release_url}"
credentials { credentials {
username = (version.contains('SNAPSHOT') ? "${repository_snapshot_username}" : "${repository_release_username}") username = (version.contains('SNAPSHOT') ? "${repository_snapshot_username}" : "${repository_release_username}")
password = (version.contains('SNAPSHOT') ? "${repository_snapshot_password}" : "${repository_release_password}") password = (version.contains('SNAPSHOT') ? "${repository_snapshot_password}" : "${repository_release_password}")
} }
} }
} }
publications{ publications{
@ -317,18 +327,18 @@ subprojects {
//artifact sourcesJar //artifact sourcesJar
//artifact javadocJar //artifact javadocJar
versionMapping { versionMapping {
usage('java-api') { usage('java-api') {
fromResolutionOf('runtimeClasspath') fromResolutionOf('runtimeClasspath')
} }
usage('java-runtime') { usage('java-runtime') {
fromResolutionResult() fromResolutionResult()
} }
} }
} }
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* package.json , name version * package.json , name version
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
task frontendUpdatePackageJson(){} task frontendUpdatePackageJson(){}
@ -354,7 +364,7 @@ subprojects {
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* pnpm install * pnpm install
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
task frontendNpmInstall(type:Exec){ task frontendNpmInstall(type:Exec){
@ -404,7 +414,7 @@ subprojects {
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* pnpm run build * pnpm run build
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
task frontendNpmBuild(type:Exec) { task frontendNpmBuild(type:Exec) {
@ -429,7 +439,7 @@ subprojects {
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* pnpm run prod * pnpm run prod
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
task frontendNpmProd(type:Exec) { task frontendNpmProd(type:Exec) {
@ -672,7 +682,16 @@ subprojects {
processResources { processResources {
if(isFrontendProject(file('.'))) { if(isFrontendProject(file('.'))) {
exclude("**/${project.name}/*.*") exclude("**/${project.name}/*.*");
if(project.name!='io.sc.platform.mvc.frontend' && project.name!='io.sc.platform.security.frontend'){
// exclude("**/${project.name}/javascript/codemirror.*");
// exclude("**/${project.name}/javascript/echarts.*");
// exclude("**/${project.name}/javascript/platform-core.*");
// exclude("**/${project.name}/javascript/quasar.*");
// exclude("**/${project.name}/javascript/vue.*");
// exclude("**/${project.name}/fonts/*.*");
// exclude("**/${project.name}/webjars/**/*.*");
}
} }
} }
} }
@ -714,8 +733,8 @@ idea {
} }
} }
} }
project { project {
vcs = 'Git' vcs = 'Git'
ipr { ipr {
// ipr , // ipr ,
// 1. // 1.
@ -801,7 +820,7 @@ idea {
setNode.appendNode("option",[value:"reload"]) setNode.appendNode("option",[value:"reload"])
} }
} }
} }
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------

6
gradle.properties

@ -10,13 +10,13 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true
########################################################### ###########################################################
# Maven private repository configuration # Maven private repository configuration
########################################################### ###########################################################
repository_url=http://58.33.84.154:8000/repository/maven-public/ repository_url=http://nexus.sc.io:8000/repository/maven-public/
repository_release_url=http://58.33.84.154:8000/repository/maven-releases/ repository_release_url=http://nexus.sc.io:8000/repository/maven-releases/
repository_release_username=admin repository_release_username=admin
repository_release_password=admin repository_release_password=admin
repository_snapshot_url=http://58.33.84.154:8000/repository/maven-snapshots/ repository_snapshot_url=http://nexus.sc.io:8000/repository/maven-snapshots/
repository_snapshot_username=admin repository_snapshot_username=admin
repository_snapshot_password=admin repository_snapshot_password=admin

Loading…
Cancel
Save