Merge branch 'master' into gh-4131-effective-time-format

CHANGELOG.md

@@ -13,6 +13,32 @@ DO NOT ADD CHANGES HERE - ADD THEM USING log_change.sh
 ~~~
 
 
+## [v7.3-beta.11] - 2024-03-01
+
+* Issue **#4132** : Add tooltips to the copy/open hover buttons on table cell values.
+
+* Issue **#4018** : Change the way delimited meta values are held internally. They are now comma delimited internally and when written to file.
+
+* Change `<xsl:message>` to output `NO MESSAGE` if the element contains no text value.
+
+* Add the key bind `ctrl-enter` to do a step refresh on the code pane of the stepper.
+
+* Issue **#4140** : Fix selection box popup close issue.
+
+* Issue **#4143** : Fix horizontal scroll.
+
+* Issue **#4144** : Increase size of part no box.
+
+* Issue **#4141** : Show selected item after expand all.
+
+
+## [v7.3-beta.10] - 2024-02-28
+
+* Issue **#4115** : Fix error when opening Recent Items screen if a recent item is in the favourites list.
+
+* Issue **#4133** : Rollback `lmdbjava` to 0.8.2 to fix FFI issue on centos7.
+
+
 ## [v7.3-beta.9] - 2024-02-25
 
 * Issue **#4107** : Add property `warnOnRemoval` to `InvalidCharFilterReader` and `warnOnReplacement` to `InvalidXMLCharFilterReaderElement` allow control of logged warnings for removal/replacement respectively.
@@ -337,7 +363,9 @@ eval EventId = first(EventId)`, `evt` => `eval EventId = first(EventId)` and `st
 * Issue **#3830** : Add S3 data storage option.
 
 
-[Unreleased]: https://github.com/gchq/stroom/compare/v7.3-beta.9...HEAD
+[Unreleased]: https://github.com/gchq/stroom/compare/v7.3-beta.11...HEAD
+[v7.3-beta.11]: https://github.com/gchq/stroom/compare/v7.3-beta.10...v7.3-beta.11
+[v7.3-beta.10]: https://github.com/gchq/stroom/compare/v7.3-beta.9...v7.3-beta.10
 [v7.3-beta.9]: https://github.com/gchq/stroom/compare/v7.3-beta.8...v7.3-beta.9
 [v7.3-beta.8]: https://github.com/gchq/stroom/compare/v7.3-beta.7...v7.3-beta.8
 [v7.3-beta.7]: https://github.com/gchq/stroom/compare/v7.3-beta.6...v7.3-beta.7

build.gradle

@@ -262,7 +262,11 @@ ext.libs = [
         junit_platform_launcher             : "org.junit.platform:junit-platform-launcher", // version controlled by junit-bom
         kafka_clients                       : "org.apache.kafka:kafka-clients:$versions.kafka", // version controlled by junit-bom
         kryo                                : "com.esotericsoftware:kryo:5.5.0",
-        lmdbjava                            : "org.lmdbjava:lmdbjava:0.8.3",
+        // lmdbjava 0.8.3 causes FFI errors on centos7 due to glibc version
+        // See https://github.com/gchq/stroom/issues/3485 & https://github.com/gchq/stroom/issues/4133
+        // Potentially caused by https://github.com/jnr/jffi/issues/138 and fixable with a jnr-ffi uplift in lmdbjava
+        // lmdbjava 0.9.0 has a cursor bug though, https://github.com/lmdbjava/lmdbjava/issues/228
+        lmdbjava                            : "org.lmdbjava:lmdbjava:0.8.2",
         log4j_over_slf4j                    : "org.slf4j:log4j-over-slf4j", // version controlled by dropwizard-dependencies
         logback_classic                     : "ch.qos.logback:logback-classic", // version controlled by dropwizard-dependencies
         logback_core                        : "ch.qos.logback:logback-core", // version controlled by dropwizard-dependencies

stroom-app-gwt/build.gradle

@@ -193,14 +193,36 @@ tasks.register('makeGwtSourceDirs') {
     group "gwt"
 
     doLast {
+        def rsyncInput = layout.buildDirectory.dir("rsync-input").get()
+        def rsyncOutput = layout.buildDirectory.dir("rsync-output").get()
+
+        println "copy ${gwtSourceDirs.size()} gwtSourceDirs"
+        delete rsyncInput
+        copy {
+            from layout.buildDirectory.dir("all-source").get()
+            into rsyncInput;
+        }
+        copy {
+            from layout.buildDirectory.dir("transformed-build").get()
+            into rsyncInput;
+        }
+
+        println "rsync ${gwtSourceDirs.size()} gwtSourceDirs"
+        exec {
+            executable = 'rsync'
+            args = ["--recursive", "--checksum", "--delete", rsyncInput.toString() + "/", rsyncOutput]
+        }
+
+
         gwtSourceDirs = []
 
         // Add all of the library sources from the gwtSource source set defined above.
         gwtSourceDirs.addAll(sourceSets.gwtDevSource.compileClasspath)
         gwtSourceDirs.addAll(project(':stroom-gwt').sourceSets.main.output.classesDirs)
 
-        gwtSourceDirs.add(layout.buildDirectory.dir("all-source").get())
-        gwtSourceDirs.add(layout.buildDirectory.dir("transformed-build").get())
+//        gwtSourceDirs.add(layout.buildDirectory.dir("all-source").get())
+//        gwtSourceDirs.add(layout.buildDirectory.dir("transformed-build").get())
+        gwtSourceDirs.add(rsyncOutput)
 
         println "Dumping ${gwtSourceDirs.size()} gwtSourceDirs"
         gwtSourceDirs.each {

stroom-app/src/test/java/stroom/db/migration/TestListDbMigrations.java

@@ -70,7 +70,7 @@ void listDbMigrationsForLatestVersion() throws Exception {
             System.out.println("--------------------------------------------------------------------------------");
             final Comparator<String> moduleComparator = buildModuleNameComparator();
             final StringBuilder sb = new StringBuilder();
-            sb.append("""
+            sb.append(LogUtil.message("""
                     ### Migration Scripts
 
                     <!-- This section is auto-generated by TestListDbMigrations.listDbMigrationsForLatestVersion -->
@@ -79,7 +79,7 @@ void listDbMigrationsForLatestVersion() throws Exception {
                     when upgrading to {} from the previous minor version.
 
                     Note, the `legacy` module will run first (if present) then the other module will run in no \
-                    particular order.""");
+                    particular order.""", latestVersion));
 
             moduleToSingleVerScriptsMap.entrySet()
                     .stream()