Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 7 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -300,29 +300,24 @@ dependencies {
annotationProcessor('info.picocli:picocli-codegen:4.7.7')
compileOnly('javax.servlet:servlet-api:2.5')

implementation('com.github.kbase:auth2_client_java:0.5.0') {
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
}
implementation('com.github.kbase:auth2_client_java:0.5.0')
implementation('com.github.kbase:catalog:2.3.1') {
exclude group: 'com.github.kbase', module: 'java_common'
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
}
implementation('com.github.kbase:java_common:0.3.1') {
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
exclude group: 'net.java.dev.jna' // don't include in runtime path
exclude group: 'org.eclipse.jetty.aggregate' // don't include in runtime path
exclude group: 'org.syslog4j', module: 'syslog4j'
}
implementation('com.github.kbase:java_kidl:0.2.0')
implementation('com.github.kbase:narrative_method_store:v0.3.13') {
exclude group: 'com.github.kbase', module: 'java_common'
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
// TODO DEPS fix these in NMS
exclude group: 'org.mongodb'
exclude group: 'org.eclipse.jetty.aggregate' // don't include in runtime path
}
implementation('com.fasterxml.jackson.core:jackson-annotations:2.2.3')
implementation('com.fasterxml.jackson.core:jackson-databind:2.2.3')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.9.9')
implementation('com.fasterxml.jackson.core:jackson-databind:2.9.9')
Comment on lines +319 to +320
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything seems to build and test fine, so I'm guessing the // don't upgrade yet, breaks tests comments aren't relevant. Can you go to a later 2.x version? 2.20 was the last one, I think.

Not that it matters much, I'm mostly just curious.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing the // don't upgrade yet, breaks tests comments aren't relevant.

I think the last PR that got rid of the hardcoded jar names in the tests fixed that

Can you go to a later 2.x version? 2.20 was the last one, I think.

I'd want to update java_common / auth / etc. first.

Jackson is on 3.1.0 now, which sounds like upgrades might be difficult

implementation('com.google.guava:guava:18.0')
implementation('com.googlecode.jsonschema2pojo:jsonschema2pojo-core:0.3.6')
implementation('com.j2html:j2html:0.7') {
Expand All @@ -343,14 +338,10 @@ dependencies {

testImplementation('ch.qos.logback:logback-classic:1.1.2')
testImplementation ('com.github.kbase:java_test_utilities:0.1.0') {
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
exclude group: 'junit', module: 'junit'
}
testImplementation('com.github.kbase.workspace_deluxe:workspace-client:0.15.0') {
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
exclude group: 'net.java.dev.jna' // don't include in runtime path
}
// needed for syslog4j. Used in java test modules and JsonServerServlet subclasses in tests
testImplementation('com.github.kbase.workspace_deluxe:workspace-client:0.15.0')
// needed for syslog4j. Used in JsonServerServlet subclasses in tests
// but not in SDK code proper.
testImplementation('net.java.dev.jna:jna:3.4.0')
testImplementation("nl.jqno.equalsverifier:equalsverifier:4.0.7")
Expand All @@ -368,17 +359,9 @@ dependencies {

// isolate the sdk generated code dependencies from the standard dependencies

generatedCodeClasspath('ch.qos.logback:logback-classic:1.1.2')
generatedCodeClasspath('com.fasterxml.jackson.core:jackson-databind:2.2.3')
generatedCodeClasspath('com.github.kbase:auth2_client_java:0.5.0') {
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
}
generatedCodeClasspath('com.github.kbase:java_common:0.3.1') {
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
}
generatedCodeClasspath('com.github.kbase:auth2_client_java:0.5.0')
generatedCodeClasspath('com.github.kbase:java_common:0.3.1')
generatedCodeClasspath('javax.annotation:javax.annotation-api:1.3.2')
generatedCodeClasspath('org.ini4j:ini4j:0.5.2')
generatedCodeClasspath('org.syslog4j:syslog4j:0.9.46')

generatedTestCodeClasspath('junit:junit:4.12')
}
Expand Down
Loading