Merge branch 'jenkins_with_weblogic' of ssh://192.168.240.178:18081/eapim/elink-portal-common into jenkins_with_weblogic
This commit is contained in:
+40
-8
@@ -22,13 +22,6 @@ def hibernateVersion = "5.6.15.Final"
|
|||||||
def generatedJavaDir = "$buildDir/generated/java"
|
def generatedJavaDir = "$buildDir/generated/java"
|
||||||
def generatedTestJavaDir = "$buildDir/generated-test/java"
|
def generatedTestJavaDir = "$buildDir/generated-test/java"
|
||||||
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
url "${nexusUrl}/repository/maven-public/"
|
|
||||||
allowInsecureProtocol = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain {
|
toolchain {
|
||||||
languageVersion = JavaLanguageVersion.of(8)
|
languageVersion = JavaLanguageVersion.of(8)
|
||||||
@@ -109,8 +102,19 @@ dependencies {
|
|||||||
api "org.springframework:spring-web:${springVersion}"
|
api "org.springframework:spring-web:${springVersion}"
|
||||||
api group: 'commons-io', name: 'commons-io', version: '2.11.0'
|
api group: 'commons-io', name: 'commons-io', version: '2.11.0'
|
||||||
|
|
||||||
testRuntimeOnly 'com.h2database:h2:2.1.214'
|
|
||||||
|
|
||||||
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
|
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
|
||||||
|
testImplementation 'ch.qos.logback:logback-classic:1.2.10'
|
||||||
|
testImplementation 'ch.qos.logback:logback-access:1.2.10'
|
||||||
|
testImplementation 'ch.qos.logback:logback-core:1.2.10'
|
||||||
|
testImplementation 'org.slf4j:jul-to-slf4j:1.7.35'
|
||||||
|
testImplementation 'org.slf4j:jcl-over-slf4j:1.7.35'
|
||||||
|
testImplementation 'org.slf4j:log4j-over-slf4j:1.7.35'
|
||||||
|
testImplementation 'org.slf4j:slf4j-api:1.7.35'
|
||||||
|
testAnnotationProcessor "org.projectlombok:lombok:1.18.28"
|
||||||
|
|
||||||
|
testRuntimeOnly 'com.h2database:h2:2.1.214'
|
||||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
|
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.8.2'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.8.2'
|
||||||
}
|
}
|
||||||
@@ -188,3 +192,31 @@ eclipse {
|
|||||||
tasks.named('eclipse').configure {
|
tasks.named('eclipse').configure {
|
||||||
finalizedBy 'compileJava', 'compileTestJava'
|
finalizedBy 'compileJava', 'compileTestJava'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
idea {
|
||||||
|
module {
|
||||||
|
generatedSourceDirs.add(file(generatedJavaDir))
|
||||||
|
generatedSourceDirs.add(file(generatedTestJavaDir))
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
tasks.test {
|
||||||
|
if (project.hasProperty("safedb")) {
|
||||||
|
println "======================== SafeDB Classpath applied to test task ====================="
|
||||||
|
|
||||||
|
classpath += files("/safedb/JavaAPI/config")
|
||||||
|
classpath += fileTree(dir: "/safedb/JavaAPI/lib", include: ["*.jar"])
|
||||||
|
|
||||||
|
classpath.each { println "classpath : $it" }
|
||||||
|
|
||||||
|
systemProperty "safedb", project.property("safedb")
|
||||||
|
println "systemProperty \"safedb\", ${project.property("safedb")}"
|
||||||
|
println "-------------------------------------------------------------------------------------"
|
||||||
|
|
||||||
|
testLogging {
|
||||||
|
showStandardStreams = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user