Merge pull request #28 from sbesson/vertx_4

Upgrade to Vert.x 4

Author: sbesson

build.gradle

@@ -55,15 +55,15 @@ dependencies {
     implementation 'io.zipkin.reporter2:zipkin-sender-okhttp3:2.10.0'
     implementation 'ch.qos.logback:logback-classic:1.3.15'
     implementation 'org.slf4j:log4j-over-slf4j:1.7.32'
-    implementation 'com.glencoesoftware.omero:omero-zarr-pixel-buffer:0.4.1'
-    implementation 'com.glencoesoftware.omero:omero-ms-core:0.9.1'
-    implementation 'io.vertx:vertx-web:3.8.1'
-    implementation 'io.vertx:vertx-config:3.8.1'
-    implementation 'io.vertx:vertx-config-yaml:3.8.1'
-    implementation 'org.openmicroscopy:omero-blitz:5.8.0'
+    implementation 'com.glencoesoftware.omero:omero-zarr-pixel-buffer:0.5.0'
+    implementation 'com.glencoesoftware.omero:omero-ms-core:0.11.0-rc1'
+    implementation 'io.vertx:vertx-web:4.5.16'
+    implementation 'io.vertx:vertx-config:4.5.16'
+    implementation 'io.vertx:vertx-config-yaml:4.5.16'
+    implementation 'org.openmicroscopy:omero-blitz:5.8.3'
     implementation 'io.prometheus.jmx:collector:0.12.0'
     implementation 'io.prometheus:simpleclient_hotspot:0.8.0'
-    implementation 'com.zeroc:icegrid:3.6.4'
+    implementation 'com.zeroc:icegrid:3.6.5'
     testImplementation 'org.testng:testng:6.10'
     testImplementation 'org.mockito:mockito-core:2.+'
 }

src/main/java/com/glencoesoftware/omero/ms/pixelbuffer/PixelBufferMicroserviceVerticle.java

@@ -48,6 +48,7 @@
 import io.vertx.core.DeploymentOptions;
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
+import io.vertx.core.ThreadingModel;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.eventbus.ReplyException;
 import io.vertx.core.http.HttpServer;
@@ -101,10 +102,6 @@ public class PixelBufferMicroserviceVerticle extends OmeroMsAbstractVerticle {
 
     private Tracing tracing;
 
-    static {
-        com.glencoesoftware.omero.ms.core.SSLUtils.fixDisabledAlgorithms();
-    }
-
     /**
      * Entry point method which starts the server event loop and initializes
      * our current OMERO.web session store.
@@ -228,7 +225,7 @@ public void deploy(JsonObject config, Promise<Void> prom) {
                 ).orElse(DEFAULT_WORKER_POOL_SIZE);
         vertx.deployVerticle("omero:omero-ms-pixel-buffer-verticle",
                 new DeploymentOptions()
-                        .setWorker(true)
+                        .setThreadingModel(ThreadingModel.WORKER)
                         .setInstances(workerPoolSize)
                         .setWorkerPoolName("pixel-buffer-pool")
                         .setWorkerPoolSize(workerPoolSize)