Skip to content

Commit c53dcd6

Browse files
authored
Merge pull request #27 from sbesson/logback_1.3
Logback 1.3
2 parents dc8b794 + 16ed428 commit c53dcd6

File tree

2 files changed

+7
-27
lines changed

2 files changed

+7
-27
lines changed

README.md

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ OMERO thumbnail Vert.x asynchronous microservice server endpoint for OMERO.web.
88
Requirements
99
============
1010

11-
* OMERO 5.4.x+
12-
* OMERO.web 5.4.x+
11+
* OMERO 5.6.x+
12+
* OMERO.web 5.6.x+
1313
* Redis backed sessions
1414
* Java 8+
1515

@@ -105,27 +105,7 @@ currently used by OMERO.web to the thumbnail microservice server endpoint::
105105

106106
...
107107

108-
location /webgateway/render_thumbnail/ {
109-
proxy_pass http://thumbnail_backend;
110-
}
111-
112-
location /webclient/render_thumbnail/ {
113-
proxy_pass http://thumbnail_backend;
114-
}
115-
116-
location /webgateway/render_birds_eye_view/ {
117-
proxy_pass http://thumbnail_backend;
118-
}
119-
120-
location /webclient/render_birds_eye_view/ {
121-
proxy_pass http://thumbnail_backend;
122-
}
123-
124-
location /webgateway/get_thumbnails/ {
125-
proxy_pass http://thumbnail_backend;
126-
}
127-
128-
location /webclient/get_thumbnails/ {
108+
location ~ ^/(webgateway|webclient)/(render_thumbnail|render_birds_eye_view|get_thumbnails)/ {
129109
proxy_pass http://thumbnail_backend;
130110
}
131111

@@ -135,7 +115,7 @@ Development Installation
135115

136116
1. Clone the repository::
137117

138-
git clone git@github.com:glencoesoftware/omero-ms-thumbnail.git
118+
git clone https://github.com/glencoesoftware/omero-ms-thumbnail.git
139119

140120
1. Run the Gradle build and utilize the artifacts as required::
141121

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
group = 'com.glencoesoftware.omero'
7-
version = '0.5.7'
7+
version = '0.5.8-SNAPSHOT'
88

99
mainClassName = 'io.vertx.core.Launcher'
1010

@@ -61,13 +61,13 @@ dependencies {
6161
implementation 'io.zipkin.brave:brave-http:4.13.6'
6262
implementation 'io.zipkin.brave:brave-instrumentation-http:5.6.8'
6363
implementation 'io.zipkin.reporter2:zipkin-sender-okhttp3:2.10.0'
64-
implementation 'ch.qos.logback:logback-classic:1.2.11'
64+
implementation 'ch.qos.logback:logback-classic:1.3.14'
6565
implementation 'org.slf4j:log4j-over-slf4j:1.7.32'
6666
implementation 'com.glencoesoftware.omero:omero-ms-core:0.7.0'
6767
implementation 'io.vertx:vertx-web:3.8.1'
6868
implementation 'io.vertx:vertx-config:3.8.1'
6969
implementation 'io.vertx:vertx-config-yaml:3.8.1'
70-
implementation 'org.openmicroscopy:omero-blitz:5.6.2'
70+
implementation 'org.openmicroscopy:omero-blitz:5.7.2'
7171
implementation 'io.prometheus.jmx:collector:0.12.0'
7272
implementation 'io.prometheus:simpleclient_hotspot:0.8.0'
7373
implementation 'com.zeroc:icegrid:3.6.5'

0 commit comments

Comments
 (0)