diff --git a/gradle.properties b/gradle.properties index c0936bd3cd..5934cc4aaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=4.6.0 +version=4.7.0 # Keep file encoding deterministic across platforms so compiled output # is reproducible. diff --git a/server/conf/mirth.properties b/server/conf/mirth.properties index 6b71ebdbf3..4c98942771 100644 --- a/server/conf/mirth.properties +++ b/server/conf/mirth.properties @@ -22,7 +22,7 @@ password.reuseperiod = 0 password.reuselimit = 0 # Only used for migration purposes, do not modify -version = 4.6.0 +version = 4.7.0 # keystore keystore.path = ${dir.appdata}/keystore.jks diff --git a/server/dbconf/derby/derby-database.sql b/server/dbconf/derby/derby-database.sql index b71b13977e..63ac928712 100644 --- a/server/dbconf/derby/derby-database.sql +++ b/server/dbconf/derby/derby-database.sql @@ -105,7 +105,7 @@ CREATE TABLE DEBUGGER_USAGE INSERT INTO PERSON (USERNAME, LOGGED_IN) VALUES('admin', 0); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.7.0'); 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 33c77acddf..27ea4cb8b2 100644 --- a/server/dbconf/mysql/mysql-database.sql +++ b/server/dbconf/mysql/mysql-database.sql @@ -111,7 +111,7 @@ CREATE TABLE DEBUGGER_USAGE INSERT INTO PERSON (USERNAME, LOGGED_IN) VALUES('admin', FALSE); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.7.0'); 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 541bbfbc2d..2a0146de6e 100644 --- a/server/dbconf/oracle/oracle-database.sql +++ b/server/dbconf/oracle/oracle-database.sql @@ -108,7 +108,7 @@ CREATE TABLE DEBUGGER_USAGE INSERT INTO PERSON (ID, USERNAME, LOGGED_IN, USERCONSENT) VALUES (PERSON_SEQUENCE.NEXTVAL, 'admin', '0', '0'); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.7.0'); 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 4e1e76b4c9..bf72a97b16 100644 --- a/server/dbconf/postgres/postgres-database.sql +++ b/server/dbconf/postgres/postgres-database.sql @@ -107,7 +107,7 @@ CREATE TABLE DEBUGGER_USAGE INSERT INTO PERSON (USERNAME, LOGGED_IN) VALUES('admin', FALSE); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.7.0'); 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 dbfbe93aac..26fa60ca54 100644 --- a/server/dbconf/sqlserver/sqlserver-database.sql +++ b/server/dbconf/sqlserver/sqlserver-database.sql @@ -114,7 +114,7 @@ CREATE TABLE DEBUGGER_USAGE INSERT INTO PERSON (USERNAME, LOGGED_IN, USERCONSENT) VALUES('admin', 0, 0); -INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.6.0'); +INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.7.0'); INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1'); diff --git a/server/src/main/java/com/mirth/connect/client/core/Version.java b/server/src/main/java/com/mirth/connect/client/core/Version.java index 20c8d0b5df..74b3952143 100644 --- a/server/src/main/java/com/mirth/connect/client/core/Version.java +++ b/server/src/main/java/com/mirth/connect/client/core/Version.java @@ -76,7 +76,8 @@ public enum Version { v4_5_0("4.5.0"), v4_5_1("4.5.1"), v4_5_2("4.5.2"), - v4_6_0("4.6.0"); + v4_6_0("4.6.0"), + v4_7_0("4.7.0"); // @formatter:on diff --git a/server/src/main/java/com/mirth/connect/server/migration/ServerMigrator.java b/server/src/main/java/com/mirth/connect/server/migration/ServerMigrator.java index e1a74f10ac..e50cdb7550 100644 --- a/server/src/main/java/com/mirth/connect/server/migration/ServerMigrator.java +++ b/server/src/main/java/com/mirth/connect/server/migration/ServerMigrator.java @@ -244,6 +244,7 @@ private Migrator getMigrator(Version version) { case v4_5_1: return null; case v4_5_2: return new Migrate4_5_2(); case v4_6_0: return null; + case v4_7_0: return null; } // @formatter:on return null; diff --git a/server/src/test/resources/mirth.properties b/server/src/test/resources/mirth.properties index cbc3a21cec..52d6d9d4d2 100644 --- a/server/src/test/resources/mirth.properties +++ b/server/src/test/resources/mirth.properties @@ -22,7 +22,7 @@ password.reuseperiod = 0 password.reuselimit = 0 # Only used for migration purposes, do not modify -version = 4.6.0 +version = 4.7.0 # keystore keystore.path = ${dir.appdata}/keystore.jks diff --git a/tools/install4j/oie-installer-config.install4j b/tools/install4j/oie-installer-config.install4j index cd66e4145c..c864cee3b5 100644 --- a/tools/install4j/oie-installer-config.install4j +++ b/tools/install4j/oie-installer-config.install4j @@ -1,6 +1,6 @@ - +