merge: Update build and runtime dependencies (#107)

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
* Remove unused distribution conventions
* Update next version to 3.0
* Eliminate use of wildcard imports
* Switch to Spotless for formatting

5 files changed, 51 insertions, 28 deletions

diff --git a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/ComputeServiceTest.kt b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/ComputeServiceTest.kt
index 4f4008bc..73e9b3d7 100644
--- a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/ComputeServiceTest.kt
+++ b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/ComputeServiceTest.kt
@@ -22,14 +22,23 @@
 
 package org.opendc.compute.service
 
-import io.mockk.*
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
 import kotlinx.coroutines.delay
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.opendc.compute.api.*
+import org.opendc.compute.api.Flavor
+import org.opendc.compute.api.Image
+import org.opendc.compute.api.Server
+import org.opendc.compute.api.ServerState
+import org.opendc.compute.api.ServerWatcher
 import org.opendc.compute.service.driver.Host
 import org.opendc.compute.service.driver.HostListener
 import org.opendc.compute.service.driver.HostModel
@@ -41,7 +50,7 @@ import org.opendc.compute.service.scheduler.filters.VCpuFilter
 import org.opendc.compute.service.scheduler.weights.RamWeigher
 import org.opendc.simulator.kotlin.SimulationCoroutineScope
 import org.opendc.simulator.kotlin.runSimulation
-import java.util.*
+import java.util.UUID
 
 /**
  * Test suite for the [ComputeService] interface.
diff --git a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalFlavorTest.kt b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalFlavorTest.kt
index 18d698c6..fe92f7f2 100644
--- a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalFlavorTest.kt
+++ b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalFlavorTest.kt
@@ -22,14 +22,15 @@
 
 package org.opendc.compute.service
 
-import io.mockk.*
+import io.mockk.every
+import io.mockk.mockk
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotEquals
 import org.junit.jupiter.api.Test
 import org.opendc.compute.api.Flavor
 import org.opendc.compute.service.internal.ComputeServiceImpl
 import org.opendc.compute.service.internal.InternalFlavor
-import java.util.*
+import java.util.UUID
 
 /**
  * Test suite for the [InternalFlavor] implementation.
diff --git a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalImageTest.kt b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalImageTest.kt
index e1cb0128..d60aa628 100644
--- a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalImageTest.kt
+++ b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalImageTest.kt
@@ -22,7 +22,8 @@
 
 package org.opendc.compute.service
 
-import io.mockk.*
+import io.mockk.every
+import io.mockk.mockk
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotEquals
 import org.junit.jupiter.api.Test
@@ -30,7 +31,7 @@ import org.opendc.compute.api.Image
 import org.opendc.compute.service.internal.ComputeServiceImpl
 import org.opendc.compute.service.internal.InternalFlavor
 import org.opendc.compute.service.internal.InternalImage
-import java.util.*
+import java.util.UUID
 
 /**
  * Test suite for the [InternalFlavor] implementation.
diff --git a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalServerTest.kt b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalServerTest.kt
index 9e59949f..05a8160e 100644
--- a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalServerTest.kt
+++ b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/InternalServerTest.kt
@@ -22,9 +22,14 @@
 
 package org.opendc.compute.service
 
-import io.mockk.*
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
 import kotlinx.coroutines.yield
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotEquals
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.opendc.compute.api.Server
@@ -35,7 +40,7 @@ import org.opendc.compute.service.internal.InternalFlavor
 import org.opendc.compute.service.internal.InternalImage
 import org.opendc.compute.service.internal.InternalServer
 import org.opendc.simulator.kotlin.runSimulation
-import java.util.*
+import java.util.UUID
 
 /**
  * Test suite for the [InternalServer] implementation.
diff --git a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/scheduler/FilterSchedulerTest.kt b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/scheduler/FilterSchedulerTest.kt
index 350ac944..4608bf37 100644
--- a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/scheduler/FilterSchedulerTest.kt
+++ b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/scheduler/FilterSchedulerTest.kt
@@ -33,12 +33,19 @@ import org.opendc.compute.api.Server
 import org.opendc.compute.service.driver.HostModel
 import org.opendc.compute.service.driver.HostState
 import org.opendc.compute.service.internal.HostView
-import org.opendc.compute.service.scheduler.filters.*
+import org.opendc.compute.service.scheduler.filters.ComputeFilter
+import org.opendc.compute.service.scheduler.filters.DifferentHostFilter
+import org.opendc.compute.service.scheduler.filters.InstanceCountFilter
+import org.opendc.compute.service.scheduler.filters.RamFilter
+import org.opendc.compute.service.scheduler.filters.SameHostFilter
+import org.opendc.compute.service.scheduler.filters.VCpuCapacityFilter
+import org.opendc.compute.service.scheduler.filters.VCpuFilter
 import org.opendc.compute.service.scheduler.weights.CoreRamWeigher
 import org.opendc.compute.service.scheduler.weights.InstanceCountWeigher
 import org.opendc.compute.service.scheduler.weights.RamWeigher
 import org.opendc.compute.service.scheduler.weights.VCpuWeigher
-import java.util.*
+import java.util.Random
+import java.util.UUID
 
 /**
  * Test suite for the [FilterScheduler].
@@ -67,7 +74,7 @@ internal class FilterSchedulerTest {
     fun testNoHosts() {
         val scheduler = FilterScheduler(
             filters = emptyList(),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val server = mockk<Server>()
@@ -81,7 +88,7 @@ internal class FilterSchedulerTest {
     fun testNoFiltersAndSchedulers() {
         val scheduler = FilterScheduler(
             filters = emptyList(),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val hostA = mockk<HostView>()
@@ -137,7 +144,7 @@ internal class FilterSchedulerTest {
     fun testHostIsDown() {
         val scheduler = FilterScheduler(
             filters = listOf(ComputeFilter()),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val host = mockk<HostView>()
@@ -156,7 +163,7 @@ internal class FilterSchedulerTest {
     fun testHostIsUp() {
         val scheduler = FilterScheduler(
             filters = listOf(ComputeFilter()),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val host = mockk<HostView>()
@@ -175,7 +182,7 @@ internal class FilterSchedulerTest {
     fun testRamFilter() {
         val scheduler = FilterScheduler(
             filters = listOf(RamFilter(1.0)),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val hostA = mockk<HostView>()
@@ -202,7 +209,7 @@ internal class FilterSchedulerTest {
     fun testRamFilterOvercommit() {
         val scheduler = FilterScheduler(
             filters = listOf(RamFilter(1.5)),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val host = mockk<HostView>()
@@ -223,7 +230,7 @@ internal class FilterSchedulerTest {
     fun testVCpuFilter() {
         val scheduler = FilterScheduler(
             filters = listOf(VCpuFilter(1.0)),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val hostA = mockk<HostView>()
@@ -250,7 +257,7 @@ internal class FilterSchedulerTest {
     fun testVCpuFilterOvercommit() {
         val scheduler = FilterScheduler(
             filters = listOf(VCpuFilter(16.0)),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val host = mockk<HostView>()
@@ -271,7 +278,7 @@ internal class FilterSchedulerTest {
     fun testVCpuCapacityFilter() {
         val scheduler = FilterScheduler(
             filters = listOf(VCpuCapacityFilter()),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val hostA = mockk<HostView>()
@@ -299,7 +306,7 @@ internal class FilterSchedulerTest {
     fun testInstanceCountFilter() {
         val scheduler = FilterScheduler(
             filters = listOf(InstanceCountFilter(limit = 2)),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val hostA = mockk<HostView>()
@@ -326,7 +333,7 @@ internal class FilterSchedulerTest {
     fun testAffinityFilter() {
         val scheduler = FilterScheduler(
             filters = listOf(SameHostFilter()),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val serverA = mockk<Server>()
@@ -365,7 +372,7 @@ internal class FilterSchedulerTest {
     fun testAntiAffinityFilter() {
         val scheduler = FilterScheduler(
             filters = listOf(DifferentHostFilter()),
-            weighers = emptyList(),
+            weighers = emptyList()
         )
 
         val serverA = mockk<Server>()
@@ -404,7 +411,7 @@ internal class FilterSchedulerTest {
     fun testRamWeigher() {
         val scheduler = FilterScheduler(
             filters = emptyList(),
-            weighers = listOf(RamWeigher(1.5)),
+            weighers = listOf(RamWeigher(1.5))
         )
 
         val hostA = mockk<HostView>()
@@ -431,7 +438,7 @@ internal class FilterSchedulerTest {
     fun testCoreRamWeigher() {
         val scheduler = FilterScheduler(
             filters = emptyList(),
-            weighers = listOf(CoreRamWeigher(1.5)),
+            weighers = listOf(CoreRamWeigher(1.5))
         )
 
         val hostA = mockk<HostView>()
@@ -458,7 +465,7 @@ internal class FilterSchedulerTest {
     fun testVCpuWeigher() {
         val scheduler = FilterScheduler(
             filters = emptyList(),
-            weighers = listOf(VCpuWeigher(16.0)),
+            weighers = listOf(VCpuWeigher(16.0))
         )
 
         val hostA = mockk<HostView>()
@@ -485,7 +492,7 @@ internal class FilterSchedulerTest {
     fun testInstanceCountWeigher() {
         val scheduler = FilterScheduler(
             filters = emptyList(),
-            weighers = listOf(InstanceCountWeigher(multiplier = -1.0)),
+            weighers = listOf(InstanceCountWeigher(multiplier = -1.0))
         )
 
         val hostA = mockk<HostView>()