diff --git a/README.md b/README.md index 0dffc0a..0887366 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ OMERO thumbnail Vert.x asynchronous microservice server endpoint for OMERO.web. Requirements ============ -* OMERO 5.4.x+ -* OMERO.web 5.4.x+ +* OMERO 5.6.x+ +* OMERO.web 5.6.x+ * Redis backed sessions * Java 8+ @@ -105,27 +105,7 @@ currently used by OMERO.web to the thumbnail microservice server endpoint:: ... - location /webgateway/render_thumbnail/ { - proxy_pass http://thumbnail_backend; - } - - location /webclient/render_thumbnail/ { - proxy_pass http://thumbnail_backend; - } - - location /webgateway/render_birds_eye_view/ { - proxy_pass http://thumbnail_backend; - } - - location /webclient/render_birds_eye_view/ { - proxy_pass http://thumbnail_backend; - } - - location /webgateway/get_thumbnails/ { - proxy_pass http://thumbnail_backend; - } - - location /webclient/get_thumbnails/ { + location ~ ^/(webgateway|webclient)/(render_thumbnail|render_birds_eye_view|get_thumbnails)/ { proxy_pass http://thumbnail_backend; } @@ -135,7 +115,7 @@ Development Installation 1. Clone the repository:: - git clone git@github.com:glencoesoftware/omero-ms-thumbnail.git + git clone https://github.com/glencoesoftware/omero-ms-thumbnail.git 1. Run the Gradle build and utilize the artifacts as required:: diff --git a/build.gradle b/build.gradle index 3f86353..0eceb4a 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'com.glencoesoftware.omero' -version = '0.5.7' +version = '0.5.8-SNAPSHOT' mainClassName = 'io.vertx.core.Launcher' @@ -61,13 +61,13 @@ dependencies { implementation 'io.zipkin.brave:brave-http:4.13.6' implementation 'io.zipkin.brave:brave-instrumentation-http:5.6.8' implementation 'io.zipkin.reporter2:zipkin-sender-okhttp3:2.10.0' - implementation 'ch.qos.logback:logback-classic:1.2.11' + implementation 'ch.qos.logback:logback-classic:1.3.14' implementation 'org.slf4j:log4j-over-slf4j:1.7.32' implementation 'com.glencoesoftware.omero:omero-ms-core:0.7.0' 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.6.2' + implementation 'org.openmicroscopy:omero-blitz:5.7.2' implementation 'io.prometheus.jmx:collector:0.12.0' implementation 'io.prometheus:simpleclient_hotspot:0.8.0' implementation 'com.zeroc:icegrid:3.6.5'