diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-06-23 12:16:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-23 12:16:51 +0200 |
| commit | 6b93cc37493b5309507aa5a3d1af51399b12e8df (patch) | |
| tree | 83bdc7071dc4cfd5f1825f369e23fcdf192287fe /opendc-trace | |
| parent | 8eab5895dcf21b4a3f585c62db14c9a049c81d98 (diff) | |
| parent | 5000b72355d7b02acd525375ac4861445d10d89f (diff) | |
merge: Update build and runtime dependencies (#90)
This pull request updates the build and runtime dependencies used by OpenDC to
their latest version compatible with the project.
## Implementation Notes :hammer_and_pick:
* Update simulator dependency versions
* Fix conversion from UUID to Binary
Diffstat (limited to 'opendc-trace')
4 files changed, 7 insertions, 6 deletions
diff --git a/opendc-trace/opendc-trace-opendc/build.gradle.kts b/opendc-trace/opendc-trace-opendc/build.gradle.kts index 236bdedc..18967136 100644 --- a/opendc-trace/opendc-trace-opendc/build.gradle.kts +++ b/opendc-trace/opendc-trace-opendc/build.gradle.kts @@ -32,6 +32,7 @@ dependencies { api(projects.opendcTrace.opendcTraceApi) implementation(projects.opendcTrace.opendcTraceParquet) + implementation(libs.jackson.core) testImplementation(projects.opendcTrace.opendcTraceTestkit) testRuntimeOnly(libs.slf4j.simple) diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt index 1841c486..d4858f23 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt @@ -22,14 +22,14 @@ package org.opendc.trace.opendc +import com.fasterxml.jackson.core.JsonParseException +import com.fasterxml.jackson.core.JsonParser +import com.fasterxml.jackson.core.JsonToken import org.opendc.trace.* import org.opendc.trace.conv.INTERFERENCE_GROUP_MEMBERS import org.opendc.trace.conv.INTERFERENCE_GROUP_SCORE import org.opendc.trace.conv.INTERFERENCE_GROUP_TARGET import org.opendc.trace.util.convertTo -import shaded.parquet.com.fasterxml.jackson.core.JsonParseException -import shaded.parquet.com.fasterxml.jackson.core.JsonParser -import shaded.parquet.com.fasterxml.jackson.core.JsonToken import java.time.Duration import java.time.Instant import java.util.* diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableWriter.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableWriter.kt index d726e890..d5e8a0b6 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableWriter.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableWriter.kt @@ -22,11 +22,11 @@ package org.opendc.trace.opendc +import com.fasterxml.jackson.core.JsonGenerator import org.opendc.trace.* import org.opendc.trace.conv.INTERFERENCE_GROUP_MEMBERS import org.opendc.trace.conv.INTERFERENCE_GROUP_SCORE import org.opendc.trace.conv.INTERFERENCE_GROUP_TARGET -import shaded.parquet.com.fasterxml.jackson.core.JsonGenerator import java.time.Duration import java.time.Instant import java.util.* diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt index a9c5b934..2c5f892b 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt @@ -22,6 +22,8 @@ package org.opendc.trace.opendc +import com.fasterxml.jackson.core.JsonEncoding +import com.fasterxml.jackson.core.JsonFactory import org.apache.parquet.column.ParquetProperties import org.apache.parquet.hadoop.ParquetFileWriter import org.apache.parquet.hadoop.metadata.CompressionCodecName @@ -35,8 +37,6 @@ import org.opendc.trace.spi.TableDetails import org.opendc.trace.spi.TraceFormat import org.opendc.trace.util.parquet.LocalParquetReader import org.opendc.trace.util.parquet.LocalParquetWriter -import shaded.parquet.com.fasterxml.jackson.core.JsonEncoding -import shaded.parquet.com.fasterxml.jackson.core.JsonFactory import java.nio.file.Files import java.nio.file.Path import kotlin.io.path.exists |