From 6e6dcf2905ae11d3c37ad38b2a4678e6c7213c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Thu, 8 Feb 2024 17:09:34 +0000 Subject: [PATCH 1/4] Update omero-ms-core requirements --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b1caa59..1505488 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ components. Requirements ============ -* OMERO 5.4.x+ -* OMERO.web 5.4.x+ +* OMERO 5.6.x+ +* OMERO.web 5.6.x+ * Redis backed sessions * Java 8+ @@ -19,7 +19,7 @@ Development Installation 1. Clone the repository:: - git clone git@github.com:glencoesoftware/omero-ms-core.git + git clone https://github.com/glencoesoftware/omero-ms-core.git 1. Run the Gradle build and utilize the artifacts as required:: From 416785507d64db49242c09e2daeabb96d1accf29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 9 Feb 2024 08:22:01 +0000 Subject: [PATCH 2/4] Bump omero-blitz to 5.7.2 Remove slf4j-api which is a transitive dependency --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b6f359d..569d62d 100644 --- a/build.gradle +++ b/build.gradle @@ -61,13 +61,12 @@ dependencies { implementation 'io.zipkin.brave:brave-http:4.13.6' implementation 'io.zipkin.brave:brave-instrumentation-http:5.6.8' implementation 'io.lettuce:lettuce-core:5.2.0.RELEASE' - implementation 'org.openmicroscopy:omero-blitz:5.5.12' + implementation 'org.openmicroscopy:omero-blitz:5.7.2' implementation 'io.vertx:vertx-web:3.8.1' implementation 'io.vertx:vertx-jdbc-client:3.8.1' implementation 'io.kaitai:kaitai-struct-runtime:0.8' implementation 'commons-lang:commons-lang:2.6' implementation 'com.zeroc:icegrid:3.6.5' - implementation 'org.slf4j:slf4j-api:1.7.32' testImplementation 'org.testng:testng:6.10' } From ec5005cd216d8eacb22e7888065b953754a8905c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 9 Feb 2024 08:53:59 +0000 Subject: [PATCH 3/4] Re-include slf4j-api 2.x This transitive dependency is excluded via configuration and needs to be explicitly declared --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 569d62d..f34a227 100644 --- a/build.gradle +++ b/build.gradle @@ -67,6 +67,7 @@ dependencies { implementation 'io.kaitai:kaitai-struct-runtime:0.8' implementation 'commons-lang:commons-lang:2.6' implementation 'com.zeroc:icegrid:3.6.5' + implementation 'org.slf4j:slf4j-api:2.0.7' testImplementation 'org.testng:testng:6.10' } From 8f523c35efae3c2671b07e8dff2396b19bd11359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Thu, 9 May 2024 14:01:27 +0100 Subject: [PATCH 4/4] Bump omero-blitz to 5.7.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 97a63e5..84ba92c 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ dependencies { implementation 'io.zipkin.brave:brave-http:4.13.6' implementation 'io.zipkin.brave:brave-instrumentation-http:5.6.8' implementation 'io.lettuce:lettuce-core:5.2.0.RELEASE' - implementation 'org.openmicroscopy:omero-blitz:5.7.2' + implementation 'org.openmicroscopy:omero-blitz:5.7.3' implementation 'io.vertx:vertx-web:3.8.1' implementation 'io.vertx:vertx-jdbc-client:3.8.1' implementation 'io.kaitai:kaitai-struct-runtime:0.8'