From baff1951be55e1bb7247a34c420e2e81c30a23c0 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 10:20:19 +0700
Subject: [PATCH] IDEMPIERE-3136:all stuff relate library of idempiere remove
 duplicate jar (bsh-engine, groovy-engine) update, move groovy to osgi add
 common bundle (now focus to support jasper report)

---
 org.adempiere.base-feature/feature.xml        | 64 +++++++++++++
 org.adempiere.base/.classpath                 |  3 -
 org.adempiere.base/META-INF/MANIFEST.MF       | 95 +------------------
 org.adempiere.base/build.properties           |  3 -
 org.adempiere.base/copyjars.xml               |  3 -
 org.adempiere.sdk-feature/adempiere.rmap      | 11 +++
 .../materialize.properties                    |  1 +
 org.adempiere.ui.swing/META-INF/MANIFEST.MF   |  3 +-
 8 files changed, 80 insertions(+), 103 deletions(-)

diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 6d8c0db261..f7e22681ad 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -299,4 +299,68 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="org.apache.commons.beanutils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.apache.commons.lang"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.apache.commons.logging"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="groovy-all"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="com.ibm.icu"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-annotations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-databind"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="joda-time"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
 </feature>
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 9d1123c354..8fea4bc2c7 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -7,8 +7,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="bsh-2.0b6.jar"/>
-	<classpathentry exported="true" kind="lib" path="bsh-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="groovy-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="jython-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="jython.jar"/>
 	<classpathentry exported="true" kind="lib" path="cron4j-2.2.5.jar"/>
@@ -16,7 +14,6 @@
 	<classpathentry exported="true" kind="lib" path="jcommon-1.0.23.jar"/>
 	<classpathentry exported="true" kind="lib" path="jfreechart-1.0.19.jar"/>
 	<classpathentry exported="true" kind="lib" path="jnlp.jar"/>
-	<classpathentry exported="true" kind="lib" path="groovy-all-1.7.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="barcode4j-2.1.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 8eb35eb5e1..bdfe9cba8f 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -4,8 +4,6 @@ Bundle-Name: iDempiere Core
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-ClassPath: base.jar,
- bsh-engine.jar,
- groovy-engine.jar,
  jython-engine.jar,
  jython.jar,
  cron4j-2.2.5.jar,
@@ -13,7 +11,6 @@ Bundle-ClassPath: base.jar,
  jcommon-1.0.23.jar,
  jfreechart-1.0.19.jar,
  jnlp.jar,
- groovy-all-1.7.5.jar,
  barcode4j-2.1.jar,
  bsh-2.0b6.jar
 Export-Package: bsh,
@@ -26,50 +23,6 @@ Export-Package: bsh,
  bsh.servlet,
  bsh.util,
  com.akunagroup.uk.postcode,
- groovy.beans,
- groovy.grape,
- groovy.inspect,
- groovy.inspect.swingui,
- groovy.io,
- groovy.jmx.builder,
- groovy.lang,
- groovy.mock.interceptor,
- groovy.model,
- groovy.security,
- groovy.servlet,
- groovy.sql,
- groovy.swing,
- groovy.swing.binding,
- groovy.swing.factory,
- groovy.swing.impl,
- groovy.text,
- groovy.time,
- groovy.transform,
- groovy.ui,
- groovy.ui.text,
- groovy.ui.view,
- groovy.util,
- groovy.util.slurpersupport,
- groovy.xml,
- groovy.xml.dom,
- groovy.xml.streamingmarkupsupport,
- groovyjarjarantlr,
- groovyjarjarantlr.ASdebug,
- groovyjarjarantlr.actions.cpp,
- groovyjarjarantlr.actions.csharp,
- groovyjarjarantlr.actions.java,
- groovyjarjarantlr.actions.python,
- groovyjarjarantlr.build,
- groovyjarjarantlr.collections,
- groovyjarjarantlr.collections.impl,
- groovyjarjarantlr.debug,
- groovyjarjarantlr.debug.misc,
- groovyjarjarantlr.preprocessor,
- groovyjarjarasm.asm,
- groovyjarjarasm.asm.commons,
- groovyjarjarasm.asm.signature,
- groovyjarjarasm.asm.tree,
- groovyjarjarcommonscli,
  it.sauronsoftware.cron4j,
  javax.jnlp,
  net.sourceforge.barbecue,
@@ -96,51 +49,6 @@ Export-Package: bsh,
  org.adempiere.print.export,
  org.adempiere.process,
  org.adempiere.util,
- org.codehaus.groovy,
- org.codehaus.groovy.ant,
- org.codehaus.groovy.antlr,
- org.codehaus.groovy.antlr.java,
- org.codehaus.groovy.antlr.parser,
- org.codehaus.groovy.antlr.treewalker,
- org.codehaus.groovy.ast,
- org.codehaus.groovy.ast.builder,
- org.codehaus.groovy.ast.expr,
- org.codehaus.groovy.ast.stmt,
- org.codehaus.groovy.binding,
- org.codehaus.groovy.bsf,
- org.codehaus.groovy.classgen,
- org.codehaus.groovy.control,
- org.codehaus.groovy.control.io,
- org.codehaus.groovy.control.messages,
- org.codehaus.groovy.groovydoc,
- org.codehaus.groovy.jsr223,
- org.codehaus.groovy.reflection,
- org.codehaus.groovy.reflection.stdclasses,
- org.codehaus.groovy.runtime,
- org.codehaus.groovy.runtime.callsite,
- org.codehaus.groovy.runtime.dgmimpl,
- org.codehaus.groovy.runtime.dgmimpl.arrays,
- org.codehaus.groovy.runtime.metaclass,
- org.codehaus.groovy.runtime.typehandling,
- org.codehaus.groovy.runtime.wrappers,
- org.codehaus.groovy.syntax,
- org.codehaus.groovy.tools,
- org.codehaus.groovy.tools.ast,
- org.codehaus.groovy.tools.groovydoc,
- org.codehaus.groovy.tools.groovydoc.gstringTemplates,
- org.codehaus.groovy.tools.gse,
- org.codehaus.groovy.tools.javac,
- org.codehaus.groovy.tools.shell,
- org.codehaus.groovy.tools.shell.commands,
- org.codehaus.groovy.tools.shell.util,
- org.codehaus.groovy.tools.xml,
- org.codehaus.groovy.transform,
- org.codehaus.groovy.transform.powerassert,
- org.codehaus.groovy.util,
- org.codehaus.groovy.vmplugin,
- org.codehaus.groovy.vmplugin.v4,
- org.codehaus.groovy.vmplugin.v5,
- org.codehaus.groovy.vmplugin.v6,
  org.compiere,
  org.compiere.acct,
  org.compiere.cm,
@@ -283,4 +191,5 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  org.cryptacular,
  com.itextpdf;bundle-version="0.0.0",
  net.sf.supercsv.super-csv;bundle-version="0.0.0",
- bcprov;bundle-version="1.54.0"
+ bcprov;bundle-version="1.54.0",
+ groovy-all;bundle-version="2.4.7"
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 3c019641d8..cfe1fab328 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -1,8 +1,6 @@
 bin.includes = META-INF/,\
                base.jar,\
                plugin.xml,\
-               bsh-engine.jar,\
-               groovy-engine.jar,\
                jython-engine.jar,\
                jython.jar,\
                cron4j-2.2.5.jar,\
@@ -11,7 +9,6 @@ bin.includes = META-INF/,\
                jfreechart-1.0.19.jar,\
                jnlp.jar,\
                OSGI-INF/,\
-               groovy-all-1.7.5.jar,\
                OSGI-INF/dslocator.xml,\
                OSGI-INF/serverbean.xml,\
                OSGI-INF/statusbean.xml,\
diff --git a/org.adempiere.base/copyjars.xml b/org.adempiere.base/copyjars.xml
index 7e41f38344..c4e0102188 100644
--- a/org.adempiere.base/copyjars.xml
+++ b/org.adempiere.base/copyjars.xml
@@ -6,15 +6,12 @@
                 <get src="${url.maven2.lib}/maven2/org/apache/bsf/bsf-all/3.0-beta3/bsf-all-3.0-beta3.jar" dest="bsf-all-3.0-beta3.jar" usetimestamp="true" verbose="true" retries="5"/>
  		  -->
 		<get src="${url.file.srv}/jarfile/3.1/jython-engine.jar" dest="jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/3.1/groovy-engine.jar" dest="groovy-engine.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/3.1/bsh-engine.jar" dest="bsh-engine.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="cron4j-2.2.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/net/sourceforge/barbecue/barbecue/1.5-beta1/barbecue-1.5-beta1.jar" dest="barbecue-1.5-beta1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar" dest="jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar" dest="jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" />
  		<!-- jnlp is not used in idempiere? -->
-		<get src="${url.maven2.lib}/maven2/org/codehaus/groovy/groovy-all/1.7.5/groovy-all-1.7.5.jar" dest="groovy-all-1.7.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/net/sf/barcode4j/barcode4j/2.1/barcode4j-2.1.jar" dest="barcode4j-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.srv}/jarfile/3.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
  	</target>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 064b10c54e..962bad1c93 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -14,6 +14,9 @@
   <rm:locator pattern="^com\.itextpdf$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^bcpkix$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^bcprov$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^com\.ibm\.icu$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^groovy-all$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^joda-time$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^org\.cryptacular$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^net\.sf\.supercsv\.super-csv$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^org\.atmosphere\.runtime$" searchPathRef="bundles.maven" />
@@ -94,6 +97,11 @@
       <rm:property key="buckminster.mutable" value="false"/>
       <rm:uri format="${url.orbit}"/>
     </rm:provider>
+    <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:uri format="${url.orbit.neon}"/>
+    </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="restlet.p2">
     <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
@@ -141,6 +149,9 @@
         <maven:entry groupId="org.cryptacular" artifactId="cryptacular" name="org.cryptacular" />
         <maven:entry groupId="net.sf.supercsv" artifactId="super-csv" name="net.sf.supercsv.super-csv" />
         <maven:entry groupId="org.atmosphere" artifactId="atmosphere-runtime" name="org.atmosphere.runtime" />
+        <maven:entry groupId="org.codehaus.groovy" artifactId="groovy-all" name="groovy-all" />
+        <maven:entry groupId="com.ibm.icu" artifactId="icu4j" name="com.ibm.icu" />
+        <maven:entry groupId="joda-time" artifactId="joda-time" name="joda-time" />
       </maven:mappings>
     </rm:provider>
   </rm:searchPath>
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 07695a5190..f8742f20b0 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -21,6 +21,7 @@ url.maven.restlet=http://maven.restlet.org
 url.equinox=http://download.eclipse.org/eclipse/updates/4.4
 url.jetty=http://download.eclipse.org/jetty/updates/jetty-bundles-9.x
 url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository
+url.orbit.neon=http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/
 
 url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file
 
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index cc955f6fad..6cef900449 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -71,7 +71,8 @@ Export-Package: com.jgoodies.looks,
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.ui;bundle-version="0.0.0",
  org.restlet;bundle-version="0.0.0",
- org.restlet.ext.servlet;bundle-version="0.0.0"
+ org.restlet.ext.servlet;bundle-version="0.0.0",
+ groovy-all;bundle-version="0.0.0"
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.adempiere.base
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8