diff --git a/client/ant-build.xml b/client/ant-build.xml index d3df03cd45..70fcde4ecf 100644 --- a/client/ant-build.xml +++ b/client/ant-build.xml @@ -1,4 +1,5 @@ + Mirth Client Build Help ----------------------- @@ -338,11 +339,23 @@ - - - - - + + + + + + + + + + + + + + + @@ -353,6 +366,13 @@ + + + + + + + diff --git a/client/lib/commons-vfs2-2.10.0.jar b/client/lib/commons-vfs2-2.10.0.jar new file mode 100644 index 0000000000..cf5182ed13 Binary files /dev/null and b/client/lib/commons-vfs2-2.10.0.jar differ diff --git a/client/lib/commons-vfs2-2.9.0.jar b/client/lib/commons-vfs2-2.9.0.jar deleted file mode 100644 index 5e047d54b1..0000000000 Binary files a/client/lib/commons-vfs2-2.9.0.jar and /dev/null differ diff --git a/client/lib/guava-28.2-jre.jar b/client/lib/guava-28.2-jre.jar deleted file mode 100644 index 822b37bd4c..0000000000 Binary files a/client/lib/guava-28.2-jre.jar and /dev/null differ diff --git a/client/lib/guava-32.0.1-jre.jar b/client/lib/guava-32.0.1-jre.jar new file mode 100644 index 0000000000..5f3a1eee94 Binary files /dev/null and b/client/lib/guava-32.0.1-jre.jar differ diff --git a/server/lib/jetty/jetty-util-9.4.53.v20231009.jar b/client/lib/jetty-util-9.4.57.v20241219.jar similarity index 74% rename from server/lib/jetty/jetty-util-9.4.53.v20231009.jar rename to client/lib/jetty-util-9.4.57.v20241219.jar index 1cebfa06a4..caeda5de3e 100644 Binary files a/server/lib/jetty/jetty-util-9.4.53.v20231009.jar and b/client/lib/jetty-util-9.4.57.v20241219.jar differ diff --git a/client/src/com/mirth/connect/client/ui/BareBonesBrowserLaunch.java b/client/src/com/mirth/connect/client/ui/BareBonesBrowserLaunch.java index 422a7164fd..7247b09495 100644 --- a/client/src/com/mirth/connect/client/ui/BareBonesBrowserLaunch.java +++ b/client/src/com/mirth/connect/client/ui/BareBonesBrowserLaunch.java @@ -10,7 +10,9 @@ // /////////////////////////////////////////////////////// package com.mirth.connect.client.ui; -import java.lang.reflect.Method; +import java.awt.Desktop; +import java.net.URI; + public class BareBonesBrowserLaunch { @@ -18,9 +20,11 @@ public static void openURL(String url) { String osName = System.getProperty("os.name"); try { if (osName.startsWith("Mac OS")) { - Class fileMgr = Class.forName("com.apple.eio.FileManager"); - Method openURL = fileMgr.getDeclaredMethod("openURL", new Class[] { String.class }); - openURL.invoke(null, new Object[] { url }); + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + Desktop.getDesktop().browse(new URI(url)); + } else { + System.err.println("Desktop browsing not supported on this platform."); + } } else if (osName.startsWith("Windows")) { Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url); } else { diff --git a/client/src/com/mirth/connect/client/ui/UIConstants.java b/client/src/com/mirth/connect/client/ui/UIConstants.java index cc234f3727..03064e5df6 100644 --- a/client/src/com/mirth/connect/client/ui/UIConstants.java +++ b/client/src/com/mirth/connect/client/ui/UIConstants.java @@ -83,11 +83,11 @@ public class UIConstants { public static final Font MONOSPACED_FONT = new Font(MONOSPACED_FONT_NAME, Font.PLAIN, 12); // issue link - public static final String ISSUE_TRACKER_LOCATION = "https://www.innovarhealthcare.com"; + public static final String ISSUE_TRACKER_LOCATION = "https://github.com/Innovar-Healthcare/BridgeLink/issues"; // help link - public static String HELP_URL_LOCATION = "https://www.innovarhealthcare.com"; + public static String HELP_URL_LOCATION = "https://github.com/Innovar-Healthcare/BridgeLink/discussions"; // help link - public static String HELP_DEFAULT_LOCATION = "https://www.innovarhealthcare.com"; + public static String HELP_DEFAULT_LOCATION = "https://github.com/Innovar-Healthcare/BridgeLink/discussions"; // user api public static String USER_API_LOCATION = "/javadocs/user-api/"; // user api diff --git a/client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java b/client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java index 575815ab50..29be3be082 100644 --- a/client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java +++ b/client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java @@ -41,7 +41,7 @@ public class DefaultAlertEditPanel extends AlertEditPanel { private AlertModel alertModel; public DefaultAlertEditPanel() { - this.parent = PlatformUI.MIRTH_FRAME; + this.parent = (Frame) PlatformUI.MIRTH_FRAME; initComponents(); } @@ -105,6 +105,8 @@ public void updateVariableList() { variables.add("alertId"); variables.add("alertName"); variables.add("serverId"); + variables.add("serverName"); + variables.add("environmentName"); variables.add("globalMapVariable"); variables.add("date"); diff --git a/command/build.xml b/command/build.xml index 77d1c91a09..328dc623a4 100644 --- a/command/build.xml +++ b/command/build.xml @@ -1,4 +1,6 @@ + + @@ -71,11 +73,23 @@ - - - - - + + + + + + + + + + + + + + + @@ -86,6 +100,13 @@ + + + + + + + diff --git a/command/lib/commons-vfs2-2.10.0.jar b/command/lib/commons-vfs2-2.10.0.jar new file mode 100644 index 0000000000..cf5182ed13 Binary files /dev/null and b/command/lib/commons-vfs2-2.10.0.jar differ diff --git a/command/lib/commons-vfs2-2.9.0.jar b/command/lib/commons-vfs2-2.9.0.jar deleted file mode 100644 index 5e047d54b1..0000000000 Binary files a/command/lib/commons-vfs2-2.9.0.jar and /dev/null differ diff --git a/command/lib/guava-28.2-jre.jar b/command/lib/guava-28.2-jre.jar deleted file mode 100644 index 822b37bd4c..0000000000 Binary files a/command/lib/guava-28.2-jre.jar and /dev/null differ diff --git a/command/lib/guava-32.0.1-jre.jar b/command/lib/guava-32.0.1-jre.jar new file mode 100644 index 0000000000..5f3a1eee94 Binary files /dev/null and b/command/lib/guava-32.0.1-jre.jar differ diff --git a/command/lib/jetty-util-9.4.53.v20231009.jar b/command/lib/jetty-util-9.4.57.v20241219.jar similarity index 74% rename from command/lib/jetty-util-9.4.53.v20231009.jar rename to command/lib/jetty-util-9.4.57.v20241219.jar index 1cebfa06a4..caeda5de3e 100644 Binary files a/command/lib/jetty-util-9.4.53.v20231009.jar and b/command/lib/jetty-util-9.4.57.v20241219.jar differ diff --git a/donkey/build.xml b/donkey/build.xml index 110c1a8168..94b6f6dc15 100644 --- a/donkey/build.xml +++ b/donkey/build.xml @@ -1,5 +1,6 @@ + @@ -70,10 +71,22 @@ - - - - + + + + + + + + + + + + + + @@ -85,6 +98,13 @@ + + + + + + + diff --git a/donkey/lib/database/mysql-connector-j-8.2.0.jar b/donkey/lib/database/mysql-connector-j-8.2.0.jar deleted file mode 100644 index 96fae380c2..0000000000 Binary files a/donkey/lib/database/mysql-connector-j-8.2.0.jar and /dev/null differ diff --git a/donkey/lib/database/mysql-connector-j-8.4.0.jar b/donkey/lib/database/mysql-connector-j-8.4.0.jar new file mode 100644 index 0000000000..8294fe0b40 Binary files /dev/null and b/donkey/lib/database/mysql-connector-j-8.4.0.jar differ diff --git a/donkey/lib/guava/guava-28.2-jre.jar b/donkey/lib/guava/guava-28.2-jre.jar deleted file mode 100644 index 822b37bd4c..0000000000 Binary files a/donkey/lib/guava/guava-28.2-jre.jar and /dev/null differ diff --git a/donkey/lib/guava/guava-32.0.1-jre.jar b/donkey/lib/guava/guava-32.0.1-jre.jar new file mode 100644 index 0000000000..5f3a1eee94 Binary files /dev/null and b/donkey/lib/guava/guava-32.0.1-jre.jar differ diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java b/donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java index d07a77e702..7fad432ce1 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java @@ -9,11 +9,11 @@ package com.mirth.connect.donkey.model.message; -import java.util.HashMap; +import java.util.TreeMap; import java.util.Map; public class MapContent extends Content { - private Object content = new HashMap(); + private Object content = new TreeMap(); private transient boolean persisted = false; public MapContent() { diff --git a/donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java b/donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java index d13a3485c3..4288015af7 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java @@ -9,7 +9,7 @@ package com.mirth.connect.donkey.util; -import java.util.HashMap; +import java.util.TreeMap; import java.util.Map; import java.util.Map.Entry; @@ -61,7 +61,7 @@ public static String serializeMap(Serializer serializer, Map map try { return serializer.serialize(map); } catch (Exception e) { - Map newMap = new HashMap(); + Map newMap = new TreeMap(); for (Entry entry : map.entrySet()) { Object value = entry.getValue(); @@ -108,7 +108,7 @@ public static Map deserializeMapWithInvalidValues(Serializer ser * If an exception occurs while deserializing, we build up a new map manually, attempting to * deserialize each entry and replacing entries that fail with their string representations. */ - Map map = new HashMap(); + Map map = new TreeMap(); for (DonkeyElement entry : mapElement.getChildElements()) { if (!entry.getNodeName().equalsIgnoreCase("entry")) { diff --git a/manager/lib/guava-28.2-jre.jar b/manager/lib/guava-28.2-jre.jar deleted file mode 100644 index 822b37bd4c..0000000000 Binary files a/manager/lib/guava-28.2-jre.jar and /dev/null differ diff --git a/manager/lib/guava-32.0.1-jre.jar b/manager/lib/guava-32.0.1-jre.jar new file mode 100644 index 0000000000..5f3a1eee94 Binary files /dev/null and b/manager/lib/guava-32.0.1-jre.jar differ diff --git a/server/build.xml b/server/build.xml index 80c5f6d298..d16eecd894 100644 --- a/server/build.xml +++ b/server/build.xml @@ -40,7 +40,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -457,7 +457,7 @@ - + @@ -475,8 +475,8 @@ - - + + @@ -498,7 +498,7 @@ - + @@ -518,7 +518,7 @@ - + @@ -536,7 +536,7 @@ - + @@ -554,7 +554,7 @@ - + @@ -572,7 +572,7 @@ - + @@ -590,7 +590,7 @@ - + @@ -608,7 +608,7 @@ - + @@ -628,7 +628,7 @@ - + @@ -648,7 +648,7 @@ - + @@ -675,7 +675,7 @@ - + @@ -693,7 +693,7 @@ - + @@ -711,7 +711,7 @@ - + @@ -980,11 +980,11 @@ - + - + @@ -1031,7 +1031,7 @@ - + @@ -1043,29 +1043,28 @@ - + - - + + - - - - - + + + + + - - + @@ -1096,7 +1095,7 @@ - + @@ -1129,24 +1128,26 @@ - + - + - - --> + - + + + @@ -1184,99 +1185,131 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + - + + - + - + + + + + + + + + + + + + + + + + + + + + + + @@ -1289,8 +1322,16 @@ + + + + + + + + - + diff --git a/server/conf/mirth.properties b/server/conf/mirth.properties index bb706a4801..236fc8feee 100644 --- a/server/conf/mirth.properties +++ b/server/conf/mirth.properties @@ -22,17 +22,17 @@ password.reuseperiod = 0 password.reuselimit = 0 # Only used for migration purposes, do not modify -version = 4.5.3 +version = 4.5.4 # keystore keystore.path = ${dir.appdata}/keystore.jks -keystore.storepass = 81uWxplDtB -keystore.keypass = 81uWxplDtB +keystore.storepass = nfHbaNFacIhQ +keystore.keypass = tdW6edezNbmd keystore.type = JCEKS # server http.contextpath = / -server.url = +server.url = http.host = 0.0.0.0 https.host = 0.0.0.0 @@ -51,8 +51,8 @@ server.api.accesscontrolalloworigin = * server.api.accesscontrolallowcredentials = false server.api.accesscontrolallowmethods = GET, POST, DELETE, PUT server.api.accesscontrolallowheaders = Content-Type -server.api.accesscontrolexposeheaders = -server.api.accesscontrolmaxage = +server.api.accesscontrolexposeheaders = +server.api.accesscontrolmaxage = # Determines whether or not channels are deployed on server startup. server.startupdeploy = true @@ -81,7 +81,7 @@ database = derby # SQL Server/Sybase (jTDS) jdbc:jtds:sqlserver://localhost:1433/mirthdb # Microsoft SQL Server jdbc:sqlserver://localhost:1433;databaseName=mirthdb # If you are using the Microsoft SQL Server driver, please also specify database.driver below -database.url = jdbc:derby:${dir.appdata}/mirthdb;create=true +database.url = jdbc:derby:${dir.appdata}/mirthdb;create=true;upgrade=true # If using a custom or non-default driver, specify it here. # example: @@ -95,8 +95,8 @@ database.max-connections = 20 database-readonly.max-connections = 20 # database credentials -database.username = -database.password = +database.username = +database.password = #On startup, Maximum number of retries to establish database connections in case of failure database.connection.maxretry = 2 diff --git a/server/dbconf/derby/derby-database.sql b/server/dbconf/derby/derby-database.sql index 43310a61d6..75d7f8c696 100644 --- a/server/dbconf/derby/derby-database.sql +++ b/server/dbconf/derby/derby-database.sql @@ -107,7 +107,7 @@ INSERT INTO PERSON (USERNAME, LOGGED_IN) VALUES('admin', 0); INSERT INTO PERSON_PASSWORD (PERSON_ID, PASSWORD) VALUES(1, 'b8cA3mDkavInMc2JBYa6/C3EGxDp7ppqh7FsoXx0x8+3LWK3Ed3ELg=='); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.3'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.4'); INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1'); diff --git a/server/dbconf/mysql/mysql-database.sql b/server/dbconf/mysql/mysql-database.sql index c3133146db..80ed46cbef 100644 --- a/server/dbconf/mysql/mysql-database.sql +++ b/server/dbconf/mysql/mysql-database.sql @@ -113,7 +113,7 @@ INSERT INTO PERSON (USERNAME, LOGGED_IN) VALUES('admin', FALSE); INSERT INTO PERSON_PASSWORD (PERSON_ID, PASSWORD) VALUES(1, 'b8cA3mDkavInMc2JBYa6/C3EGxDp7ppqh7FsoXx0x8+3LWK3Ed3ELg=='); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.3'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.4'); INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1'); diff --git a/server/dbconf/oracle/oracle-database.sql b/server/dbconf/oracle/oracle-database.sql index b1dd949693..135a3d88a7 100644 --- a/server/dbconf/oracle/oracle-database.sql +++ b/server/dbconf/oracle/oracle-database.sql @@ -110,7 +110,7 @@ INSERT INTO PERSON (ID, USERNAME, LOGGED_IN, USERCONSENT) VALUES (PERSON_SEQUENC INSERT INTO PERSON_PASSWORD (PERSON_ID, PASSWORD) VALUES(PERSON_SEQUENCE.CURRVAL, 'b8cA3mDkavInMc2JBYa6/C3EGxDp7ppqh7FsoXx0x8+3LWK3Ed3ELg=='); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.3'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.4'); INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1'); diff --git a/server/dbconf/postgres/postgres-database.sql b/server/dbconf/postgres/postgres-database.sql index e764c216d2..dbf0a246a3 100644 --- a/server/dbconf/postgres/postgres-database.sql +++ b/server/dbconf/postgres/postgres-database.sql @@ -109,7 +109,7 @@ INSERT INTO PERSON (USERNAME, LOGGED_IN) VALUES('admin', FALSE); INSERT INTO PERSON_PASSWORD (PERSON_ID, PASSWORD) VALUES(1, 'b8cA3mDkavInMc2JBYa6/C3EGxDp7ppqh7FsoXx0x8+3LWK3Ed3ELg=='); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.3'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.4'); INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1'); diff --git a/server/dbconf/sqlserver/sqlserver-database.sql b/server/dbconf/sqlserver/sqlserver-database.sql index bc4e43efc2..3a24b15352 100644 --- a/server/dbconf/sqlserver/sqlserver-database.sql +++ b/server/dbconf/sqlserver/sqlserver-database.sql @@ -116,7 +116,7 @@ INSERT INTO PERSON (USERNAME, LOGGED_IN, USERCONSENT) VALUES('admin', 0, 0); INSERT INTO PERSON_PASSWORD (PERSON_ID, PASSWORD) VALUES(1, 'b8cA3mDkavInMc2JBYa6/C3EGxDp7ppqh7FsoXx0x8+3LWK3Ed3ELg=='); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.3'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.4'); INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1'); diff --git a/server/lib/ant/ant-header.jar b/server/lib/ant/ant-header.jar deleted file mode 100644 index 6620ffe685..0000000000 Binary files a/server/lib/ant/ant-header.jar and /dev/null differ diff --git a/server/lib/ant/asm-9.2.jar b/server/lib/ant/asm-9.2.jar new file mode 100644 index 0000000000..3557ae4140 Binary files /dev/null and b/server/lib/ant/asm-9.2.jar differ diff --git a/server/lib/ant/asm-commons-9.2.jar b/server/lib/ant/asm-commons-9.2.jar new file mode 100644 index 0000000000..01028a0035 Binary files /dev/null and b/server/lib/ant/asm-commons-9.2.jar differ diff --git a/server/lib/ant/asm-tree-9.2.jar b/server/lib/ant/asm-tree-9.2.jar new file mode 100644 index 0000000000..0a6833a688 Binary files /dev/null and b/server/lib/ant/asm-tree-9.2.jar differ diff --git a/server/lib/ant/jacocoant.jar b/server/lib/ant/jacocoant.jar deleted file mode 100644 index bf9968d908..0000000000 Binary files a/server/lib/ant/jacocoant.jar and /dev/null differ diff --git a/server/lib/ant/org.jacoco.agent-0.8.8.jar b/server/lib/ant/org.jacoco.agent-0.8.8.jar new file mode 100644 index 0000000000..f21efca71b Binary files /dev/null and b/server/lib/ant/org.jacoco.agent-0.8.8.jar differ diff --git a/server/lib/ant/org.jacoco.ant-0.8.8.jar b/server/lib/ant/org.jacoco.ant-0.8.8.jar new file mode 100644 index 0000000000..3769c01c28 Binary files /dev/null and b/server/lib/ant/org.jacoco.ant-0.8.8.jar differ diff --git a/server/lib/ant/org.jacoco.core-0.8.8.jar b/server/lib/ant/org.jacoco.core-0.8.8.jar new file mode 100644 index 0000000000..bbccce107f Binary files /dev/null and b/server/lib/ant/org.jacoco.core-0.8.8.jar differ diff --git a/server/lib/ant/org.jacoco.report-0.8.8.jar b/server/lib/ant/org.jacoco.report-0.8.8.jar new file mode 100644 index 0000000000..ccb60c8ebc Binary files /dev/null and b/server/lib/ant/org.jacoco.report-0.8.8.jar differ diff --git a/server/lib/aws/ext/netty/netty-buffer-4.1.97.Final.jar b/server/lib/aws/ext/netty/netty-buffer-4.1.119.Final.jar similarity index 52% rename from server/lib/aws/ext/netty/netty-buffer-4.1.97.Final.jar rename to server/lib/aws/ext/netty/netty-buffer-4.1.119.Final.jar index 47a6651b82..2453c4c290 100644 Binary files a/server/lib/aws/ext/netty/netty-buffer-4.1.97.Final.jar and b/server/lib/aws/ext/netty/netty-buffer-4.1.119.Final.jar differ diff --git a/server/lib/aws/ext/netty/netty-codec-4.1.97.Final.jar b/server/lib/aws/ext/netty/netty-codec-4.1.119.Final.jar similarity index 72% rename from server/lib/aws/ext/netty/netty-codec-4.1.97.Final.jar rename to server/lib/aws/ext/netty/netty-codec-4.1.119.Final.jar index b0988adfeb..fc85ca90f5 100644 Binary files a/server/lib/aws/ext/netty/netty-codec-4.1.97.Final.jar and b/server/lib/aws/ext/netty/netty-codec-4.1.119.Final.jar differ diff --git a/server/lib/aws/ext/netty/netty-codec-http-4.1.97.Final.jar b/server/lib/aws/ext/netty/netty-codec-http-4.1.119.Final.jar similarity index 55% rename from server/lib/aws/ext/netty/netty-codec-http-4.1.97.Final.jar rename to server/lib/aws/ext/netty/netty-codec-http-4.1.119.Final.jar index 17163dc11f..0275c9c211 100644 Binary files a/server/lib/aws/ext/netty/netty-codec-http-4.1.97.Final.jar and b/server/lib/aws/ext/netty/netty-codec-http-4.1.119.Final.jar differ diff --git a/server/lib/aws/ext/netty/netty-codec-http2-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-codec-http2-4.1.119.Final.jar new file mode 100644 index 0000000000..0f9a0d6b88 Binary files /dev/null and b/server/lib/aws/ext/netty/netty-codec-http2-4.1.119.Final.jar differ diff --git a/server/lib/aws/ext/netty/netty-codec-http2-4.1.97.Final.jar b/server/lib/aws/ext/netty/netty-codec-http2-4.1.97.Final.jar deleted file mode 100644 index 2ae5f6edbf..0000000000 Binary files a/server/lib/aws/ext/netty/netty-codec-http2-4.1.97.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-common-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-common-4.1.119.Final.jar new file mode 100644 index 0000000000..c3fffb3940 Binary files /dev/null and b/server/lib/aws/ext/netty/netty-common-4.1.119.Final.jar differ diff --git a/server/lib/aws/ext/netty/netty-common-4.1.97.Final.jar b/server/lib/aws/ext/netty/netty-common-4.1.97.Final.jar deleted file mode 100644 index b35e108bf2..0000000000 Binary files a/server/lib/aws/ext/netty/netty-common-4.1.97.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-handler-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-handler-4.1.119.Final.jar new file mode 100644 index 0000000000..fc2700f36d Binary files /dev/null and b/server/lib/aws/ext/netty/netty-handler-4.1.119.Final.jar differ diff --git a/server/lib/aws/ext/netty/netty-handler-4.1.97.Final.jar b/server/lib/aws/ext/netty/netty-handler-4.1.97.Final.jar deleted file mode 100644 index 222edb11b8..0000000000 Binary files a/server/lib/aws/ext/netty/netty-handler-4.1.97.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-resolver-4.1.97.Final.jar b/server/lib/aws/ext/netty/netty-resolver-4.1.119.Final.jar similarity index 79% rename from server/lib/aws/ext/netty/netty-resolver-4.1.97.Final.jar rename to server/lib/aws/ext/netty/netty-resolver-4.1.119.Final.jar index 301c04e6fd..ebaee0e2b9 100644 Binary files a/server/lib/aws/ext/netty/netty-resolver-4.1.97.Final.jar and b/server/lib/aws/ext/netty/netty-resolver-4.1.119.Final.jar differ diff --git a/server/lib/aws/ext/netty/netty-transport-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-transport-4.1.119.Final.jar new file mode 100644 index 0000000000..49779c9502 Binary files /dev/null and b/server/lib/aws/ext/netty/netty-transport-4.1.119.Final.jar differ diff --git a/server/lib/aws/ext/netty/netty-transport-4.1.97.Final.jar b/server/lib/aws/ext/netty/netty-transport-4.1.97.Final.jar deleted file mode 100644 index bf0a5a7c46..0000000000 Binary files a/server/lib/aws/ext/netty/netty-transport-4.1.97.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar b/server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar new file mode 100644 index 0000000000..11ee9f24f7 Binary files /dev/null and b/server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar differ diff --git a/server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar b/server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar deleted file mode 100644 index 0a600b60f1..0000000000 Binary files a/server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.97.Final.jar b/server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.119.Final.jar similarity index 72% rename from server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.97.Final.jar rename to server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.119.Final.jar index 7347eb1e00..844f5047bd 100644 Binary files a/server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.97.Final.jar and b/server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.119.Final.jar differ diff --git a/server/lib/classgraph-4.8.179.jar b/server/lib/classgraph-4.8.179.jar new file mode 100644 index 0000000000..b8d3c14c3b Binary files /dev/null and b/server/lib/classgraph-4.8.179.jar differ diff --git a/server/lib/classgraph-4.8.53.jar b/server/lib/classgraph-4.8.53.jar deleted file mode 100644 index 4c390e2719..0000000000 Binary files a/server/lib/classgraph-4.8.53.jar and /dev/null differ diff --git a/server/lib/commons/commons-email-1.3.1.jar b/server/lib/commons/commons-email-1.3.1.jar deleted file mode 100644 index d717dc4158..0000000000 Binary files a/server/lib/commons/commons-email-1.3.1.jar and /dev/null differ diff --git a/server/lib/commons/commons-email-1.6.0.jar b/server/lib/commons/commons-email-1.6.0.jar new file mode 100644 index 0000000000..c520d58430 Binary files /dev/null and b/server/lib/commons/commons-email-1.6.0.jar differ diff --git a/server/lib/commons/commons-net-3.3.jar b/server/lib/commons/commons-net-3.3.jar deleted file mode 100644 index f4f19a902a..0000000000 Binary files a/server/lib/commons/commons-net-3.3.jar and /dev/null differ diff --git a/server/lib/commons/commons-net-3.9.0.jar b/server/lib/commons/commons-net-3.9.0.jar new file mode 100644 index 0000000000..e64cd8aa86 Binary files /dev/null and b/server/lib/commons/commons-net-3.9.0.jar differ diff --git a/server/lib/commons/commons-vfs2-2.10.0.jar b/server/lib/commons/commons-vfs2-2.10.0.jar new file mode 100644 index 0000000000..cf5182ed13 Binary files /dev/null and b/server/lib/commons/commons-vfs2-2.10.0.jar differ diff --git a/server/lib/commons/commons-vfs2-2.9.0.jar b/server/lib/commons/commons-vfs2-2.9.0.jar deleted file mode 100644 index 5e047d54b1..0000000000 Binary files a/server/lib/commons/commons-vfs2-2.9.0.jar and /dev/null differ diff --git a/server/lib/database/mysql-connector-j-8.2.0.jar b/server/lib/database/mysql-connector-j-8.2.0.jar deleted file mode 100644 index 96fae380c2..0000000000 Binary files a/server/lib/database/mysql-connector-j-8.2.0.jar and /dev/null differ diff --git a/server/lib/database/mysql-connector-j-8.4.0.jar b/server/lib/database/mysql-connector-j-8.4.0.jar new file mode 100644 index 0000000000..8294fe0b40 Binary files /dev/null and b/server/lib/database/mysql-connector-j-8.4.0.jar differ diff --git a/server/lib/jetty/jetty-annotations-9.4.53.v20231009.jar b/server/lib/jetty/jetty-annotations-9.4.57.v20241219.jar similarity index 78% rename from server/lib/jetty/jetty-annotations-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-annotations-9.4.57.v20241219.jar index bd8d78e43d..b9810d6787 100644 Binary files a/server/lib/jetty/jetty-annotations-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-annotations-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-continuation-9.4.53.v20231009.jar b/server/lib/jetty/jetty-continuation-9.4.57.v20241219.jar similarity index 75% rename from server/lib/jetty/jetty-continuation-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-continuation-9.4.57.v20241219.jar index 0f98c6795a..69b33290b9 100644 Binary files a/server/lib/jetty/jetty-continuation-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-continuation-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-http-9.4.53.v20231009.jar b/server/lib/jetty/jetty-http-9.4.57.v20241219.jar similarity index 72% rename from server/lib/jetty/jetty-http-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-http-9.4.57.v20241219.jar index 3cc40d9b32..58106c5e1a 100644 Binary files a/server/lib/jetty/jetty-http-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-http-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-io-9.4.53.v20231009.jar b/server/lib/jetty/jetty-io-9.4.57.v20241219.jar similarity index 77% rename from server/lib/jetty/jetty-io-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-io-9.4.57.v20241219.jar index 20d9436dc8..bfcd6dd13b 100644 Binary files a/server/lib/jetty/jetty-io-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-io-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-jndi-9.4.53.v20231009.jar b/server/lib/jetty/jetty-jndi-9.4.57.v20241219.jar similarity index 78% rename from server/lib/jetty/jetty-jndi-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-jndi-9.4.57.v20241219.jar index 3dffa0ee69..8f590c64b0 100644 Binary files a/server/lib/jetty/jetty-jndi-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-jndi-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-plus-9.4.53.v20231009.jar b/server/lib/jetty/jetty-plus-9.4.57.v20241219.jar similarity index 78% rename from server/lib/jetty/jetty-plus-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-plus-9.4.57.v20241219.jar index 7cde2203e0..2d5b1114d1 100644 Binary files a/server/lib/jetty/jetty-plus-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-plus-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-rewrite-9.4.53.v20231009.jar b/server/lib/jetty/jetty-rewrite-9.4.57.v20241219.jar similarity index 70% rename from server/lib/jetty/jetty-rewrite-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-rewrite-9.4.57.v20241219.jar index a16a2199d4..c4f7eeefa9 100644 Binary files a/server/lib/jetty/jetty-rewrite-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-rewrite-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-security-9.4.53.v20231009.jar b/server/lib/jetty/jetty-security-9.4.57.v20241219.jar similarity index 73% rename from server/lib/jetty/jetty-security-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-security-9.4.57.v20241219.jar index 8788727e0b..425717e637 100644 Binary files a/server/lib/jetty/jetty-security-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-security-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-server-9.4.53.v20231009.jar b/server/lib/jetty/jetty-server-9.4.57.v20241219.jar similarity index 77% rename from server/lib/jetty/jetty-server-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-server-9.4.57.v20241219.jar index ad98c80386..b06058476e 100644 Binary files a/server/lib/jetty/jetty-server-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-server-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-servlet-9.4.53.v20231009.jar b/server/lib/jetty/jetty-servlet-9.4.57.v20241219.jar similarity index 77% rename from server/lib/jetty/jetty-servlet-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-servlet-9.4.57.v20241219.jar index ae94f171e4..d80c631158 100644 Binary files a/server/lib/jetty/jetty-servlet-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-servlet-9.4.57.v20241219.jar differ diff --git a/client/lib/jetty-util-9.4.53.v20231009.jar b/server/lib/jetty/jetty-util-9.4.57.v20241219.jar similarity index 74% rename from client/lib/jetty-util-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-util-9.4.57.v20241219.jar index 1cebfa06a4..caeda5de3e 100644 Binary files a/client/lib/jetty-util-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-util-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-util-ajax-9.4.53.v20231009.jar b/server/lib/jetty/jetty-util-ajax-9.4.57.v20241219.jar similarity index 75% rename from server/lib/jetty/jetty-util-ajax-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-util-ajax-9.4.57.v20241219.jar index 6075002315..1c064c3001 100644 Binary files a/server/lib/jetty/jetty-util-ajax-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-util-ajax-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-webapp-9.4.53.v20231009.jar b/server/lib/jetty/jetty-webapp-9.4.57.v20241219.jar similarity index 80% rename from server/lib/jetty/jetty-webapp-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-webapp-9.4.57.v20241219.jar index dcf50d7177..eed14c494b 100644 Binary files a/server/lib/jetty/jetty-webapp-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-webapp-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jetty-xml-9.4.53.v20231009.jar b/server/lib/jetty/jetty-xml-9.4.57.v20241219.jar similarity index 73% rename from server/lib/jetty/jetty-xml-9.4.53.v20231009.jar rename to server/lib/jetty/jetty-xml-9.4.57.v20241219.jar index 34dcbafa64..0df6472e71 100644 Binary files a/server/lib/jetty/jetty-xml-9.4.53.v20231009.jar and b/server/lib/jetty/jetty-xml-9.4.57.v20241219.jar differ diff --git a/server/lib/jetty/jsp/apache-jsp-9.4.53.v20231009.jar b/server/lib/jetty/jsp/apache-jsp-9.4.53.v20231009.jar deleted file mode 100644 index 62056a8557..0000000000 Binary files a/server/lib/jetty/jsp/apache-jsp-9.4.53.v20231009.jar and /dev/null differ diff --git a/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219-sources.jar b/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219-sources.jar new file mode 100644 index 0000000000..f64957721e Binary files /dev/null and b/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219-sources.jar differ diff --git a/server/mirth-build.properties b/server/mirth-build.properties index 123893bbbb..6f0929a3a3 100644 --- a/server/mirth-build.properties +++ b/server/mirth-build.properties @@ -4,4 +4,4 @@ client=../client webadmin=../webadmin manager=../manager cli=../command -version=4.5.3 +version=4.5.4 diff --git a/server/src/com/mirth/connect/client/core/Version.java b/server/src/com/mirth/connect/client/core/Version.java index f1c8cd6fa3..972f269753 100644 --- a/server/src/com/mirth/connect/client/core/Version.java +++ b/server/src/com/mirth/connect/client/core/Version.java @@ -82,7 +82,9 @@ public enum Version { v4_5_0("4.5.0"), v4_5_1("4.5.1"), v4_5_2("4.5.2"), - v4_5_3("4.5.3");//BridgeLink + v4_5_3("4.5.3"),//BridgeLink + + v4_5_4("4.5.4");//BridgeLink // @formatter:on diff --git a/server/src/com/mirth/connect/connectors/dimse/destination.xml b/server/src/com/mirth/connect/connectors/dimse/destination.xml index 3bc4673021..55b11c89a3 100644 --- a/server/src/com/mirth/connect/connectors/dimse/destination.xml +++ b/server/src/com/mirth/connect/connectors/dimse/destination.xml @@ -2,7 +2,7 @@ DICOM Sender NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to send messages using DICOM protocol. com.mirth.connect.connectors.dimse.DICOMSender diff --git a/server/src/com/mirth/connect/connectors/dimse/source.xml b/server/src/com/mirth/connect/connectors/dimse/source.xml index 159142d0a2..9c5d0f3252 100644 --- a/server/src/com/mirth/connect/connectors/dimse/source.xml +++ b/server/src/com/mirth/connect/connectors/dimse/source.xml @@ -2,7 +2,7 @@ DICOM Listener NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to listen for incoming messages over a standard TCP connection. com.mirth.connect.connectors.dimse.DICOMListener diff --git a/server/src/com/mirth/connect/connectors/doc/destination.xml b/server/src/com/mirth/connect/connectors/doc/destination.xml index d618707d40..ba2769a92f 100644 --- a/server/src/com/mirth/connect/connectors/doc/destination.xml +++ b/server/src/com/mirth/connect/connectors/doc/destination.xml @@ -2,7 +2,7 @@ Document Writer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to create RTF or PDF documents based on an HTML template. PDF files can be password protected. com.mirth.connect.connectors.doc.DocumentWriter diff --git a/server/src/com/mirth/connect/connectors/file/destination.xml b/server/src/com/mirth/connect/connectors/file/destination.xml index 94d4f1454a..06ef0d50d9 100644 --- a/server/src/com/mirth/connect/connectors/file/destination.xml +++ b/server/src/com/mirth/connect/connectors/file/destination.xml @@ -2,7 +2,7 @@ File Writer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to write files to a local or network file system. A velocity template is available to dynamically generate files. com.mirth.connect.connectors.file.FileWriter diff --git a/server/src/com/mirth/connect/connectors/file/source.xml b/server/src/com/mirth/connect/connectors/file/source.xml index 7fdf106a7b..2ed54ccc35 100644 --- a/server/src/com/mirth/connect/connectors/file/source.xml +++ b/server/src/com/mirth/connect/connectors/file/source.xml @@ -2,7 +2,7 @@ File Reader NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to poll for files from a local or network file system. com.mirth.connect.connectors.file.FileReader diff --git a/server/src/com/mirth/connect/connectors/http/destination.xml b/server/src/com/mirth/connect/connectors/http/destination.xml index b19345468d..86430df935 100644 --- a/server/src/com/mirth/connect/connectors/http/destination.xml +++ b/server/src/com/mirth/connect/connectors/http/destination.xml @@ -2,7 +2,7 @@ HTTP Sender NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to send messages to an HTTP server. Custom header properties can be specified. com.mirth.connect.connectors.http.HttpSender diff --git a/server/src/com/mirth/connect/connectors/http/source.xml b/server/src/com/mirth/connect/connectors/http/source.xml index 102564bb99..b348c06edc 100644 --- a/server/src/com/mirth/connect/connectors/http/source.xml +++ b/server/src/com/mirth/connect/connectors/http/source.xml @@ -2,7 +2,7 @@ HTTP Listener NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to listen for incoming HTTP data. Messages are received as XML and include the full header contents. com.mirth.connect.connectors.http.HttpListener diff --git a/server/src/com/mirth/connect/connectors/jdbc/destination.xml b/server/src/com/mirth/connect/connectors/jdbc/destination.xml index 51617c3425..90e71a8412 100644 --- a/server/src/com/mirth/connect/connectors/jdbc/destination.xml +++ b/server/src/com/mirth/connect/connectors/jdbc/destination.xml @@ -2,7 +2,7 @@ Database Writer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to write to any JDBC-compatabile database with Insert, Update or JavaScript statements. com.mirth.connect.connectors.jdbc.DatabaseWriter diff --git a/server/src/com/mirth/connect/connectors/jdbc/source.xml b/server/src/com/mirth/connect/connectors/jdbc/source.xml index c6d39aa7a5..27ba65c5ab 100644 --- a/server/src/com/mirth/connect/connectors/jdbc/source.xml +++ b/server/src/com/mirth/connect/connectors/jdbc/source.xml @@ -2,7 +2,7 @@ Database Reader NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to poll any supported JDBC-compatabile database for data. Rows are returned as XML and JavaScript can be used for advanced logic. com.mirth.connect.connectors.jdbc.DatabaseReader diff --git a/server/src/com/mirth/connect/connectors/jms/destination.xml b/server/src/com/mirth/connect/connectors/jms/destination.xml index 0d104c9da1..fa2b7d6da7 100644 --- a/server/src/com/mirth/connect/connectors/jms/destination.xml +++ b/server/src/com/mirth/connect/connectors/jms/destination.xml @@ -2,7 +2,7 @@ JMS Sender NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to write messages to a JMS queue. com.mirth.connect.connectors.jms.JmsSender diff --git a/server/src/com/mirth/connect/connectors/jms/source.xml b/server/src/com/mirth/connect/connectors/jms/source.xml index 9dcb7f4fd9..a25e882f6d 100644 --- a/server/src/com/mirth/connect/connectors/jms/source.xml +++ b/server/src/com/mirth/connect/connectors/jms/source.xml @@ -2,7 +2,7 @@ JMS Listener NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to read messages from a JMS queue. com.mirth.connect.connectors.jms.JmsListener diff --git a/server/src/com/mirth/connect/connectors/js/destination.xml b/server/src/com/mirth/connect/connectors/js/destination.xml index 6f174f60fe..62450a8029 100644 --- a/server/src/com/mirth/connect/connectors/js/destination.xml +++ b/server/src/com/mirth/connect/connectors/js/destination.xml @@ -2,7 +2,7 @@ JavaScript Writer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to execute JavaScript to connect to an arbitrary destination. com.mirth.connect.connectors.js.JavaScriptWriter diff --git a/server/src/com/mirth/connect/connectors/js/source.xml b/server/src/com/mirth/connect/connectors/js/source.xml index ee8e1a3800..904e7832e3 100644 --- a/server/src/com/mirth/connect/connectors/js/source.xml +++ b/server/src/com/mirth/connect/connectors/js/source.xml @@ -2,7 +2,7 @@ JavaScript Reader NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to execute arbitrary JavaScript to pull in messages to a channel. com.mirth.connect.connectors.js.JavaScriptReader diff --git a/server/src/com/mirth/connect/connectors/smtp/destination.xml b/server/src/com/mirth/connect/connectors/smtp/destination.xml index b373cb3b49..02f3af6819 100644 --- a/server/src/com/mirth/connect/connectors/smtp/destination.xml +++ b/server/src/com/mirth/connect/connectors/smtp/destination.xml @@ -2,7 +2,7 @@ SMTP Sender NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to send email messages via SMTP. A template is available to dynamically create messages. com.mirth.connect.connectors.smtp.SmtpSender diff --git a/server/src/com/mirth/connect/connectors/tcp/destination.xml b/server/src/com/mirth/connect/connectors/tcp/destination.xml index 2c79b97f2c..cdde0f4d3d 100644 --- a/server/src/com/mirth/connect/connectors/tcp/destination.xml +++ b/server/src/com/mirth/connect/connectors/tcp/destination.xml @@ -2,7 +2,7 @@ TCP Sender NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to send messages to a TCP server. com.mirth.connect.connectors.tcp.TcpSender diff --git a/server/src/com/mirth/connect/connectors/tcp/plugin.xml b/server/src/com/mirth/connect/connectors/tcp/plugin.xml index b7ae7512bd..d792fe717e 100644 --- a/server/src/com/mirth/connect/connectors/tcp/plugin.xml +++ b/server/src/com/mirth/connect/connectors/tcp/plugin.xml @@ -2,7 +2,7 @@ TCP Connector Service Plugin NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin is required for correct use of the TCP connectors. diff --git a/server/src/com/mirth/connect/connectors/tcp/source.xml b/server/src/com/mirth/connect/connectors/tcp/source.xml index 6eba7b4d98..69101853bb 100644 --- a/server/src/com/mirth/connect/connectors/tcp/source.xml +++ b/server/src/com/mirth/connect/connectors/tcp/source.xml @@ -2,7 +2,7 @@ TCP Listener NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to listen for incoming messages over a standard TCP connection. com.mirth.connect.connectors.tcp.TcpListener diff --git a/server/src/com/mirth/connect/connectors/vm/destination.xml b/server/src/com/mirth/connect/connectors/vm/destination.xml index b5ffa5398b..ee0b20f203 100644 --- a/server/src/com/mirth/connect/connectors/vm/destination.xml +++ b/server/src/com/mirth/connect/connectors/vm/destination.xml @@ -2,7 +2,7 @@ Channel Writer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to send events to other channels in the same Mirth Connect instance. com.mirth.connect.connectors.vm.ChannelWriter diff --git a/server/src/com/mirth/connect/connectors/vm/source.xml b/server/src/com/mirth/connect/connectors/vm/source.xml index 9ec9e42551..cee1628915 100644 --- a/server/src/com/mirth/connect/connectors/vm/source.xml +++ b/server/src/com/mirth/connect/connectors/vm/source.xml @@ -2,7 +2,7 @@ Channel Reader NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to listen for incoming events from other channels in the same Mirth Connect instance. com.mirth.connect.connectors.vm.ChannelReader diff --git a/server/src/com/mirth/connect/connectors/ws/destination.xml b/server/src/com/mirth/connect/connectors/ws/destination.xml index adff2a5551..0f2c35d2a8 100644 --- a/server/src/com/mirth/connect/connectors/ws/destination.xml +++ b/server/src/com/mirth/connect/connectors/ws/destination.xml @@ -2,7 +2,7 @@ Web Service Sender NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to invoke remote Web Services over HTTP. com.mirth.connect.connectors.ws.WebServiceSender diff --git a/server/src/com/mirth/connect/connectors/ws/source.xml b/server/src/com/mirth/connect/connectors/ws/source.xml index b3d2c230a4..72fc81052b 100644 --- a/server/src/com/mirth/connect/connectors/ws/source.xml +++ b/server/src/com/mirth/connect/connectors/ws/source.xml @@ -2,7 +2,7 @@ Web Service Listener NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This connector allows Mirth Connect to listen on an HTTP port for incoming Web Service calls. This connector also provides a WSDL for SOAP clients to use. com.mirth.connect.connectors.ws.WebServiceListener diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java b/server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java index f922398d7e..3c26ade6d0 100644 --- a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java +++ b/server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Collection; -import java.util.HashSet; +import java.util.TreeSet; import java.util.Iterator; import java.util.Set; @@ -25,7 +25,7 @@ public CodeTemplateContextSet(ContextType... contextTypes) { } public CodeTemplateContextSet(Collection contextTypes) { - delegate = new HashSet(contextTypes); + delegate = new TreeSet(contextTypes); } public CodeTemplateContextSet addContext(ContextType... contextTypes) { diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java b/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java index 722490fe03..272ebaf18e 100644 --- a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java +++ b/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; +import java.util.TreeSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -46,8 +46,8 @@ public class CodeTemplateLibrary implements Serializable, Migratable, Purgable, public CodeTemplateLibrary() { id = UUID.randomUUID().toString(); - enabledChannelIds = new HashSet(); - disabledChannelIds = new HashSet(); + enabledChannelIds = new TreeSet(); + disabledChannelIds = new TreeSet(); codeTemplates = new ArrayList(); } @@ -58,8 +58,8 @@ public CodeTemplateLibrary(CodeTemplateLibrary library) { lastModified = library.getLastModified(); description = library.getDescription(); includeNewChannels = library.isIncludeNewChannels(); - enabledChannelIds = new HashSet(library.getEnabledChannelIds()); - disabledChannelIds = new HashSet(library.getDisabledChannelIds()); + enabledChannelIds = new TreeSet(library.getEnabledChannelIds()); + disabledChannelIds = new TreeSet(library.getDisabledChannelIds()); codeTemplates = new ArrayList(); if (CollectionUtils.isNotEmpty(library.getCodeTemplates())) { for (CodeTemplate codeTemplate : library.getCodeTemplates()) { diff --git a/server/src/com/mirth/connect/model/converters/MapContentConverter.java b/server/src/com/mirth/connect/model/converters/MapContentConverter.java index 5ef6257433..0015cd8e62 100644 --- a/server/src/com/mirth/connect/model/converters/MapContentConverter.java +++ b/server/src/com/mirth/connect/model/converters/MapContentConverter.java @@ -53,7 +53,7 @@ public void marshal(Object value, HierarchicalStreamWriter writer, MarshallingCo try { DonkeyElement mapElement = new DonkeyElement(serializedMap); mapElement.setNodeName("content"); - mapElement.setAttribute("class", "map"); + mapElement.setAttribute("class", "tree-map"); copier.copy(new XppReader(new StringReader(mapElement.toXml()), new MXParser()), writer); } catch (DonkeyElementException e) { throw new SerializerException(e); diff --git a/server/src/com/mirth/connect/model/util/DefaultMetaData.java b/server/src/com/mirth/connect/model/util/DefaultMetaData.java index d77074fd80..34a3767144 100644 --- a/server/src/com/mirth/connect/model/util/DefaultMetaData.java +++ b/server/src/com/mirth/connect/model/util/DefaultMetaData.java @@ -25,8 +25,8 @@ public class DefaultMetaData { public static final MetaDataColumnType TYPE_COLUMN_TYPE = MetaDataColumnType.STRING; public static final MetaDataColumnType VERSION_COLUMN_TYPE = MetaDataColumnType.STRING; - public static final String SOURCE_VARIABLE_MAPPING = "mirth_source"; - public static final String TYPE_VARIABLE_MAPPING = "mirth_type"; + public static final String SOURCE_VARIABLE_MAPPING = "message_source"; + public static final String TYPE_VARIABLE_MAPPING = "message_type"; public static final String VERSION_VARIABLE_MAPPING = "mirth_version"; public static final MetaDataColumn SOURCE_COLUMN = new MetaDataColumn(SOURCE_COLUMN_NAME, SOURCE_COLUMN_TYPE, SOURCE_VARIABLE_MAPPING); diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/plugin.xml b/server/src/com/mirth/connect/plugins/dashboardstatus/plugin.xml index 500f771b91..64349d7b7c 100644 --- a/server/src/com/mirth/connect/plugins/dashboardstatus/plugin.xml +++ b/server/src/com/mirth/connect/plugins/dashboardstatus/plugin.xml @@ -2,7 +2,7 @@ Dashboard Connector Status Monitor NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides a real-time connection status column on the Mirth Connect client diff --git a/server/src/com/mirth/connect/plugins/datapruner/plugin.xml b/server/src/com/mirth/connect/plugins/datapruner/plugin.xml index 671e8203b5..aa61fd6c80 100644 --- a/server/src/com/mirth/connect/plugins/datapruner/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datapruner/plugin.xml @@ -2,7 +2,7 @@ Data Pruner NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides data pruning capability for Mirth Connect diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/plugin.xml b/server/src/com/mirth/connect/plugins/datatypes/delimited/plugin.xml index 3719e8d686..abd18e76ad 100644 --- a/server/src/com/mirth/connect/plugins/datatypes/delimited/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datatypes/delimited/plugin.xml @@ -2,7 +2,7 @@ Delimited Data Type NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides support for the delimited data type diff --git a/server/src/com/mirth/connect/plugins/datatypes/dicom/plugin.xml b/server/src/com/mirth/connect/plugins/datatypes/dicom/plugin.xml index dcdad70175..291d6b0a9a 100644 --- a/server/src/com/mirth/connect/plugins/datatypes/dicom/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datatypes/dicom/plugin.xml @@ -2,7 +2,7 @@ DICOM Data Type NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides support for the DICOM data type diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/plugin.xml b/server/src/com/mirth/connect/plugins/datatypes/edi/plugin.xml index b10b814fca..1fbb654b1d 100644 --- a/server/src/com/mirth/connect/plugins/datatypes/edi/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datatypes/edi/plugin.xml @@ -2,7 +2,7 @@ EDI Data Type NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides support for the EDI data type diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml b/server/src/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml index f374025a19..b05a1ae742 100644 --- a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml @@ -2,7 +2,7 @@ HL7v2 Data Type NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides support for the HL7v2 data type diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml b/server/src/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml index b1cad88219..c631894db9 100644 --- a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml @@ -2,7 +2,7 @@ HL7v3 Data Type NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides support for the HL7v3 data type diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/plugin.xml b/server/src/com/mirth/connect/plugins/datatypes/json/plugin.xml index 682a5aeecd..dfb015c00c 100644 --- a/server/src/com/mirth/connect/plugins/datatypes/json/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datatypes/json/plugin.xml @@ -2,7 +2,7 @@ JSON Data Type NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides support for the JSON data type diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/plugin.xml b/server/src/com/mirth/connect/plugins/datatypes/ncpdp/plugin.xml index 9263244068..53e60d6b24 100644 --- a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datatypes/ncpdp/plugin.xml @@ -2,7 +2,7 @@ NCPDP Data Type NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides support for the NCPDP data type diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/plugin.xml b/server/src/com/mirth/connect/plugins/datatypes/raw/plugin.xml index 695952df35..5bfd7c13ca 100644 --- a/server/src/com/mirth/connect/plugins/datatypes/raw/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datatypes/raw/plugin.xml @@ -2,7 +2,7 @@ Raw Data Type NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides support for the raw data type diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/plugin.xml b/server/src/com/mirth/connect/plugins/datatypes/xml/plugin.xml index 760090cfc5..a5bdcf728a 100644 --- a/server/src/com/mirth/connect/plugins/datatypes/xml/plugin.xml +++ b/server/src/com/mirth/connect/plugins/datatypes/xml/plugin.xml @@ -2,7 +2,7 @@ XML Data Type NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides support for the XML data type diff --git a/server/src/com/mirth/connect/plugins/destinationsetfilter/plugin.xml b/server/src/com/mirth/connect/plugins/destinationsetfilter/plugin.xml index a315a4d6cb..2e7f526831 100644 --- a/server/src/com/mirth/connect/plugins/destinationsetfilter/plugin.xml +++ b/server/src/com/mirth/connect/plugins/destinationsetfilter/plugin.xml @@ -2,7 +2,7 @@ Destination Set Filter Step NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com Provides an easy method in the source transformer to filter destinations from being executed. diff --git a/server/src/com/mirth/connect/plugins/dicomviewer/plugin.xml b/server/src/com/mirth/connect/plugins/dicomviewer/plugin.xml index 1448625a18..e541c4c781 100644 --- a/server/src/com/mirth/connect/plugins/dicomviewer/plugin.xml +++ b/server/src/com/mirth/connect/plugins/dicomviewer/plugin.xml @@ -2,7 +2,7 @@ DICOM Viewer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides DICOM attachment viewing capability in message browser diff --git a/server/src/com/mirth/connect/plugins/directoryresource/plugin.xml b/server/src/com/mirth/connect/plugins/directoryresource/plugin.xml index 00d42799f0..dac6e47ac2 100644 --- a/server/src/com/mirth/connect/plugins/directoryresource/plugin.xml +++ b/server/src/com/mirth/connect/plugins/directoryresource/plugin.xml @@ -2,7 +2,7 @@ Directory Resource Plugin NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin allows a directory to be used as a source for libraries to include in channels. diff --git a/server/src/com/mirth/connect/plugins/globalmapviewer/plugin.xml b/server/src/com/mirth/connect/plugins/globalmapviewer/plugin.xml index eb6200394b..8f3dcfe63b 100644 --- a/server/src/com/mirth/connect/plugins/globalmapviewer/plugin.xml +++ b/server/src/com/mirth/connect/plugins/globalmapviewer/plugin.xml @@ -2,7 +2,7 @@ Global Map Viewer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin allows you to view the global map and global channel maps in the Mirth Connect Administrator. diff --git a/server/src/com/mirth/connect/plugins/httpauth/plugin.xml b/server/src/com/mirth/connect/plugins/httpauth/plugin.xml index 16da9ccdf8..d0d455dffd 100644 --- a/server/src/com/mirth/connect/plugins/httpauth/plugin.xml +++ b/server/src/com/mirth/connect/plugins/httpauth/plugin.xml @@ -2,7 +2,7 @@ HTTP Authentication Settings NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides advanced authentication support for HTTP-based source connectors. diff --git a/server/src/com/mirth/connect/plugins/imageviewer/plugin.xml b/server/src/com/mirth/connect/plugins/imageviewer/plugin.xml index f1a1316759..2f01a0a70d 100644 --- a/server/src/com/mirth/connect/plugins/imageviewer/plugin.xml +++ b/server/src/com/mirth/connect/plugins/imageviewer/plugin.xml @@ -2,7 +2,7 @@ Image Viewer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides image attachment viewing capability in message browser. diff --git a/server/src/com/mirth/connect/plugins/javascriptrule/plugin.xml b/server/src/com/mirth/connect/plugins/javascriptrule/plugin.xml index 0079272278..6c3ad2c0a4 100644 --- a/server/src/com/mirth/connect/plugins/javascriptrule/plugin.xml +++ b/server/src/com/mirth/connect/plugins/javascriptrule/plugin.xml @@ -2,7 +2,7 @@ JavaScript Filter Rule NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides a JavaScript rule-type for Mirth Connect filters diff --git a/server/src/com/mirth/connect/plugins/javascriptstep/plugin.xml b/server/src/com/mirth/connect/plugins/javascriptstep/plugin.xml index 9ec3c0a2b5..da29e050bc 100644 --- a/server/src/com/mirth/connect/plugins/javascriptstep/plugin.xml +++ b/server/src/com/mirth/connect/plugins/javascriptstep/plugin.xml @@ -2,7 +2,7 @@ JavaScript Transformer Step NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides a JavaScript step-type for Mirth Connect transformers diff --git a/server/src/com/mirth/connect/plugins/mapper/plugin.xml b/server/src/com/mirth/connect/plugins/mapper/plugin.xml index 6db75f2af8..357f11d7b9 100644 --- a/server/src/com/mirth/connect/plugins/mapper/plugin.xml +++ b/server/src/com/mirth/connect/plugins/mapper/plugin.xml @@ -2,7 +2,7 @@ Mapper Transformer Step NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides a Mapping step type for Mirth Connect transformers diff --git a/server/src/com/mirth/connect/plugins/messagebuilder/plugin.xml b/server/src/com/mirth/connect/plugins/messagebuilder/plugin.xml index eb5f4d83c4..25f3880486 100644 --- a/server/src/com/mirth/connect/plugins/messagebuilder/plugin.xml +++ b/server/src/com/mirth/connect/plugins/messagebuilder/plugin.xml @@ -2,7 +2,7 @@ Message Builder Transformer Step NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides a Message Builder step-type for Mirth Connect transformers diff --git a/server/src/com/mirth/connect/plugins/mllpmode/plugin.xml b/server/src/com/mirth/connect/plugins/mllpmode/plugin.xml index 4c87e29e2a..4e98fb386a 100755 --- a/server/src/com/mirth/connect/plugins/mllpmode/plugin.xml +++ b/server/src/com/mirth/connect/plugins/mllpmode/plugin.xml @@ -2,7 +2,7 @@ Transmission Mode - MLLP NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides an MLLP transmission mode for socket/serial connectors. diff --git a/server/src/com/mirth/connect/plugins/pdfviewer/plugin.xml b/server/src/com/mirth/connect/plugins/pdfviewer/plugin.xml index 2f08d36794..1ea5e7e354 100644 --- a/server/src/com/mirth/connect/plugins/pdfviewer/plugin.xml +++ b/server/src/com/mirth/connect/plugins/pdfviewer/plugin.xml @@ -2,7 +2,7 @@ PDF Viewer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides PDF attachment viewing capability in message browser. diff --git a/server/src/com/mirth/connect/plugins/rulebuilder/plugin.xml b/server/src/com/mirth/connect/plugins/rulebuilder/plugin.xml index 7ee0d47f69..d53dea2a83 100644 --- a/server/src/com/mirth/connect/plugins/rulebuilder/plugin.xml +++ b/server/src/com/mirth/connect/plugins/rulebuilder/plugin.xml @@ -2,7 +2,7 @@ Rule Builder Filter Rule NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides a Rule Builder type for Mirth Connect filters diff --git a/server/src/com/mirth/connect/plugins/scriptfilerule/plugin.xml b/server/src/com/mirth/connect/plugins/scriptfilerule/plugin.xml index e3e452811a..0fa94a3c8e 100644 --- a/server/src/com/mirth/connect/plugins/scriptfilerule/plugin.xml +++ b/server/src/com/mirth/connect/plugins/scriptfilerule/plugin.xml @@ -2,7 +2,7 @@ External Script Filter Step NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides an External Script step-type for Mirth Connect filters diff --git a/server/src/com/mirth/connect/plugins/scriptfilestep/plugin.xml b/server/src/com/mirth/connect/plugins/scriptfilestep/plugin.xml index e8fb0b8c62..95df0d8ab4 100644 --- a/server/src/com/mirth/connect/plugins/scriptfilestep/plugin.xml +++ b/server/src/com/mirth/connect/plugins/scriptfilestep/plugin.xml @@ -2,7 +2,7 @@ External Script Transformer Step NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides an External Script step-type for Mirth Connect transformers diff --git a/server/src/com/mirth/connect/plugins/serverlog/plugin.xml b/server/src/com/mirth/connect/plugins/serverlog/plugin.xml index a4da9eba89..281f205b97 100644 --- a/server/src/com/mirth/connect/plugins/serverlog/plugin.xml +++ b/server/src/com/mirth/connect/plugins/serverlog/plugin.xml @@ -2,7 +2,7 @@ Server Log NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin allows you to view the server log on the Mirth Connect administrator. diff --git a/server/src/com/mirth/connect/plugins/textviewer/plugin.xml b/server/src/com/mirth/connect/plugins/textviewer/plugin.xml index fdd64536fb..0b2bbc62b3 100644 --- a/server/src/com/mirth/connect/plugins/textviewer/plugin.xml +++ b/server/src/com/mirth/connect/plugins/textviewer/plugin.xml @@ -2,7 +2,7 @@ Text Viewer NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides text and RTF attachment viewing capability in message browser. diff --git a/server/src/com/mirth/connect/plugins/xsltstep/plugin.xml b/server/src/com/mirth/connect/plugins/xsltstep/plugin.xml index 77e2234af4..8eddc9e0a7 100644 --- a/server/src/com/mirth/connect/plugins/xsltstep/plugin.xml +++ b/server/src/com/mirth/connect/plugins/xsltstep/plugin.xml @@ -2,7 +2,7 @@ XSLT Transformer Step NextGen Healthcare @mirthversion - 4.5.3 + 4.5.4 http://www.nextgen.com This plugin provides a XSLT support step-type for Mirth Connect transformers diff --git a/server/src/com/mirth/connect/server/alert/Alert.java b/server/src/com/mirth/connect/server/alert/Alert.java index 2b60cdfd14..988651bbad 100644 --- a/server/src/com/mirth/connect/server/alert/Alert.java +++ b/server/src/com/mirth/connect/server/alert/Alert.java @@ -9,16 +9,26 @@ package com.mirth.connect.server.alert; +import static java.util.Map.entry; + import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.velocity.tools.generic.DateTool; +import com.mirth.connect.client.core.ControllerException; +import com.mirth.connect.model.ServerSettings; import com.mirth.connect.model.alert.AlertModel; import com.mirth.connect.server.controllers.ConfigurationController; public class Alert { + private Logger logger = LogManager.getLogger(this.getClass()); + + public static Class USER_PROTOCOL_CLASS; private AlertModel model; private Long enabledDateTime; @@ -56,11 +66,26 @@ public Map createContext() { context.put("alertId", model.getId()); context.put("alertName", model.getName()); context.put("serverId", ConfigurationController.getInstance().getServerId()); + context.putAll(getServerSettings()); context.put("date", new DateTool()); return context; } + private Map getServerSettings() { + try { + ServerSettings settings = ConfigurationController.getInstance().getServerSettings(); + // ensure an empty string as Velocity won't replace when given a null value + return Map.ofEntries( + entry("serverName", StringUtils.defaultString(settings.getServerName())), + entry("environmentName", StringUtils.defaultString(settings.getEnvironmentName()))); + } catch (ControllerException e) { + logger.warn("Failed to retrieve server settings", e); + } + + return Map.of(); + } + public int getAlertedCount() { return alertedCount.get(); } @@ -73,4 +98,4 @@ public void resetAlertedCount() { alertedCount.set(0); } -} +} \ No newline at end of file diff --git a/server/src/com/mirth/connect/server/migration/ServerMigrator.java b/server/src/com/mirth/connect/server/migration/ServerMigrator.java index 7fa040635b..c3c9859491 100644 --- a/server/src/com/mirth/connect/server/migration/ServerMigrator.java +++ b/server/src/com/mirth/connect/server/migration/ServerMigrator.java @@ -243,6 +243,7 @@ private com.mirth.connect.server.migration.Migrator getMigrator(Version version) case v4_5_1: return null; case v4_5_2: return new com.mirth.connect.server.migration.Migrate4_5_2(); case v4_5_3: return new com.mirth.connect.server.migration.Migrate4_5_2(); + case v4_5_4: return null; } // @formatter:on return null; diff --git a/server/src/com/mirth/connect/util/HttpUtil.java b/server/src/com/mirth/connect/util/HttpUtil.java index 1b0b80854a..b2ec75437e 100644 --- a/server/src/com/mirth/connect/util/HttpUtil.java +++ b/server/src/com/mirth/connect/util/HttpUtil.java @@ -11,7 +11,7 @@ import java.nio.charset.Charset; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -104,7 +104,7 @@ public static Map> getTableMap(boolean useVariable, String } public static Map> getTableMap(String mapVariable, MessageMaps messageMaps, ConnectorMessage connectorMessage) { - Map> map = new HashMap>(); + Map> map = new LinkedHashMap>(); try { Map source = (Map) messageMaps.get(mapVariable, connectorMessage); diff --git a/server/test/com/mirth/commons/encryption/test/KeyEncryptorTest.java b/server/test/com/mirth/commons/encryption/test/KeyEncryptorTest.java index bf8dae9089..a2d0f12763 100644 --- a/server/test/com/mirth/commons/encryption/test/KeyEncryptorTest.java +++ b/server/test/com/mirth/commons/encryption/test/KeyEncryptorTest.java @@ -644,9 +644,9 @@ private void testMalformedInput(EncryptionSettings encryptionSettings, Object me // Incorrect algorithm try { - String wrongAlgorithm = "AES/GCM/NoPadding"; + String wrongAlgorithm = "FOO/BAR/BAZ"; if (wrongAlgorithm.equals(encryptionSettings.getEncryptionAlgorithm())) { - wrongAlgorithm = "AES/CBC/PKCS5Padding"; + wrongAlgorithm = "FOO/BAR/BAZ"; } decryptMalformedInput(encryptor, "{alg=" + wrongAlgorithm + ",cs=UTF-8,iv=" + correctIV + "}", encrypted); fail("Should have thrown an exception"); diff --git a/server/test/com/mirth/connect/connectors/dimse/DICOMDispatcherTest.java b/server/test/com/mirth/connect/connectors/dimse/DICOMDispatcherTest.java index 19500c1add..1869f38c06 100644 --- a/server/test/com/mirth/connect/connectors/dimse/DICOMDispatcherTest.java +++ b/server/test/com/mirth/connect/connectors/dimse/DICOMDispatcherTest.java @@ -100,7 +100,7 @@ public void testResponseData() throws DonkeyElementException { Response response = dispatcher.send(props, message); String responseData = response.getMessage(); - String expectedResponseString = "\n" + "0\n" + "\n" + ""; + String expectedResponseString = "0"; DonkeyElement dicom = new DonkeyElement(expectedResponseString); assertEquals(dicom.toXml(), responseData); } diff --git a/server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java b/server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java index b9dcb64fd4..ff64da97db 100644 --- a/server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java +++ b/server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java @@ -5,6 +5,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.io.IOException; import java.net.Socket; import java.util.ArrayList; import java.util.Calendar; @@ -95,7 +96,7 @@ public void tearDown() throws Exception { dispatcher.stop(); log("Undeploying TCP Dispatcher..."); dispatcher.onUndeploy(); - Thread.sleep(1000); + Thread.sleep(3000); } } @@ -122,7 +123,7 @@ private void setupDispatcher(TcpDispatcherProperties props) throws Exception { Thread.sleep(1000); } - private TcpDispatcherProperties createTcpDispatcherProperties() { + private TcpDispatcherProperties createTcpDispatcherProperties() throws IOException { TcpDispatcherProperties dispatcherProps = new TcpDispatcherProperties(); dispatcherProps.getTransmissionModeProperties().setPluginPointName("Basic"); FrameModeProperties frameProps = new FrameModeProperties(); @@ -138,6 +139,7 @@ private TcpDispatcherProperties createTcpDispatcherProperties() { } private TcpDispatcher createTcpDispatcher(TcpDispatcherProperties dispatcherProps) { + TcpDispatcher dispatcher = new TestTcpDispatcher(TEST_CHANNEL_ID, TEST_SERVER_ID, 1, dispatcherProps); dispatcher.setChannelId(TEST_CHANNEL_ID); @@ -175,6 +177,7 @@ public void testMessageSent() throws Exception { assertEquals(TEST_MESSAGE_TEMPLATE, socketResult.get("result" + socketListenerId)); } + /* * testMLLPMessageSent() @@ -682,7 +685,7 @@ private static void log(Object message) { private static void logError(String message) { if (PRINT_DEBUG_MESSAGES) { - logError(message); + System.out.println(message); } } diff --git a/server/test/com/mirth/connect/model/PublicServerSettingsTest.java b/server/test/com/mirth/connect/model/PublicServerSettingsTest.java index 64a85b170f..97a8e0ea16 100644 --- a/server/test/com/mirth/connect/model/PublicServerSettingsTest.java +++ b/server/test/com/mirth/connect/model/PublicServerSettingsTest.java @@ -44,20 +44,20 @@ protected void configure() { serverSettings.setDefaultMetaDataColumns(null); serverSettings.setQueueBufferSize(1000); COLUMNS = new ArrayList(); - COLUMNS.add(new MetaDataColumn("SOURCE", MetaDataColumnType.STRING, "mirth_source")); - COLUMNS.add(new MetaDataColumn("TYPE", MetaDataColumnType.STRING, "mirth_type")); + COLUMNS.add(new MetaDataColumn("SOURCE", MetaDataColumnType.STRING, "message_source")); + COLUMNS.add(new MetaDataColumn("TYPE", MetaDataColumnType.STRING, "message_type")); } @Test public void defaultMetaDataColumnsTest() { - PublicServerSettings publicServerSettings = new PublicServerSettings(serverSettings); + PublicServerSettings publicServerSettings = new PublicServerSettings(serverSettings); assertEquals(COLUMNS, publicServerSettings.getDefaultMetaDataColumns()); } @Test public void queueBufferSizeTest() { - PublicServerSettings publicServerSettings = new PublicServerSettings(serverSettings); + com.mirth.connect.model.PublicServerSettings publicServerSettings = new com.mirth.connect.model.PublicServerSettings(serverSettings); assertTrue(1000 == publicServerSettings.getQueueBufferSize()); } diff --git a/server/test/com/mirth/connect/server/DatabaseConnectionPoolTests.java b/server/test/com/mirth/connect/server/DatabaseConnectionPoolTests.java index e1ceffbf22..9c2a60fc19 100644 --- a/server/test/com/mirth/connect/server/DatabaseConnectionPoolTests.java +++ b/server/test/com/mirth/connect/server/DatabaseConnectionPoolTests.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import java.sql.Connection; @@ -447,7 +447,7 @@ private void assertReadOnly() { verify(donkey, times(0)).getDaoFactory(); verify(sqlConfig, times(0)).getSqlSessionManager(); if (connection != null) { - verifyZeroInteractions(connection); + verifyNoInteractions(connection); } int count = 0; @@ -469,7 +469,7 @@ private void assertWriteOnly() { verify(donkey, times(0)).getReadOnlyDaoFactory(); verify(sqlConfig, times(0)).getReadOnlySqlSessionManager(); if (readOnlyConnection != null) { - verifyZeroInteractions(readOnlyConnection); + verifyNoInteractions(readOnlyConnection); } int count = 0; diff --git a/server/test/com/mirth/connect/server/attachments/MirthAttachmentHandlerProviderTest.java b/server/test/com/mirth/connect/server/attachments/MirthAttachmentHandlerProviderTest.java index e5d98c5ec5..c1bd710494 100644 --- a/server/test/com/mirth/connect/server/attachments/MirthAttachmentHandlerProviderTest.java +++ b/server/test/com/mirth/connect/server/attachments/MirthAttachmentHandlerProviderTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import java.util.Collections; @@ -94,7 +94,7 @@ public void testReAttachMessage2() throws Exception { String result = new String(attachmentHandlerProvider.reAttachMessage(encoded, connectorMessage, CHARSET, false, false), CHARSET); - verifyZeroInteractions(messageController); + verifyNoInteractions(messageController); String expected = new StringBuilder("test1${ATTACH:").append(channelId1).append(':').append(messageId1).append(':').append(attachment1.getId()).append("}test2").toString(); @@ -152,7 +152,7 @@ public void testReAttachMessage5() throws Exception { String result = new String(attachmentHandlerProvider.reAttachMessage(encoded, connectorMessage, CHARSET, false, false), CHARSET); - verifyZeroInteractions(messageController); + verifyNoInteractions(messageController); String expected = encoded; @@ -210,7 +210,7 @@ public void testReAttachMessage8() throws Exception { String result = new String(attachmentHandlerProvider.reAttachMessage(encoded, connectorMessage, CHARSET, false, true), CHARSET); - verifyZeroInteractions(messageController); + verifyNoInteractions(messageController); String expected = encoded; @@ -229,7 +229,7 @@ public void testReAttachMessage9() throws Exception { String result = new String(attachmentHandlerProvider.reAttachMessage(encoded, connectorMessage, CHARSET, false, true), CHARSET); - verifyZeroInteractions(messageController); + verifyNoInteractions(messageController); String expected = encoded; diff --git a/server/test/com/mirth/connect/server/controllers/ServerConfigurationRestorerTest.java b/server/test/com/mirth/connect/server/controllers/ServerConfigurationRestorerTest.java index d7fdf8b37b..2449524f5b 100644 --- a/server/test/com/mirth/connect/server/controllers/ServerConfigurationRestorerTest.java +++ b/server/test/com/mirth/connect/server/controllers/ServerConfigurationRestorerTest.java @@ -275,7 +275,7 @@ public void testUndeployChannels() throws Exception { verify(restorer.getEngineController(), times(1)).undeployChannels(channelIds, ServerEventContext.SYSTEM_USER_EVENT_CONTEXT, null); EngineController engineController = restorer.getEngineController(); - doThrow(ControllerException.class).when(engineController).undeployChannels(any(), any(), any()); + doThrow(new RuntimeException(new ControllerException("exception"))).when(engineController).undeployChannels(any(), any(), any()); MultiException multiException = new MultiException(); restorer.undeployChannels(multiException); assertEquals(1, multiException.size()); @@ -717,7 +717,7 @@ public void testRestorePluginProperties1() throws Exception { } assertEquals(0, multiException.size()); - doThrow(ControllerException.class).when(restorer).restorePluginProperties(anyString(), any(), any()); + doThrow(new RuntimeException(new ControllerException("exception"))).when(restorer).restorePluginProperties(anyString(), any(), any()); restorer.restorePluginProperties(config, multiException); assertEquals(2, multiException.size()); } @@ -800,7 +800,7 @@ public void testRestoreChannelDependencies() throws Exception { verify(restorer.getConfigurationController(), times(1)).setChannelDependencies(config.getChannelDependencies()); ConfigurationController configurationController = restorer.getConfigurationController(); - doThrow(ControllerException.class).when(configurationController).setChannelDependencies(any()); + doThrow(new RuntimeException(new ControllerException("exception"))).when(configurationController).setChannelDependencies(any()); restorer.restoreChannelDependencies(config, multiException); assertEquals(1, multiException.size()); } @@ -820,7 +820,7 @@ public void testRestoreChannelTags() throws Exception { verify(restorer.getConfigurationController(), times(1)).setChannelTags(config.getChannelTags()); ConfigurationController configurationController = restorer.getConfigurationController(); - doThrow(ControllerException.class).when(configurationController).setChannelTags(any()); + doThrow(new RuntimeException(new ControllerException("exception"))).when(configurationController).setChannelTags(any()); restorer.restoreChannelTags(config, multiException); assertEquals(1, multiException.size()); } @@ -863,7 +863,7 @@ public void testDeployAllChannels() throws Exception { verify(restorer.getEngineController(), times(1)).deployChannels(eq(channelIds), eq(ServerEventContext.SYSTEM_USER_EVENT_CONTEXT), isNull(), any()); EngineController engineController = restorer.getEngineController(); - doThrow(ControllerException.class).when(engineController).deployChannels(any(), any(), any(), any()); + doThrow(new RuntimeException(new ControllerException("exception"))).when(engineController).deployChannels(any(), any(), any(), any()); restorer.deployAllChannels(deploy, multiException); assertEquals(1, multiException.size()); } diff --git a/server/test/com/mirth/connect/server/controllers/TestUtils.java b/server/test/com/mirth/connect/server/controllers/TestUtils.java index d3334381ba..9173d73939 100644 --- a/server/test/com/mirth/connect/server/controllers/TestUtils.java +++ b/server/test/com/mirth/connect/server/controllers/TestUtils.java @@ -552,6 +552,19 @@ public static void fixMessageIdSequence(String channelId) throws Exception { try { connection = getConnection(); statement = connection.createStatement(); + // Check if D_MESSAGE_SEQUENCES table exists + result = statement.executeQuery( + "SELECT COUNT(*) FROM SYS.SYSTABLES WHERE UPPER(TABLENAME) = 'D_MESSAGE_SEQUENCES'" + ); + result.next(); + int tableExists = result.getInt(1); + close(result); + + // Create the table if it doesn't exist + if (tableExists == 0) { + statement.execute("CREATE TABLE D_MESSAGE_SEQUENCES (LOCAL_CHANNEL_ID BIGINT NOT NULL PRIMARY KEY)"); + } + result = statement.executeQuery("SELECT MAX(id) FROM d_m" + localChannelId); result.next(); maxId = result.getLong(1) + 1; diff --git a/server/test/com/mirth/connect/server/servlets/WebStartServletTest.java b/server/test/com/mirth/connect/server/servlets/WebStartServletTest.java index 048e24daa7..e462c91bc1 100644 --- a/server/test/com/mirth/connect/server/servlets/WebStartServletTest.java +++ b/server/test/com/mirth/connect/server/servlets/WebStartServletTest.java @@ -70,7 +70,10 @@ public void testDoGetCore() throws Exception { webStartServlet.doGet(request, response); - assertEquals(CORE_JNLP.trim(), response.getResponseString().trim()); + assertEquals( + CORE_JNLP.trim().replaceAll("\\s+", ""), + response.getResponseString().trim().replaceAll("\\s+", "") + ); assertEquals("application/x-java-jnlp-file", response.getContentType()); assertEquals("no-cache", response.getHeader("Pragma")); assertEquals("nosniff", response.getHeader("X-Content-Type-Options")); @@ -86,7 +89,10 @@ public void testDoGetCore() throws Exception { webStartServlet.doGet(request, response); - assertEquals(CORE_JNLP.trim(), response.getResponseString().trim()); + assertEquals( + CORE_JNLP.trim().replaceAll("\\s+", ""), + response.getResponseString().trim().replaceAll("\\s+", "") + ); assertEquals("application/x-java-jnlp-file", response.getContentType()); assertEquals("no-cache", response.getHeader("Pragma")); assertEquals("nosniff", response.getHeader("X-Content-Type-Options")); @@ -116,7 +122,10 @@ public String answer(InvocationOnMock invocation) throws Throwable { webStartServlet.doGet(request, response); - assertEquals(CORE_JNLP.trim(), response.getResponseString().trim()); + assertEquals( + CORE_JNLP.trim().replaceAll("\\s+", ""), + response.getResponseString().trim().replaceAll("\\s+", "") + ); assertEquals("application/x-java-jnlp-file", response.getContentType()); assertEquals("attachment; filename = \"webstart.jnlp\"", response.getHeader("Content-Disposition")); } @@ -232,7 +241,10 @@ public void testDoGetExtension() throws Exception { webStartServlet.doGet(request, response); - assertEquals(EXTENSION_JNLP.trim(), response.getResponseString().trim()); + assertEquals( + EXTENSION_JNLP.trim().replaceAll("\\s+", ""), + response.getResponseString().trim().replaceAll("\\s+", "") + ); assertEquals("application/x-java-jnlp-file", response.getContentType()); assertEquals("no-cache", response.getHeader("Pragma")); assertEquals("nosniff", response.getHeader("X-Content-Type-Options")); @@ -249,7 +261,10 @@ public void testDoGetExtension() throws Exception { webStartServlet.doGet(request, response); - assertEquals(EXTENSION_JNLP.trim(), response.getResponseString().trim()); + assertEquals( + EXTENSION_JNLP.trim().replaceAll("\\s+", ""), + response.getResponseString().trim().replaceAll("\\s+", "") + ); assertEquals("application/x-java-jnlp-file", response.getContentType()); assertEquals("no-cache", response.getHeader("Pragma")); assertEquals("nosniff", response.getHeader("X-Content-Type-Options")); diff --git a/server/test/com/mirth/connect/userutil/HashUtilTest.java b/server/test/com/mirth/connect/userutil/HashUtilTest.java index 89d73a9c29..29db8e868d 100644 --- a/server/test/com/mirth/connect/userutil/HashUtilTest.java +++ b/server/test/com/mirth/connect/userutil/HashUtilTest.java @@ -61,13 +61,12 @@ public void generateHashForByteAndAlgo() throws Exception { @Test public void generateHashBadAlgo() throws Exception { - String data = "testdata"; thrown.expect(NoSuchAlgorithmException.class); - HashUtil.generate(data.getBytes(), "SHA256"); - + HashUtil.generate(data.getBytes(), "BAD-ALGO"); } + @Test public void generateHashForEncodeStringAndAlgo() throws Exception { @@ -81,11 +80,10 @@ public void generateHashForEncodeStringAndAlgo() throws Exception { @Test public void generateHashForEncodeStringAndBadAlgo() throws Exception { - String data = "testdata"; String encoding = "UTF-8"; thrown.expect(NoSuchAlgorithmException.class); - HashUtil.generate(data, encoding, "SHA256"); + HashUtil.generate(data, encoding, "BAD-ALGO"); } @Test diff --git a/server/test/com/mirth/connect/util/HttpUtilTest.java b/server/test/com/mirth/connect/util/HttpUtilTest.java index f138119023..6e591391c8 100644 --- a/server/test/com/mirth/connect/util/HttpUtilTest.java +++ b/server/test/com/mirth/connect/util/HttpUtilTest.java @@ -9,10 +9,13 @@ package com.mirth.connect.util; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; import java.security.KeyStore; +import java.util.LinkedHashMap; +import java.util.Map; import java.util.UUID; import javax.net.ssl.SSLContext; @@ -22,6 +25,9 @@ import org.apache.http.ssl.SSLContexts; import org.junit.Test; +import com.mirth.connect.donkey.model.message.ConnectorMessage; +import com.mirth.connect.donkey.util.MessageMaps; + public class HttpUtilTest { @Test @@ -40,4 +46,20 @@ public void testExecuteGetRequest() throws Exception { } catch (Exception e) { } } + + @Test + public void testMapOrderPreserved() { + final String MAP_KEY = "MyMap"; + + Map initial = new LinkedHashMap<>(); + initial.put("First", 1); + initial.put("Second", 2); + initial.put("Third", 3); + + ConnectorMessage cm = new ConnectorMessage(); + cm.getSourceMap().put(MAP_KEY, initial); + + Map copied = HttpUtil.getTableMap(MAP_KEY, new MessageMaps(), cm); + assertArrayEquals("Failed to preserve key order", initial.keySet().toArray(), copied.keySet().toArray()); + } } diff --git a/server/testlib/byte-buddy-1.14.13.jar b/server/testlib/byte-buddy-1.14.13.jar new file mode 100644 index 0000000000..791db5e61f Binary files /dev/null and b/server/testlib/byte-buddy-1.14.13.jar differ diff --git a/server/testlib/byte-buddy-1.8.8.jar b/server/testlib/byte-buddy-1.8.8.jar deleted file mode 100644 index 7b964f6055..0000000000 Binary files a/server/testlib/byte-buddy-1.8.8.jar and /dev/null differ diff --git a/server/testlib/byte-buddy-agent-1.14.13.jar b/server/testlib/byte-buddy-agent-1.14.13.jar new file mode 100644 index 0000000000..3223ba8933 Binary files /dev/null and b/server/testlib/byte-buddy-agent-1.14.13.jar differ diff --git a/server/testlib/byte-buddy-agent-1.8.8.jar b/server/testlib/byte-buddy-agent-1.8.8.jar deleted file mode 100644 index 1d32e2ef73..0000000000 Binary files a/server/testlib/byte-buddy-agent-1.8.8.jar and /dev/null differ diff --git a/server/testlib/hamcrest-2.2.jar b/server/testlib/hamcrest-2.2.jar new file mode 100644 index 0000000000..71065788d5 Binary files /dev/null and b/server/testlib/hamcrest-2.2.jar differ diff --git a/server/testlib/junit-4.13.1.jar b/server/testlib/junit-4.13.1.jar new file mode 100644 index 0000000000..b376ffc16f Binary files /dev/null and b/server/testlib/junit-4.13.1.jar differ diff --git a/server/testlib/junit-4.8.1.jar b/server/testlib/junit-4.8.1.jar deleted file mode 100644 index 524cd65ce5..0000000000 Binary files a/server/testlib/junit-4.8.1.jar and /dev/null differ diff --git a/server/testlib/mockito-core-2.7.9.jar b/server/testlib/mockito-core-2.7.9.jar deleted file mode 100644 index 926872f2ae..0000000000 Binary files a/server/testlib/mockito-core-2.7.9.jar and /dev/null differ diff --git a/server/testlib/mockito-core-5.1.1.jar b/server/testlib/mockito-core-5.1.1.jar new file mode 100644 index 0000000000..234bea1474 Binary files /dev/null and b/server/testlib/mockito-core-5.1.1.jar differ diff --git a/server/testlib/mockito-inline-5.1.1.jar b/server/testlib/mockito-inline-5.1.1.jar new file mode 100644 index 0000000000..33dd71b507 Binary files /dev/null and b/server/testlib/mockito-inline-5.1.1.jar differ