From f7ca192e313e8bc0a76e7dd7c1c2c6ec8269bd6c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 26 Mar 2008 16:14:06 +0000 Subject: [PATCH] Preparing 3.4.0s release --- base/src/org/compiere/Adempiere.java | 6 +++--- launch/Adempiere.xml | 10 +++++----- migration/331b-trunk/135_version340s.sql | 6 ++++++ migration/331b-trunk/postgresql/135_version340s.sql | 6 ++++++ serverRoot/src/web/adempiere.html | 2 +- serverRoot/src/web/adempiere.jnlp | 6 +++--- utils/adempiereDirectTemplate.jnlp | 6 +++--- utils_dev/build.properties | 2 +- 8 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 migration/331b-trunk/135_version340s.sql create mode 100644 migration/331b-trunk/postgresql/135_version340s.sql diff --git a/base/src/org/compiere/Adempiere.java b/base/src/org/compiere/Adempiere.java index 86f8e13045..8c29dd6788 100644 --- a/base/src/org/compiere/Adempiere.java +++ b/base/src/org/compiere/Adempiere.java @@ -58,11 +58,11 @@ public final class Adempiere /** Main Version String */ // Conventions for naming second number is even for stable, and odd for unstable // the releases will have a suffix (b) for beta - (t) for trunk - and (s) for stable - static public final String MAIN_VERSION = "Release 3.3.1t"; + static public final String MAIN_VERSION = "Release 3.4.0s"; /** Detail Version as date Used for Client/Server */ - static public final String DATE_VERSION = "2007-12-05"; + static public final String DATE_VERSION = "2008-03-26"; /** Database Version as date Compared with AD_System */ - static public final String DB_VERSION = "2007-12-05"; + static public final String DB_VERSION = "2008-03-26"; /** Product Name */ static public final String NAME = "Adempiere\u00AE"; diff --git a/launch/Adempiere.xml b/launch/Adempiere.xml index 73e156436b..32219ed52a 100644 --- a/launch/Adempiere.xml +++ b/launch/Adempiere.xml @@ -29,12 +29,12 @@ 512 - 3.3.1.0 - Release 3.3.1b - Adempiere ERP & CRM 3.3.1b + 3.4.0.0 + Release 3.4.0s + Adempiere ERP & CRM 3.4.0s Adempiere - 3.3.1.0 - Release 3.3.1b + 3.4.0.0 + Release 3.4.0s Adempier ERP & CRM Adempiere Bazaar Adempiere diff --git a/migration/331b-trunk/135_version340s.sql b/migration/331b-trunk/135_version340s.sql new file mode 100644 index 0000000000..5e5b7a122f --- /dev/null +++ b/migration/331b-trunk/135_version340s.sql @@ -0,0 +1,6 @@ +UPDATE AD_SYSTEM + SET releaseno = '340s', + VERSION = '2008-03-26' + WHERE ad_system_id = 0 AND ad_client_id = 0; + +COMMIT ; diff --git a/migration/331b-trunk/postgresql/135_version340s.sql b/migration/331b-trunk/postgresql/135_version340s.sql new file mode 100644 index 0000000000..5e5b7a122f --- /dev/null +++ b/migration/331b-trunk/postgresql/135_version340s.sql @@ -0,0 +1,6 @@ +UPDATE AD_SYSTEM + SET releaseno = '340s', + VERSION = '2008-03-26' + WHERE ad_system_id = 0 AND ad_client_id = 0; + +COMMIT ; diff --git a/serverRoot/src/web/adempiere.html b/serverRoot/src/web/adempiere.html index 539843b503..52d6f883a8 100644 --- a/serverRoot/src/web/adempiere.html +++ b/serverRoot/src/web/adempiere.html @@ -96,7 +96,7 @@ End If - Welcome to the Adempiere 3.3.1b Home Page!
+ Welcome to the Adempiere 3.4.0s Home Page!
 diff --git a/serverRoot/src/web/adempiere.jnlp b/serverRoot/src/web/adempiere.jnlp index 76505fdae2..d77299d02f 100644 --- a/serverRoot/src/web/adempiere.jnlp +++ b/serverRoot/src/web/adempiere.jnlp @@ -1,9 +1,9 @@ - - Adempiere Client 3.3.1b $$context + Adempiere Client 3.4.0s $$context ADempiere, Inc. @@ -14,7 +14,7 @@ - + diff --git a/utils/adempiereDirectTemplate.jnlp b/utils/adempiereDirectTemplate.jnlp index b7ed22b075..fc2f33244b 100644 --- a/utils/adempiereDirectTemplate.jnlp +++ b/utils/adempiereDirectTemplate.jnlp @@ -1,9 +1,9 @@ - - Adempiere Client 3.3.1b @ADEMPIERE_APPS_SERVER@ Direct + Adempiere Client 3.4.0s @ADEMPIERE_APPS_SERVER@ Direct ADempiere, Inc. Adempiere ERP+CRM (local) - Smart Business Solution for Distribution and Service - globally @@ -13,7 +13,7 @@ - + diff --git a/utils_dev/build.properties b/utils_dev/build.properties index 6fd7cd449d..f4a5bfed7f 100644 --- a/utils_dev/build.properties +++ b/utils_dev/build.properties @@ -3,7 +3,7 @@ env.ADEMPIERE_ROOT=${env.ADEMPIERE_SOURCE}/adempiere env.ADEMPIERE_HOME=${env.ADEMPIERE_ROOT}/Adempiere env.ADEMPIERE_INSTALL=${env.ADEMPIERE_SOURCE}/adempiere/install env.ADEMPIERE_VERSION=ADempiere -env.ADEMPIERE_VERSION_FILE=331b +env.ADEMPIERE_VERSION_FILE=340s env.ADEMPIERE_VENDOR=ADempiere env.ENCODING=UTF-8 env.XDOCLET_HOME=${env.ADEMPIERE_SOURCE}/tools