Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions client/.classpath
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,9 +120,9 @@
</classpathentry>
<classpathentry kind="lib" path="lib/wizard.jar"/>
<classpathentry kind="lib" path="lib/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.3.5.jar"/>
<classpathentry kind="lib" path="lib/looks-2.3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.13.0.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.21.0.jar"/>
<classpathentry kind="lib" path="lib/commons-lang3-3.20.0.jar">
<attributes>
<attribute name="javadoc_location" value="http://commons.apache.org/lang/api/"/>
Expand All@@ -140,11 +140,11 @@
<classpathentry kind="lib" path="/Server/setup/client-lib/userutil-sources.jar"/>
<classpathentry kind="lib" path="lib/miglayout-swing-4.2.jar"/>
<classpathentry kind="lib" path="lib/miglayout-core-4.2.jar"/>
<classpathentry kind="lib" path="lib/commons-beanutils-1.9.4.jar"/>
<classpathentry kind="lib" path="lib/commons-beanutils-1.11.0.jar"/>
<classpathentry kind="lib" path="lib/velocity-engine-core-2.3.jar"/>
<classpathentry kind="lib" path="lib/velocity-tools-generic-3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-configuration2-2.8.0.jar"/>
<classpathentry kind="lib" path="lib/javax.mail-1.5.0.jar"/>
<classpathentry kind="lib" path="lib/commons-configuration2-2.13.0.jar"/>
<classpathentry kind="lib" path="lib/jakarta.mail-1.6.7.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.6.jar"/>
<classpathentry kind="lib" path="lib/autocomplete-2.5.4.jar"/>
<classpathentry kind="lib" path="lib/language_support.jar"/>
Expand DownExpand Up@@ -175,14 +175,14 @@
<classpathentry kind="lib" path="lib/commons-vfs2-2.10.0.jar"/>
<classpathentry kind="lib" path="lib/staxon-1.3.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/commons-compress-1.24.0.jar"/>
<classpathentry kind="lib" path="lib/javax.activation-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/commons-compress-1.28.0.jar"/>
<classpathentry kind="lib" path="lib/jakarta.activation-1.2.1.jar"/>
<classpathentry kind="lib" path="lib/javax.activation-api-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/javax.annotation-api-1.3.2.jar"/>
<classpathentry kind="lib" path="lib/openjfx.jar"/>
<classpathentry kind="lib" path="lib/jaxb-api-2.4.0-b180725.0427.jar"/>
<classpathentry kind="lib" path="lib/jaxb-runtime-2.4.0-b180725.0644.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.16.0.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.21.0.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.13.jar"/>
<classpathentry kind="lib" path="lib/swagger-annotations-2.0.10.jar"/>
<classpathentry kind="lib" path="lib/jcifs-ng-2.1.10.jar"/>
Expand Down
Binary file addedclient/lib/commons-beanutils-1.11.0.jar
Comment thread
NicoPiel marked this conversation as resolved.
Binary file not shown.
Binary file removedclient/lib/commons-beanutils-1.9.4.jar
Binary file not shown.
Binary file removedclient/lib/commons-codec-1.16.0.jar
Binary file not shown.
Binary file addedclient/lib/commons-codec-1.21.0.jar
Binary file not shown.
Binary file removedclient/lib/commons-compress-1.24.0.jar
Binary file not shown.
Binary file addedclient/lib/commons-compress-1.28.0.jar
Binary file not shown.
Binary file addedclient/lib/commons-configuration2-2.13.0.jar
Binary file not shown.
Binary file removedclient/lib/commons-configuration2-2.8.0.jar
Binary file not shown.
Binary file removedclient/lib/commons-io-2.13.0.jar
Binary file not shown.
Binary file addedclient/lib/commons-io-2.21.0.jar
Binary file not shown.
Binary file removedclient/lib/commons-logging-1.2.jar
Binary file not shown.
Binary file addedclient/lib/commons-logging-1.3.5.jar
Binary file not shown.
Binary file addedclient/lib/jakarta.activation-1.2.1.jar
Binary file not shown.
Binary file addedclient/lib/jakarta.mail-1.6.7.jar
Binary file not shown.
Binary file removedclient/lib/javax.activation-1.2.0.jar
Binary file not shown.
Binary file removedclient/lib/javax.mail-1.5.0.jar
Binary file not shown.
8 changes: 4 additions & 4 deletions command/.classpath
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/commons-lang3-3.20.0.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.2.jar">
<classpathentry kind="lib" path="lib/commons-logging-1.3.5.jar">
<attributes>
<attribute name="javadoc_location" value="http://commons.apache.org/logging/apidocs/"/>
</attributes>
Expand All@@ -65,18 +65,18 @@
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.13.0.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.21.0.jar"/>
<classpathentry kind="lib" path="lib/commons-collections4-4.4.jar"/>
<classpathentry kind="lib" path="lib/velocity-engine-core-2.3.jar"/>
<classpathentry kind="lib" path="lib/velocity-tools-generic-3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-configuration2-2.8.0.jar"/>
<classpathentry kind="lib" path="lib/commons-configuration2-2.13.0.jar"/>
<classpathentry kind="lib" path="lib/bcpkix-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/bcutil-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/commons-vfs2-2.10.0.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.4.57.v20241219.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/commons-codec-1.16.0.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.21.0.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.13.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.5.13.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.13.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion command/build.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@

<manifest>
<attribute name="Main-Class" value="com.mirth.connect.cli.launcher.CommandLineLauncher" />
<attribute name="Class-Path" value="cli-lib/log4j-api-2.25.3.jar cli-lib/log4j-core-2.25.3.jar cli-lib/commons-io-2.13.0.jar conf/" />
<attribute name="Class-Path" value="cli-lib/log4j-api-2.25.3.jar cli-lib/log4j-core-2.25.3.jar cli-lib/commons-io-2.21.0.jar conf/" />
</manifest>
</jar>
</target>
Expand Down
Binary file addedcommand/lib/commons-beanutils-1.11.0.jar
Binary file not shown.
Binary file removedcommand/lib/commons-beanutils-1.9.4.jar
Binary file not shown.
Binary file removedcommand/lib/commons-codec-1.16.0.jar
Binary file not shown.
Binary file addedcommand/lib/commons-codec-1.21.0.jar
Binary file not shown.
Binary file addedcommand/lib/commons-configuration2-2.13.0.jar
Binary file not shown.
Binary file removedcommand/lib/commons-configuration2-2.8.0.jar
Binary file not shown.
Binary file removedcommand/lib/commons-io-2.13.0.jar
Binary file not shown.
Binary file addedcommand/lib/commons-io-2.21.0.jar
Binary file not shown.
Binary file removedcommand/lib/commons-logging-1.2.jar
Binary file not shown.
Binary file addedcommand/lib/commons-logging-1.3.5.jar
Binary file not shown.
Binary file addedcommand/lib/jakarta.activation-1.2.1.jar
Binary file not shown.
Binary file removedcommand/lib/javax.activation-1.2.0.jar
Binary file not shown.
8 changes: 4 additions & 4 deletions donkey/.classpath
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
<attribute name="javadoc_location" value="http://commons.apache.org/dbutils/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/commons/commons-io-2.13.0.jar">
<classpathentry kind="lib" path="lib/commons/commons-io-2.21.0.jar">
<attributes>
<attribute name="javadoc_location" value="http://commons.apache.org/io/api-release/"/>
</attributes>
Expand All@@ -23,7 +23,7 @@
<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-collections/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/commons/commons-logging-1.2.jar">
<classpathentry kind="lib" path="lib/commons/commons-logging-1.3.5.jar">
<attributes>
<attribute name="javadoc_location" value="http://commons.apache.org/logging/apidocs/"/>
</attributes>
Expand DownExpand Up@@ -53,7 +53,7 @@
<classpathentry kind="lib" path="lib/database/derby-10.10.2.0.jar"/>
<classpathentry kind="lib" path="lib/xstream/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/database/ojdbc8-12.2.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-beanutils-1.9.4.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-beanutils-1.11.0.jar"/>
<classpathentry kind="lib" path="lib/database/jtds-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/database/mysql-connector-j-8.4.0.jar"/>
<classpathentry kind="lib" path="lib/HikariCP-2.5.1.jar"/>
Expand All@@ -67,7 +67,7 @@
<classpathentry kind="lib" path="testlib/javax.inject-2.4.0-b31.jar"/>
<classpathentry kind="lib" path="testlib/aopalliance-repackaged-2.4.0-b31.jar"/>
<classpathentry kind="lib" path="lib/guice-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-codec-1.16.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-codec-1.21.0.jar"/>
<classpathentry kind="lib" path="lib/guava/checker-qual-2.10.0.jar"/>
<classpathentry kind="lib" path="lib/guava/error_prone_annotations-2.3.4.jar"/>
<classpathentry kind="lib" path="lib/guava/failureaccess-1.0.1.jar"/>
Expand Down
Binary file not shown.
Binary file removeddonkey/lib/commons/commons-beanutils-1.9.4.jar
Binary file not shown.
Binary file removeddonkey/lib/commons/commons-codec-1.16.0.jar
Binary file not shown.
Binary file addeddonkey/lib/commons/commons-codec-1.21.0.jar
Binary file not shown.
Binary file removeddonkey/lib/commons/commons-io-2.13.0.jar
Binary file not shown.
Binary file addeddonkey/lib/commons/commons-io-2.21.0.jar
Binary file not shown.
Binary file removeddonkey/lib/commons/commons-logging-1.2.jar
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion generator/.classpath
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/commons-lang3-3.20.0.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.13.0.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.21.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file removedgenerator/lib/commons-io-2.13.0.jar
Binary file not shown.
Binary file addedgenerator/lib/commons-io-2.21.0.jar
Binary file not shown.
18 changes: 9 additions & 9 deletions server/.classpath
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,14 +12,14 @@
<classpathentry kind="lib" path="lib/extensions/file/jcifs-ng-2.1.10.jar"/>
<classpathentry kind="lib" path="lib/extensions/doc/itext-2.1.7.jar"/>
<classpathentry kind="lib" path="lib/extensions/doc/itext-rtf-2.1.7.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-beanutils-1.9.4.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-beanutils-1.11.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-cli-1.2.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-configuration2-2.8.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-configuration2-2.13.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-dbcp2-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-dbutils-1.7.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-digester3-3.2.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-jxpath-1.3.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-logging-1.2.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-logging-1.3.5.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-net-3.9.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-pool2-2.3.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-el-1.0.jar"/>
Expand DownExpand Up@@ -47,7 +47,7 @@
<classpathentry kind="lib" path="lib/extensions/dimse/dcm4che-tool-dcmsnd-2.0.29.jar"/>
<classpathentry kind="lib" path="lib/mybatis-3.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-lang3-3.20.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-io-2.13.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-io-2.21.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-math3-3.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-text-1.15.0.jar"/>
<classpathentry kind="lib" path="lib/log4j/log4j-1.2-api-2.25.3.jar">
Expand DownExpand Up@@ -112,7 +112,7 @@
<classpathentry kind="lib" path="lib/javax/javax.inject-2.4.0-b31.jar"/>
<classpathentry kind="lib" path="lib/javax/javax.json-1.0.4.jar"/>
<classpathentry kind="lib" path="lib/javax/javax.json-api-1.0.jar"/>
<classpathentry kind="lib" path="lib/javax/javax.mail-1.5.0.jar"/>
<classpathentry kind="lib" path="lib/javax/jakarta.mail-1.6.7.jar"/>
<classpathentry kind="lib" path="lib/javax/javax.ws.rs-api-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-annotations-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-continuation-9.4.57.v20241219.jar"/>
Expand DownExpand Up@@ -172,7 +172,7 @@
<classpathentry kind="lib" path="lib/javax/jaxws/jaxws-api-2.3.0.jar"/>
<classpathentry kind="lib" path="lib/javax/jaxws/jaxws-rt-2.3.0.2.jar"/>
<classpathentry kind="lib" path="lib/javax/jaxws/jaxws-tools-2.3.0.2.jar"/>
<classpathentry kind="lib" path="lib/javax/javax.activation-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/javax/jakarta.activation-1.2.1.jar"/>
<classpathentry kind="lib" path="lib/javax/javax.activation-api-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/javax/javax.annotation-api-1.3.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/Donkey">
Expand DownExpand Up@@ -201,8 +201,8 @@
<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-vfs/apidocs"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/commons/commons-compress-1.24.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-codec-1.16.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-compress-1.28.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-codec-1.21.0.jar"/>
<classpathentry kind="lib" path="lib/commons/httpcore-4.4.13.jar"/>
<classpathentry kind="lib" path="lib/database/mssql-jdbc-8.4.1.jre8.jar"/>
<classpathentry kind="lib" path="lib/aws/annotations-2.15.28.jar"/>
Expand DownExpand Up@@ -267,7 +267,7 @@
<classpathentry kind="lib" path="lib/hapi/hapi-structures-v28-2.3.jar"/>
<classpathentry kind="lib" path="lib/hapi/hapi-structures-v281-2.3.jar"/>
<classpathentry kind="lib" path="lib/rhino-1.7.13.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-fileupload-1.5.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-fileupload-1.6.0.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.4.20.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
4 changes: 2 additions & 2 deletions server/build.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1047,7 +1047,7 @@

<manifest>
<attribute name="Main-Class" value="com.mirth.connect.server.launcher.MirthLauncher" />
<attribute name="Class-Path" value="server-lib/commons/commons-io-2.13.0.jar server-lib/commons/commons-configuration2-2.8.0.jar server-lib/commons/commons-lang3-3.20.0.jar server-lib/commons/commons-logging-1.2.jar server-lib/commons/commons-beanutils-1.9.4.jar server-lib/commons/commons-text-1.15.0.jar server-lib/commons/commons-collections-3.2.2.jar conf/" />
<attribute name="Class-Path" value="server-lib/commons/commons-io-2.21.0.jar server-lib/commons/commons-configuration2-2.13.0.jar server-lib/commons/commons-lang3-3.20.0.jar server-lib/commons/commons-logging-1.3.5.jar server-lib/commons/commons-beanutils-1.11.0.jar server-lib/commons/commons-text-1.15.0.jar server-lib/commons/commons-collections-3.2.2.jar conf/" />
</manifest>
</jar>

Expand DownExpand Up@@ -1233,7 +1233,7 @@
<include name="log4j/log4j-core-2.25.3.jar" />
<include name="database/derby-10.10.2.0.jar" />
<include name="database/derbytools-10.10.2.0.jar" />
<include name="commons/commons-io-2.13.0.jar" />
<include name="commons/commons-io-2.21.0.jar" />
</fileset>
</classpath>
<arg value="dbconf/derby/derby-database.sql" />
Expand Down
Binary file not shown.
Binary file removedserver/lib/commons/commons-beanutils-1.9.4.jar
Binary file not shown.
Binary file removedserver/lib/commons/commons-codec-1.16.0.jar
Binary file not shown.
Binary file addedserver/lib/commons/commons-codec-1.21.0.jar
Binary file not shown.
Binary file removedserver/lib/commons/commons-compress-1.24.0.jar
Binary file not shown.
Binary file addedserver/lib/commons/commons-compress-1.28.0.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removedserver/lib/commons/commons-fileupload-1.5.jar
Binary file not shown.
Binary file not shown.
Binary file removedserver/lib/commons/commons-io-2.13.0.jar
Binary file not shown.
Binary file addedserver/lib/commons/commons-io-2.21.0.jar
Binary file not shown.
Binary file removedserver/lib/commons/commons-logging-1.2.jar
Binary file not shown.
Binary file not shown.
Binary file addedserver/lib/javax/jakarta.activation-1.2.1.jar
Binary file not shown.
Binary file addedserver/lib/javax/jakarta.mail-1.6.7.jar
Binary file not shown.
Binary file removedserver/lib/javax/javax.activation-1.2.0.jar
Binary file not shown.
Binary file removedserver/lib/javax/javax.mail-1.5.0.jar
Binary file not shown.
Loading