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
2 changes: 1 addition & 1 deletion server/conf/mirth.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ password.reuseperiod = 0
password.reuselimit = 0

# Only used for migration purposes, do not modify
version = 4.5.2
version = 4.6.0

# keystore
keystore.path = ${dir.appdata}/keystore.jks
Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/derby/derby-database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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.2');
INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1');

Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/mysql/mysql-database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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.2');
INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1');

Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/oracle/oracle-database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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.2');
INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1');

Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/postgres/postgres-database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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.2');
INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1');

Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/sqlserver/sqlserver-database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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.2');
INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1');

Expand Down
2 changes: 1 addition & 1 deletion server/mirth-build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ donkey=../donkey
server=../server
client=../client
cli=../command
version=4.5.2
version=4.6.0

# This value is used as the modified time for the files inside of jar, zip, and war files
archive.entry.date=1999-01-01T00:00:00.000Z
3 changes: 2 additions & 1 deletion server/src/com/mirth/connect/client/core/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ public enum Version {
v4_4_2("4.4.2"),
v4_5_0("4.5.0"),
v4_5_1("4.5.1"),
v4_5_2("4.5.2");
v4_5_2("4.5.2"),
v4_6_0("4.6.0");

// @formatter:on

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ private Migrator getMigrator(Version version) {
case v4_5_0: return null;
case v4_5_1: return null;
case v4_5_2: return new Migrate4_5_2();
case v4_6_0: return null;
} // @formatter:on

return null;
Expand Down
2 changes: 1 addition & 1 deletion tools/install4j/oie-installer-config.install4j
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="11.0.3" transformSequenceNumber="11">
<application name="Open Integration Engine" applicationId="4145-9206-7630-8076" mediaDir="${compiler:installer:mediaRoot}/server/build" shortName="oie" publisher="Open Integration Engine Project" publisherWeb="https://openintegrationengine.com" version="4.5.2" backupOnSave="true" autoSave="true" macVolumeId="88477e584eb462ba" javaMinVersion="17" javaMaxVersion="25">
<application name="Open Integration Engine" applicationId="4145-9206-7630-8076" mediaDir="${compiler:installer:mediaRoot}/server/build" shortName="oie" publisher="Open Integration Engine Project" publisherWeb="https://openintegrationengine.com" version="4.6.0" backupOnSave="true" autoSave="true" macVolumeId="88477e584eb462ba" javaMinVersion="17" javaMaxVersion="25">
<variables>
<variable name="installer:mediaRoot" value="../../../engine" />
</variables>
Expand Down
Loading