From a33cf4bec55e2d1b660b2b83d4fe0b06528de55c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 5 Jan 2019 23:34:22 +0100 Subject: [PATCH] Preparing release 6.2 --- migration/i6.1z/oracle/201901052243_Version.sql | 12 ++++++++++++ migration/i6.1z/postgresql/201901052243_Version.sql | 9 +++++++++ org.adempiere.base/src/org/compiere/Adempiere.java | 8 ++++---- .../utils.unix/unix/DebianInstaller/DEBIAN/control | 2 +- org.adempiere.server/idempiere.html | 2 +- .../src/main/home/org/bmlaurus/home/Prop.java | 4 ++-- .../src/main/home/org/bmlaurus/home/home.properties | 2 +- 7 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 migration/i6.1z/oracle/201901052243_Version.sql create mode 100644 migration/i6.1z/postgresql/201901052243_Version.sql diff --git a/migration/i6.1z/oracle/201901052243_Version.sql b/migration/i6.1z/oracle/201901052243_Version.sql new file mode 100644 index 0000000000..b347a1290a --- /dev/null +++ b/migration/i6.1z/oracle/201901052243_Version.sql @@ -0,0 +1,12 @@ +UPDATE AD_SYSTEM + SET releaseno = '6.2', + VERSION = '2019-01-06' + WHERE ad_system_id = 0 AND ad_client_id = 0 +; + +COMMIT +; + +SELECT register_migration_script('201901052243_Version.sql') FROM dual +; + diff --git a/migration/i6.1z/postgresql/201901052243_Version.sql b/migration/i6.1z/postgresql/201901052243_Version.sql new file mode 100644 index 0000000000..16bc90608f --- /dev/null +++ b/migration/i6.1z/postgresql/201901052243_Version.sql @@ -0,0 +1,9 @@ +UPDATE AD_SYSTEM + SET releaseno = '6.2', + VERSION = '2019-01-06' + WHERE ad_system_id = 0 AND ad_client_id = 0 +; + +SELECT register_migration_script('201901052243_Version.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java index dedef3e527..0e6a989e9a 100644 --- a/org.adempiere.base/src/org/compiere/Adempiere.java +++ b/org.adempiere.base/src/org/compiere/Adempiere.java @@ -67,11 +67,11 @@ public final class Adempiere /** Timestamp */ static public final String ID = "$Id: Adempiere.java,v 1.8 2006/08/11 02:58:14 jjanke Exp $"; /** Main Version String */ - static public String MAIN_VERSION = "Release 6.1"; + static public String MAIN_VERSION = "Release 6.2"; /** Detail Version as date Used for Client/Server */ - static public String DATE_VERSION = "2018-11-04"; + static public String DATE_VERSION = "2019-01-06"; /** Database Version as date Compared with AD_System */ - static public String DB_VERSION = "2018-11-04"; + static public String DB_VERSION = "2019-01-06"; /** Product Name */ static public final String NAME = "iDempiere\u00AE"; @@ -92,7 +92,7 @@ public final class Adempiere /** Subtitle */ static public final String SUB_TITLE = "Smart Suite ERP, CRM and SCM"; static public final String ADEMPIERE_R = "iDempiere\u00AE"; - static public final String COPYRIGHT = "\u00A9 1999-2018 iDempiere\u00AE"; + static public final String COPYRIGHT = "\u00A9 1999-2019 iDempiere\u00AE"; static private String s_ImplementationVersion = null; static private String s_ImplementationVendor = null; diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control index a2303567b1..5e3334bdde 100644 --- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control +++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control @@ -1,5 +1,5 @@ Package: idempiere -Version: 6.1 +Version: 6.2 Section: web Priority: extra Architecture: all diff --git a/org.adempiere.server/idempiere.html b/org.adempiere.server/idempiere.html index 17a6decffd..1ea6932703 100644 --- a/org.adempiere.server/idempiere.html +++ b/org.adempiere.server/idempiere.html @@ -44,7 +44,7 @@ - Welcome to the iDempiere (OSGi+ADempiere) 6.1 Page!
+ Welcome to the iDempiere (OSGi+ADempiere) 6.2 Page!
 diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java index b52fe885f1..3d86ba83f0 100644 --- a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java +++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java @@ -34,7 +34,7 @@ public final class Prop implements Serializable { private static final String TEMPLATE_NAME = "TemplateName"; public static final String CLIENT_NAME = "ClientName"; public static final String CREDITS_TXT = "Credits"; - public static final String COPYRIGHT_TXT = "Copyriright"; + public static final String COPYRIGHT_TXT = "Copyright"; public static final String CUSTOM_IMAGE_PATH = "CustomImagePath"; /** Customizable Links */ @@ -90,7 +90,7 @@ public final class Prop implements Serializable { public static final String SOC_7 = "Social7"; /**Defaults*/ - private static final String CREDITS = "Welcome to the iDempiere (OSGi+ADempiere) 6.1 Page!"; + private static final String CREDITS = "Welcome to the iDempiere (OSGi+ADempiere) 6.2 Page!"; private static String LOGO_URL = null; diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties index ba7ae59708..aa6d7b9877 100644 --- a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties +++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties @@ -52,5 +52,5 @@ CustomImagePath = NONE ClientName = iDempiere Server #Custom Credits & Copyright tail -Credits = Welcome to the iDempiere (OSGi+ADempiere) 6.1 Page! +Credits = Welcome to the iDempiere (OSGi+ADempiere) 6.2 Page! Copyriright = || by iDempiere Community