Skip to content

Commit

Permalink
Merge pull request #27 from sbesson/logback_1.3
Browse files Browse the repository at this point in the history
Logback 1.3
  • Loading branch information
chris-allan authored Feb 8, 2024
2 parents dc8b794 + 16ed428 commit c53dcd6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 27 deletions.
28 changes: 4 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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+

Expand Down Expand Up @@ -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;
}

Expand All @@ -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::

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

group = 'com.glencoesoftware.omero'
version = '0.5.7'
version = '0.5.8-SNAPSHOT'

mainClassName = 'io.vertx.core.Launcher'

Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit c53dcd6

Please sign in to comment.