Merge remote-tracking branch 'origin/staging' of C:/eactive/workspaces/eapim-git/bundles/250930/elink-portal-common_incremental_2025-09-22.bundle into staging
# Conflicts: # build.gradle # src/main/java/com/eactive/ext/kjb/safedb/SafeDBFaker.java # src/main/java/com/eactive/ext/kjb/safedb/SafeDBWrapper.java # src/main/java/kjb/safedb/KjbNotRnnoJpaAttributeConverter.java # src/test/java/com/eactive/ext/kjb/safedb/test/SafeDbWrapperTest.java
This commit is contained in:
+1
-5
@@ -22,7 +22,6 @@ def hibernateVersion = "5.6.15.Final"
|
||||
def generatedJavaDir = "$buildDir/generated/java"
|
||||
def generatedTestJavaDir = "$buildDir/generated-test/java"
|
||||
|
||||
|
||||
java {
|
||||
toolchain {
|
||||
languageVersion = JavaLanguageVersion.of(8)
|
||||
@@ -73,6 +72,7 @@ tasks.withType(JavaCompile) {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api project(':kjb-safedb')
|
||||
|
||||
api "com.querydsl:querydsl-jpa:${queryDslVersion}"
|
||||
api "com.querydsl:querydsl-apt:${queryDslVersion}"
|
||||
@@ -117,10 +117,6 @@ dependencies {
|
||||
testRuntimeOnly 'com.h2database:h2:2.1.214'
|
||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
|
||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.8.2'
|
||||
|
||||
|
||||
// 광주은행 safedb 용 임시 라이브러리
|
||||
compileOnly(fileTree(dir: "ext-libs/safedb", include: ["*.jar"]))
|
||||
}
|
||||
|
||||
test {
|
||||
|
||||
Reference in New Issue
Block a user