diff --git a/client/src/com/mirth/connect/client/ui/dependencies/ChannelDependenciesWarningDialog.java b/client/src/com/mirth/connect/client/ui/dependencies/ChannelDependenciesWarningDialog.java index 9bbc29dfc1..f1e8b44135 100644 --- a/client/src/com/mirth/connect/client/ui/dependencies/ChannelDependenciesWarningDialog.java +++ b/client/src/com/mirth/connect/client/ui/dependencies/ChannelDependenciesWarningDialog.java @@ -32,7 +32,7 @@ import net.miginfocom.swing.MigLayout; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.mirth.connect.client.ui.Frame.ChannelTask; import com.mirth.connect.client.ui.MirthDialog; diff --git a/client/src/com/mirth/connect/client/ui/editors/BaseEditorPane.java b/client/src/com/mirth/connect/client/ui/editors/BaseEditorPane.java index f1b06bd766..bcb1365b2f 100644 --- a/client/src/com/mirth/connect/client/ui/editors/BaseEditorPane.java +++ b/client/src/com/mirth/connect/client/ui/editors/BaseEditorPane.java @@ -89,7 +89,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; diff --git a/client/src/com/mirth/connect/client/ui/editors/filter/IteratorRulePanel.java b/client/src/com/mirth/connect/client/ui/editors/filter/IteratorRulePanel.java index 776684c973..d874a9ba01 100644 --- a/client/src/com/mirth/connect/client/ui/editors/filter/IteratorRulePanel.java +++ b/client/src/com/mirth/connect/client/ui/editors/filter/IteratorRulePanel.java @@ -17,7 +17,7 @@ import javax.swing.JLabel; import javax.swing.JRadioButton; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.mirth.connect.client.ui.editors.IteratorPanel; import com.mirth.connect.model.IteratorElement; diff --git a/donkey/lib/commons/commons-text-1.10.0.jar b/donkey/lib/commons/commons-text-1.10.0.jar new file mode 100644 index 0000000000..beada0274f Binary files /dev/null and b/donkey/lib/commons/commons-text-1.10.0.jar differ diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/channel/DeployedState.java b/donkey/src/main/java/com/mirth/connect/donkey/model/channel/DeployedState.java index 0c20f839f1..552b343585 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/model/channel/DeployedState.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/model/channel/DeployedState.java @@ -10,7 +10,7 @@ package com.mirth.connect.donkey.model.channel; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; public enum DeployedState { UNDEPLOYED, DEPLOYING, UNDEPLOYING, STARTING, STARTED, PAUSING, PAUSED, STOPPING, STOPPED, SYNCING, UNKNOWN; diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/event/ConnectionStatusEventType.java b/donkey/src/main/java/com/mirth/connect/donkey/model/event/ConnectionStatusEventType.java index bec2490706..327c7ca14b 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/model/event/ConnectionStatusEventType.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/model/event/ConnectionStatusEventType.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/event/DeployedStateEventType.java b/donkey/src/main/java/com/mirth/connect/donkey/model/event/DeployedStateEventType.java index c26a9b1da8..1cf7944393 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/model/event/DeployedStateEventType.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/model/event/DeployedStateEventType.java @@ -9,7 +9,7 @@ package com.mirth.connect.donkey.model.event; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.mirth.connect.donkey.model.channel.DeployedState; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/event/ErrorEventType.java b/donkey/src/main/java/com/mirth/connect/donkey/model/event/ErrorEventType.java index 5459ed5c3b..43c7da6734 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/model/event/ErrorEventType.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/model/event/ErrorEventType.java @@ -9,7 +9,7 @@ package com.mirth.connect.donkey.model.event; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/event/MessageEventType.java b/donkey/src/main/java/com/mirth/connect/donkey/model/event/MessageEventType.java index ac0e9bbba4..1c43972c04 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/model/event/MessageEventType.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/model/event/MessageEventType.java @@ -9,7 +9,7 @@ package com.mirth.connect.donkey.model.event; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.mirth.connect.donkey.model.message.Status; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/message/ContentType.java b/donkey/src/main/java/com/mirth/connect/donkey/model/message/ContentType.java index 92dfbf7fc1..c6a333c31d 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/model/message/ContentType.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/model/message/ContentType.java @@ -10,7 +10,7 @@ package com.mirth.connect.donkey.model.message; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; /** * Denotes various types of content created by a channel. Available types are: diff --git a/server/src/com/mirth/connect/connectors/doc/PageSize.java b/server/src/com/mirth/connect/connectors/doc/PageSize.java index d8e991c8f1..9ca5ffd628 100644 --- a/server/src/com/mirth/connect/connectors/doc/PageSize.java +++ b/server/src/com/mirth/connect/connectors/doc/PageSize.java @@ -12,7 +12,7 @@ import static com.mirth.connect.connectors.doc.Unit.INCHES; import static com.mirth.connect.connectors.doc.Unit.MM; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; public enum PageSize { diff --git a/server/src/com/mirth/connect/connectors/http/HttpStaticResource.java b/server/src/com/mirth/connect/connectors/http/HttpStaticResource.java index 03e7e481c7..7b9f3add52 100644 --- a/server/src/com/mirth/connect/connectors/http/HttpStaticResource.java +++ b/server/src/com/mirth/connect/connectors/http/HttpStaticResource.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; public class HttpStaticResource implements Serializable { diff --git a/server/src/com/mirth/connect/model/DatabaseTask.java b/server/src/com/mirth/connect/model/DatabaseTask.java index 403fbd35e0..5799424ba9 100644 --- a/server/src/com/mirth/connect/model/DatabaseTask.java +++ b/server/src/com/mirth/connect/model/DatabaseTask.java @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; public class DatabaseTask implements Serializable { diff --git a/server/src/com/mirth/connect/model/codetemplates/BasicCodeTemplateProperties.java b/server/src/com/mirth/connect/model/codetemplates/BasicCodeTemplateProperties.java index 3dbc533c00..96e67d37da 100644 --- a/server/src/com/mirth/connect/model/codetemplates/BasicCodeTemplateProperties.java +++ b/server/src/com/mirth/connect/model/codetemplates/BasicCodeTemplateProperties.java @@ -13,7 +13,7 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.mirth.connect.donkey.util.purge.PurgeUtil; diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplate.java b/server/src/com/mirth/connect/model/codetemplates/CodeTemplate.java index 3cd06fcb26..60dd823f74 100644 --- a/server/src/com/mirth/connect/model/codetemplates/CodeTemplate.java +++ b/server/src/com/mirth/connect/model/codetemplates/CodeTemplate.java @@ -17,7 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.mirth.connect.donkey.util.DonkeyElement; import com.mirth.connect.donkey.util.DonkeyElement.DonkeyElementException; diff --git a/server/src/com/mirth/connect/model/codetemplates/ContextType.java b/server/src/com/mirth/connect/model/codetemplates/ContextType.java index d0042c7263..0571d51ad4 100644 --- a/server/src/com/mirth/connect/model/codetemplates/ContextType.java +++ b/server/src/com/mirth/connect/model/codetemplates/ContextType.java @@ -9,7 +9,7 @@ package com.mirth.connect.model.codetemplates; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/server/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.java b/server/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.java index 5f7fb86ad2..f40e1e04fe 100644 --- a/server/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.java +++ b/server/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.java @@ -14,7 +14,7 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.mirth.connect.model.Step; import com.mirth.connect.util.ScriptBuilderException; diff --git a/server/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.java b/server/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.java index 34bb79e39e..0c5679b14c 100644 --- a/server/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.java +++ b/server/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import com.mirth.connect.model.Rule; import com.mirth.connect.util.ScriptBuilderException; diff --git a/server/src/com/mirth/connect/server/userutil/DeployedState.java b/server/src/com/mirth/connect/server/userutil/DeployedState.java index dd4c9cee15..c1a51252c2 100644 --- a/server/src/com/mirth/connect/server/userutil/DeployedState.java +++ b/server/src/com/mirth/connect/server/userutil/DeployedState.java @@ -9,7 +9,7 @@ package com.mirth.connect.server.userutil; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; /** * States of UNDEPLOYED, DEPLOYING, UNDEPLOYING, STARTING, STARTED, PAUSING, PAUSED, STOPPING, diff --git a/server/src/com/mirth/connect/userutil/ContentType.java b/server/src/com/mirth/connect/userutil/ContentType.java index 4bef28416a..5fa34d4212 100644 --- a/server/src/com/mirth/connect/userutil/ContentType.java +++ b/server/src/com/mirth/connect/userutil/ContentType.java @@ -9,7 +9,7 @@ package com.mirth.connect.userutil; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; /** * Denotes various types of content created by a channel. Available types are: diff --git a/server/src/com/mirth/connect/util/CodeTemplateUtil.java b/server/src/com/mirth/connect/util/CodeTemplateUtil.java index c36ed634e0..9182dbcd21 100644 --- a/server/src/com/mirth/connect/util/CodeTemplateUtil.java +++ b/server/src/com/mirth/connect/util/CodeTemplateUtil.java @@ -18,7 +18,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import org.mozilla.javascript.CompilerEnvirons; import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstNode;