Skip to content
Snippets Groups Projects
Commit f50b34fe authored by Adam Laskowski's avatar Adam Laskowski
Browse files

SSDM-13251: Fixed gradle files

parent a332b61f
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
evaluationDependsOn(':lib-json') evaluationDependsOn(':lib-json')
evaluationDependsOn(':lib-transactional-file-system') evaluationDependsOn(':lib-transactional-file-system')
//
//apply from: '../build/javaproject.gradle'
//'lib-transactional-file-system', 'lib-json'
//apply plugin: 'java'
//apply plugin: 'application'
//
//compileJava {
// options.compilerArgs << '-parameters'
//}
//
//compileTestJava {
// options.compilerArgs << '-parameters'
//}
//
//repositories {
// ivy {
// ivyPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/ivy.xml"
// artifactPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
// }
//}
//dependencies {
// compileOnly 'lombok:lombok:1.18.22'
// annotationProcessor 'lombok:lombok:1.18.22'
//
//
// api project(':lib-json')
//
// implementation project(':lib-json'),
// project(':lib-transactional-file-system')
//
//// testCompileOnly 'lombok:lombok:1.18.22'
//// testAnnotationProcessor 'lombok:lombok:1.18.22'
// testImplementation 'testng:testng:6.8-CISD',
//// project(':lib-json')
// project(path: ':lib-json', configuration: 'tests')
//// project(path: ':lib-commonbase', configuration: 'tests'),
//// project(path: ':lib-common', configuration: 'tests'),
//// 'fjelmer:classycle:1.4.2'
// testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
//}
//dependencies {
// annotationProcessor 'lombok:lombok:1.18.22'
// implementation project(':lib-json'),
//// project(':lib-transactional-file-system'),
// 'lombok:lombok:1.18.22'
// testImplementation 'junit:junit:4.10',
// project(':lib-json')
// testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
//// 'org.junit.vintage:junit-vintage-engine:5.8.2'
//}
//
//test {
// useJUnitPlatform()
//}
//tasks.register('AFSServerDevelopmentEnvironmentStart') {
// main = 'ch.ethz.sis.afsclient.startup.Main'
// classpath = sourceSets.main.runtimeClasspath
// jvmArgs(['-Xmx256M'])
//}
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'application' apply plugin: 'application'
...@@ -75,10 +8,9 @@ compileJava { ...@@ -75,10 +8,9 @@ compileJava {
options.compilerArgs << '-parameters' options.compilerArgs << '-parameters'
} }
//compileTestJava { compileTestJava {
// options.compilerArgs << '-parameters' options.compilerArgs << '-parameters'
//} }
repositories { repositories {
ivy { ivy {
...@@ -87,28 +19,12 @@ repositories { ...@@ -87,28 +19,12 @@ repositories {
} }
} }
//dependencies {
// compileOnly 'lombok:lombok:1.18.22'
// annotationProcessor 'lombok:lombok:1.18.22'
// implementation project(':lib-json'),
// project(':lib-transactional-file-system')
// testImplementation 'testng:testng:6.8-CISD',
// project(':lib-json')
// testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
//// 'org.junit.vintage:junit-vintage-engine:5.8.2'
//}
dependencies { dependencies {
compileOnly 'lombok:lombok:1.18.22' compileOnly 'lombok:lombok:1.18.22'
annotationProcessor 'lombok:lombok:1.18.22' annotationProcessor 'lombok:lombok:1.18.22'
implementation project(':lib-transactional-file-system'), implementation project(':lib-transactional-file-system'),
project(':lib-json'), project(':lib-json'),
'lombok:lombok:1.18.22' 'lombok:lombok:1.18.22'
// testImplementation 'testng:testng:6.8-CISD'
testImplementation 'junit:junit:4.10' testImplementation 'junit:junit:4.10'
testRuntimeOnly 'hamcrest:hamcrest-core:1.3' testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
} }
//test {
// useJUnitPlatform()
//}
\ No newline at end of file
//evaluationDependsOn(':lib-commonbase')
//evaluationDependsOn(':lib-common')
apply from: '../build/javaproject.gradle' apply from: '../build/javaproject.gradle'
//apply plugin: 'java'
//apply plugin: 'application'
//
//compileJava {
// options.compilerArgs << '-parameters'
//}
//
//compileTestJava {
// options.compilerArgs << '-parameters'
//}
//
//repositories {
// ivy {
// ivyPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/ivy.xml"
// artifactPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
// }
//}
dependencies { dependencies {
// api project(':lib-common'),
// 'sis:sis-file-transfer:19.03.1',
// 'fasterxml:jackson-core:2.9.10',
// 'fasterxml:jackson-annotations:2.9.10'
implementation 'fasterxml:jackson-annotations:2.9.10', implementation 'fasterxml:jackson-annotations:2.9.10',
'fasterxml:jackson-core:2.9.10', 'fasterxml:jackson-core:2.9.10',
'fasterxml:jackson-databind:2.9.10.8', 'fasterxml:jackson-databind:2.9.10.8',
'fasterxml:jackson-datatype-jsr310:2.9.10' 'fasterxml:jackson-datatype-jsr310:2.9.10'
testImplementation 'testng:testng:6.8-CISD'//, testImplementation 'testng:testng:6.8-CISD'
// project(path: ':lib-commonbase', configuration: 'tests'),
// project(path: ':lib-common', configuration: 'tests'),
// 'fjelmer:classycle:1.4.2',
// 'reflections:reflections:0.9.10'
testRuntimeOnly 'hamcrest:hamcrest-core:1.3' testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
} }
//dependencies {
// implementation 'fasterxml:jackson-annotations:2.9.10',
// 'fasterxml:jackson-core:2.9.10',
// 'fasterxml:jackson-databind:2.9.10.8',
// 'fasterxml:jackson-datatype-jsr310:2.9.10'
// testImplementation 'junit:junit:4.13.2'
// testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
//}
//
//test {
// useJUnitPlatform()
//}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment