Skip to content

Commit 5b24cc5

Browse files
authored
Merge pull request #219 from kbase/sdkdev
Remove indirect dependencies from module code deps
2 parents ca0692b + 588839e commit 5b24cc5

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

build.gradle

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ java -cp \$CLASSPATH us.kbase.sdk.ModuleBuilder \$@
118118
def genCodeLibDir = file("$buildDir/generated-code-libs")
119119

120120
task resolveGeneratedCodeDeps {
121+
inputs.files { configurations.generatedCodeClasspath }
121122
outputs.dir genCodeLibDir
122123
doLast {
124+
delete genCodeLibDir
123125
copy {
124126
from configurations.generatedCodeClasspath
125127
into genCodeLibDir
@@ -359,25 +361,17 @@ dependencies {
359361
// isolate the sdk generated code dependencies from the standard dependencies
360362

361363
generatedCodeClasspath('ch.qos.logback:logback-classic:1.1.2')
362-
generatedCodeClasspath('com.fasterxml.jackson.core:jackson-annotations:2.2.3')
363364
generatedCodeClasspath('com.fasterxml.jackson.core:jackson-databind:2.2.3')
364365
generatedCodeClasspath('com.github.kbase:auth2_client_java:0.5.0') {
365366
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
366367
}
367368
generatedCodeClasspath('com.github.kbase:java_common:0.3.1') {
368369
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
369-
exclude group: 'net.java.dev.jna' // don't include in test path
370370
}
371371
generatedCodeClasspath('javax.annotation:javax.annotation-api:1.3.2')
372-
generatedCodeClasspath('javax.servlet:servlet-api:2.5')
373-
generatedCodeClasspath('joda-time:joda-time:2.2')
374372
generatedCodeClasspath('junit:junit:4.12')
375-
generatedCodeClasspath('net.java.dev.jna:jna:3.4.0')
376-
generatedCodeClasspath('org.eclipse.jetty.aggregate:jetty-all:7.0.0.v20091005')
377-
generatedCodeClasspath('org.hamcrest:hamcrest-core:1.3')
378373
generatedCodeClasspath('org.ini4j:ini4j:0.5.2')
379374
generatedCodeClasspath('org.syslog4j:syslog4j:0.9.46')
380-
generatedCodeClasspath('org.slf4j:slf4j-api:1.7.7')
381375
}
382376

383377
task showTestClassPath {

0 commit comments

Comments
 (0)