From 34b25f3a0d853d2b132d824b1070670291c5e053 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 13 Aug 2015 19:35:45 -0500 Subject: [PATCH 1/3] hg backout e6e17f5d86b0 IDEMPIERE-2770 - to integrate better solution from hieplq --- org.adempiere.sdk-feature/adempiere.cquery | 1 - 1 file changed, 1 deletion(-) diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery index 19a315f302..23c78cc84b 100644 --- a/org.adempiere.sdk-feature/adempiere.cquery +++ b/org.adempiere.sdk-feature/adempiere.cquery @@ -20,7 +20,6 @@ - From c1d89b1877995de0b280877a00289c5871c51611 Mon Sep 17 00:00:00 2001 From: hieplq Date: Thu, 13 Aug 2015 02:57:18 +0800 Subject: [PATCH 2/3] fix build issue discuss at meeting http://www.globalqss.com/idempiere/irclog/%23idempiere.2015-08-12.log.html - IDEMPIERE-2770 Jenkins build broken --- org.adempiere.sdk-feature/adempiere.rmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap index 306830565b..c9cfd11829 100644 --- a/org.adempiere.sdk-feature/adempiere.rmap +++ b/org.adempiere.sdk-feature/adempiere.rmap @@ -9,6 +9,7 @@ + @@ -119,6 +120,7 @@ + From c8040ab521cf7347cc16d2803a5a569e3bbf8482 Mon Sep 17 00:00:00 2001 From: hieplq Date: Fri, 14 Aug 2015 05:03:00 +0800 Subject: [PATCH 3/3] fix build issue discuss at meeting http://www.globalqss.com/idempiere/irclog/%23idempiere.2015-08-12.log.html - IDEMPIERE-2770 Jenkins build broken --- org.adempiere.sdk-feature/adempiere.cquery | 2 +- org.adempiere.sdk-feature/adempiere.rmap | 2 ++ org.adempiere.server-feature/feature.xml | 15 ++++++++++++++- org.adempiere.server-feature/server.product | 2 ++ .../server.product.launch | 2 +- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery index 23c78cc84b..c5371a9ece 100644 --- a/org.adempiere.sdk-feature/adempiere.cquery +++ b/org.adempiere.sdk-feature/adempiere.cquery @@ -19,7 +19,7 @@ - + diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap index c9cfd11829..5daaef62c6 100644 --- a/org.adempiere.sdk-feature/adempiere.rmap +++ b/org.adempiere.sdk-feature/adempiere.rmap @@ -10,6 +10,7 @@ + @@ -121,6 +122,7 @@ + diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index 77ac26bea7..2d2e6b6660 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -266,6 +266,20 @@ version="0.0.0" unpack="false"/> + + + + - diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index ad011e8ac9..9c39d035d5 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -50,6 +50,8 @@ + + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index acef0a4766..897c994bac 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -24,7 +24,7 @@ - +