Skip to content

Feature/update dependencies #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Innovarzweng merged 10 commits into from
Jul 15, 2025
Merged

Feature/update dependencies #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fc61d73
#5004 for NextGen
rogin May 8, 2023
8aa0345
update the dependency jars
Innovarzweng Jun 3, 2025
4e91a12
update unit tests/jacoco to java 17
Innovarzweng Jun 5, 2025
d4f037b
add the BridgeLink 4.5.4
Innovarzweng Jun 16, 2025
b1ac9a8
fix the path
Innovarzweng Jun 24, 2025
f297f9c
[bugfix]update unit tests/jacoco to java 17
Innovarzweng Jun 26, 2025
a96ac99
Merge pull request #33 from rogin/issue-5004
Innovarzweng Jul 1, 2025
9c5fa1d
change the report/help URL
Innovarzweng Jul 1, 2025
ef665d8
add two vars to the alert template variable list
Innovarzweng Jul 3, 2025
bca952d
Query Parameters on an HTTP Sender Connector are not sent in order
Innovarzweng Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions client/ant-build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project name="mirth-client" basedir="." default="help">
<property file="build.properties" />
<target name="help">
<echo>Mirth Client Build Help</echo>
<echo>-----------------------</echo>
Expand Down Expand Up @@ -338,11 +339,23 @@
<classpath refid="testclasspath" />
</javac>
</target>

<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
<classpath path="${server}/lib/ant/jacocoant.jar"/>
</taskdef>


<path id="jacoco.classpath">
<fileset dir="${server}/lib/ant">
<include name="org.jacoco.ant-0.8.8.jar"/>
<include name="org.jacoco.core-0.8.8.jar"/>
<include name="org.jacoco.report-0.8.8.jar"/>
<include name="org.jacoco.agent-0.8.8.jar"/>
<include name="asm-9.2.jar"/>
<include name="asm-tree-9.2.jar"/>
<include name="asm-commons-9.2.jar"/>
</fileset>
</path>

<taskdef uri="antlib:org.jacoco.ant"
resource="org/jacoco/ant/antlib.xml"
classpathref="jacoco.classpath"/>

<target name="test-run" depends="test-compile">
<property name="junit-reports" value="junit-reports" />
<property name="code-coverage-reports" value="code-coverage-reports" />
Expand All @@ -353,6 +366,13 @@
<junit haltonfailure="false" fork="true" forkmode="once">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx2048m" />
<jvmarg value="--add-opens=java.base/sun.misc=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
<classpath>
<path refid="testclasspath" />
<dirset dir="${test_classes}"/>
Expand Down
Binary file added client/lib/commons-vfs2-2.10.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/commons-vfs2-2.9.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/guava-28.2-jre.jar
View file
Open in desktop
Binary file not shown.
Binary file added client/lib/guava-32.0.1-jre.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...lib/jetty/jetty-util-9.4.53.v20231009.jar → client/lib/jetty-util-9.4.57.v20241219.jar
View file
Open in desktop
Binary file not shown.
12 changes: 8 additions & 4 deletions client/src/com/mirth/connect/client/ui/BareBonesBrowserLaunch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,21 @@
// ///////////////////////////////////////////////////////
package com.mirth.connect.client.ui;

import java.lang.reflect.Method;
import java.awt.Desktop;
import java.net.URI;


public class BareBonesBrowserLaunch {

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 {
Expand Down
6 changes: 3 additions & 3 deletions client/src/com/mirth/connect/client/ui/UIConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

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

Expand Down
31 changes: 26 additions & 5 deletions command/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<project name="mirth-cli" basedir="." default="build">
<property file="build.properties" />

<target name="init">
<property file="build.properties" />

Expand Down Expand Up @@ -71,11 +73,23 @@
<classpath refid="testclasspath" />
</javac>
</target>

<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
<classpath path="${server}/lib/ant/jacocoant.jar"/>
</taskdef>


<path id="jacoco.classpath">
<fileset dir="${server}/lib/ant">
<include name="org.jacoco.ant-0.8.8.jar"/>
<include name="org.jacoco.core-0.8.8.jar"/>
<include name="org.jacoco.report-0.8.8.jar"/>
<include name="org.jacoco.agent-0.8.8.jar"/>
<include name="asm-9.2.jar"/>
<include name="asm-tree-9.2.jar"/>
<include name="asm-commons-9.2.jar"/>
</fileset>
</path>

<taskdef uri="antlib:org.jacoco.ant"
resource="org/jacoco/ant/antlib.xml"
classpathref="jacoco.classpath"/>

<target name="test-run" depends="test-compile">
<property name="junit-reports" value="junit-reports" />
<property name="code-coverage-reports" value="code-coverage-reports" />
Expand All @@ -86,6 +100,13 @@
<junit haltonfailure="false" fork="true" forkmode="once">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx2048m" />
<jvmarg value="--add-opens=java.base/sun.misc=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
<classpath>
<path refid="testclasspath" />
<dirset dir="${test_classes}"/>
Expand Down
Binary file added command/lib/commons-vfs2-2.10.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed command/lib/commons-vfs2-2.9.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed command/lib/guava-28.2-jre.jar
View file
Open in desktop
Binary file not shown.
Binary file added command/lib/guava-32.0.1-jre.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed command/lib/jetty-util-9.4.53.v20231009.jar → command/lib/jetty-util-9.4.57.v20241219.jar
View file
Open in desktop
Binary file not shown.
28 changes: 24 additions & 4 deletions donkey/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="donkey" default="build" basedir=".">
<property file="build.properties" />
<target name="init">
<property file="build.properties" />

Expand Down Expand Up @@ -70,10 +71,22 @@
<classpath refid="testclasspath" />
</javac>
</target>

<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
<classpath path="${server}/lib/ant/jacocoant.jar"/>
</taskdef>

<path id="jacoco.classpath">
<fileset dir="${server}/lib/ant">
<include name="org.jacoco.ant-0.8.8.jar"/>
<include name="org.jacoco.core-0.8.8.jar"/>
<include name="org.jacoco.report-0.8.8.jar"/>
<include name="org.jacoco.agent-0.8.8.jar"/>
<include name="asm-9.2.jar"/>
<include name="asm-tree-9.2.jar"/>
<include name="asm-commons-9.2.jar"/>
</fileset>
</path>

<taskdef uri="antlib:org.jacoco.ant"
resource="org/jacoco/ant/antlib.xml"
classpathref="jacoco.classpath"/>

<target name="test-run" depends="test-compile">
<property name="junit-reports" value="junit-reports" />
Expand All @@ -85,6 +98,13 @@
<junit haltonfailure="false" fork="true" forkmode="once">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx2048m" />
<jvmarg value="--add-opens=java.base/sun.misc=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
<classpath>
<path refid="testclasspath" />
<dirset dir="${test_classes}"/>
Expand Down
Binary file removed donkey/lib/database/mysql-connector-j-8.2.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added donkey/lib/database/mysql-connector-j-8.4.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed donkey/lib/guava/guava-28.2-jre.jar
View file
Open in desktop
Binary file not shown.
Binary file added donkey/lib/guava/guava-32.0.1-jre.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object>();
private Object content = new TreeMap<String, Object>();
private transient boolean persisted = false;

public MapContent() {
Expand Down
6 changes: 3 additions & 3 deletions donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -61,7 +61,7 @@ public static String serializeMap(Serializer serializer, Map<String, Object> map
try {
return serializer.serialize(map);
} catch (Exception e) {
Map<String, Object> newMap = new HashMap<String, Object>();
Map<String, Object> newMap = new TreeMap<String, Object>();

for (Entry<String, Object> entry : map.entrySet()) {
Object value = entry.getValue();
Expand Down Expand Up @@ -108,7 +108,7 @@ public static Map<String, Object> 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<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new TreeMap<String, Object>();

for (DonkeyElement entry : mapElement.getChildElements()) {
if (!entry.getNodeName().equalsIgnoreCase("entry")) {
Expand Down
Binary file removed manager/lib/guava-28.2-jre.jar
View file
Open in desktop
Binary file not shown.
Binary file added manager/lib/guava-32.0.1-jre.jar
View file
Open in desktop
Binary file not shown.
Loading
Loading