merge experimental into default

2018-03-19 11:37:31 -03:00 · 2018-03-19 11:37:31 -03:00 · fae42e649d
parent 476b1283e8 14ba654d81
commit fae42e649d
490 changed files with 7542 additions and 840 deletions
--- a/.hgignore
+++ b/.hgignore
@ -7,6 +7,7 @@ alpn-boot.jar
 .sonarlint
 org.adempiere.webstore/bin
 org.idempiere.hazelcast.service.config/bin
+*/target
 syntax: regexp
 ^adempiere$
 ^org\.adempiere\.install/lib$
@ -69,8 +70,8 @@ syntax: regexp
 ^work/.*$
 ^hazelcast\.xml$

-swingclient.product.*
-server.product.*
+swingclient.product.*\.launch
+server.product.*\.launch

 ^org\.zkoss\.zk\.library/bin$
 \.class$
--- a/fitnesse/copyjars.xml
+++ b/fitnesse/copyjars.xml
@ -1,6 +0,0 @@
-<project name="zklibrary" basedir="." default="copy">
-	<target name="copy">
-		<!-- maybe it's same file in org.idempiere.fitnesse.server, just diference version-->
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/5.1/fitnesse2.jar" dest="fitnesse2.jar" usetimestamp="true" verbose="true" retries="5"/>
-	</target>
-</project>
--- a/org.adempiere.base-feature/.project
+++ b/org.adempiere.base-feature/.project
@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
--- a/org.adempiere.base-feature/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.base-feature/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.base-feature/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.base-feature/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.base"
+      id="org.adempiere.base.feature"
      label="Adempiere Base"
      version="5.1.0.qualifier">

@ -17,23 +17,23 @@
   </license>

   <includes
-         id="org.compiere.db.provider"
+         id="org.compiere.db.provider.feature"
         version="0.0.0"/>

   <includes
-         id="org.adempiere.payment.processor"
+         id="org.adempiere.payment.processor.feature"
         version="0.0.0"/>

   <includes
-         id="org.adempiere.pipo"
+         id="org.adempiere.pipo.feature"
         version="0.0.0"/>

   <includes
-         id="org.adempiere.replication"
+         id="org.adempiere.replication.feature"
         version="0.0.0"/>

   <includes
-         id="org.adempiere.report.jasper"
+         id="org.adempiere.report.jasper.feature"
         version="0.0.0"/>

   <plugin
@ -340,7 +340,7 @@
         id="groovy-all"
         download-size="0"
         install-size="0"
-         version="0.0.0"
+         version="2.4.13"
         unpack="false"/>

   <plugin
@ -414,4 +414,11 @@
         version="0.0.0"
         unpack="false"/>

+   <plugin
+         id="org.apache.commons.lang3"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
--- a/org.adempiere.base-feature/pom.xml
+++ b/org.adempiere.base-feature/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.base.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+</project>
--- a/org.adempiere.base.callout/.classpath
+++ b/org.adempiere.base.callout/.classpath
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/org.adempiere.base.callout/.project
+++ b/org.adempiere.base.callout/.project
@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
--- a/org.adempiere.base.callout/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.base.callout/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
--- a/org.adempiere.base.callout/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.base.callout/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@ -9,4 +9,5 @@ Eclipse-RegisterBuddy: org.adempiere.base
 Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
 Bundle-ActivationPolicy: lazy
 Export-Package: org.compiere.model
+Bundle-ClassPath: .

--- a/org.adempiere.base.callout/build.properties
+++ b/org.adempiere.base.callout/build.properties
@ -1,6 +1,6 @@
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
               OSGI-INF/costadjustmentcalloutfactory.xml,\
-               OSGI-INF/
+               OSGI-INF/,\
+               .
+output.. = target/classes/
 source.. = src/
--- a/org.adempiere.base.callout/pom.xml
+++ b/org.adempiere.base.callout/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.base.callout</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
--- a/org.adempiere.base.process/.classpath
+++ b/org.adempiere.base.process/.classpath
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/org.adempiere.base.process/.project
+++ b/org.adempiere.base.process/.project
@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
--- a/org.adempiere.base.process/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.base.process/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
--- a/org.adempiere.base.process/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.base.process/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@ -14,3 +14,4 @@ Import-Package: javax.mail;version="1.5",
 javax.servlet.http;version="2.5.0",
 org.apache.commons.collections.keyvalue;version="3.2.0"
 Eclipse-RegisterBuddy: org.adempiere.base
+Bundle-ClassPath: .
--- a/org.adempiere.base.process/build.properties
+++ b/org.adempiere.base.process/build.properties
@ -1,4 +1,4 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
               .
+output.. = target/classes/
+source.. = src/
--- a/org.adempiere.base.process/pom.xml
+++ b/org.adempiere.base.process/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.base.process</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<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="jython-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="jython.jar"/>
-	<classpathentry exported="true" kind="lib" path="cron4j-2.2.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="jnlp.jar"/>
-	<classpathentry exported="true" kind="lib" path="commons-validator-1.6.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry exported="true" kind="lib" path="lib/bsh.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-validator.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cron4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jnlp.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jython-engine.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jython.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/org.adempiere.base/.project
+++ b/org.adempiere.base/.project
@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
--- a/org.adempiere.base/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.base/.settings/org.eclipse.core.resources.prefs
@ -1,6 +1,6 @@
-#Fri Apr 17 16:27:32 EEST 2009
 eclipse.preferences.version=1
 encoding//src/org/adempiere/model/MAttributeSetInstance.java=UTF-8
 encoding//src/org/compiere/util/AmtInWords_HR.java=UTF-8
 encoding//src/org/compiere/util/AmtInWords_VI.java=UTF-8
 encoding//src/org/compiere/util/IniRes_hr.java=UTF-8
+encoding/<project>=UTF-8
--- a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,111 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.8
--- a/org.adempiere.base/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.base/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Core
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: base.jar,
- jython-engine.jar,
- jython.jar,
- cron4j-2.2.5.jar,
- jnlp.jar,
- bsh-2.0b6.jar,
- commons-validator-1.6.jar
+Bundle-ClassPath: .,
+ lib/bsh.jar,
+ lib/commons-validator.jar,
+ lib/cron4j.jar,
+ lib/jnlp.jar,
+ lib/jython-engine.jar,
+ lib/jython.jar
 Export-Package: bsh,
 bsh.classpath,
 bsh.collection,
@ -121,5 +121,5 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
 com.itextpdf;bundle-version="0.0.0",
 net.sf.supercsv.super-csv;bundle-version="0.0.0",
 bcprov;bundle-version="1.54.0",
- groovy-all;bundle-version="[2.4.7,2.5.0)",
- org.krysalis.barcode4j;bundle-version="2.1.0"
+ groovy-all;bundle-version="0.0.0",
+ org.krysalis.barcode4j;bundle-version="0.0.0"
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@ -1,10 +1,4 @@
-bin.includes = META-INF/,\
-               base.jar,\
-               plugin.xml,\
-               jython-engine.jar,\
-               jython.jar,\
-               cron4j-2.2.5.jar,\
-               jnlp.jar,\
+bin.includes = plugin.xml,\
               OSGI-INF/,\
               OSGI-INF/dslocator.xml,\
               OSGI-INF/serverbean.xml,\
@ -24,8 +18,14 @@ bin.includes = META-INF/,\
               OSGI-INF/addressvalidationeventhandler.xml,\
               OSGI-INF/defaultproductpricingfactory.xml,\
               schema/,\
-               bsh-2.0b6.jar,\
-               commons-validator-1.6.jar
-output.base.jar = bin/
+               .,\
+               META-INF/,\
+               lib/bsh.jar,\
+               lib/commons-validator.jar,\
+               lib/cron4j.jar,\
+               lib/jnlp.jar,\
+               lib/jython-engine.jar,\
+               lib/jython.jar
 src.includes = schema/
-source.base.jar = src/
+source.. = src/
+output.. = target/classes/
--- a/org.adempiere.base/copyjars.xml
+++ b/org.adempiere.base/copyjars.xml
@ -1,15 +1,16 @@
 <project name="zklibrary" basedir="." default="copy">
+ 	<mkdir dir="lib" />
 	<target name="copy">
-		<get src="${url.maven2.lib}/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar" dest="bsh-2.0b6.jar" usetimestamp="true" verbose="true" retries="5" />
- 		<!-- bsf-all-3.0-beta3.jar replace for grovy-engine, jyyhon-enjine, bsh-engine
- 	      http://mvnrepository.com/artifact/org.apache.bsf/bsf-all/3.0-beta3
-                <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/5.1/jython-engine.jar" dest="jython-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/commons-validator/commons-validator/1.6/commons-validator-1.6.jar" dest="commons-validator-1.6.jar" usetimestamp="true" verbose="true" retries="5" />
- 		<!-- jnlp is not used in idempiere? -->
-		<get src="${url.file.srv}/jarfile/5.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.maven2}/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar" dest="lib/bsh.jar" usetimestamp="true" verbose="true" retries="5" />
+        <!-- bsf-all-3.0-beta3.jar replace for grovy-engine, jyyhon-enjine, bsh-engine
+          http://mvnrepository.com/artifact/org.apache.bsf/bsf-all/3.0-beta3
+                <get src="${url.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.maven2.ga}/com/sun/script/jython-engine/20080611/jython-engine-20080611.jar" dest="lib/jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.maven2}/org/python/jython/2.2.1/jython-2.2.1.jar" dest="lib/jython.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.maven2}/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="lib/cron4j.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.maven2}/commons-validator/commons-validator/1.6/commons-validator-1.6.jar" dest="lib/commons-validator.jar" usetimestamp="true" verbose="true" retries="5" />
+        <!-- jnlp is not used in idempiere? -->
+        <get src="${url.maven2.opennms}/javax/jnlp/jnlp/1.5.0/jnlp-1.5.0.jar" dest="lib/jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
--- a/org.adempiere.base/pom.xml
+++ b/org.adempiere.base/pom.xml
@ -0,0 +1,76 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.base</artifactId>
+	<packaging>eclipse-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<configuration>
+					<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
+					<compilerArgument>-warn:+forbidden</compilerArgument>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.apache-extras.beanshell</groupId>
+									<artifactId>bsh</artifactId>
+									<version>2.0b6</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.sun.script</groupId>
+									<artifactId>jython-engine</artifactId>
+									<version>20080611</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.python</groupId>
+									<artifactId>jython</artifactId>
+									<version>2.2.1</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>it.sauronsoftware.cron4j</groupId>
+									<artifactId>cron4j</artifactId>
+									<version>2.2.5</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>commons-validator</groupId>
+									<artifactId>commons-validator</artifactId>
+									<version>1.6</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>javax.jnlp</groupId>
+									<artifactId>jnlp</artifactId>
+									<version>1.5.0</version>
+								</artifactItem>
+							</artifactItems>
+							<outputDirectory>lib</outputDirectory>
+							<stripVersion>true</stripVersion>
+							<overWriteReleases>true</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
--- a/org.adempiere.bundles.external-feature/.project
+++ b/org.adempiere.bundles.external-feature/.project
@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
--- a/org.adempiere.bundles.external-feature/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.bundles.external-feature/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.bundles.external-feature/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.bundles.external-feature/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.bundles.external-feature/feature.xml
+++ b/org.adempiere.bundles.external-feature/feature.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.bundles.external"
+      id="org.adempiere.bundles.external.feature"
      label="External bundles"
      version="5.1.0.qualifier"
      provider-name="Adempiere.org">
--- a/org.adempiere.bundles.external-feature/pom.xml
+++ b/org.adempiere.bundles.external-feature/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.bundles.external.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+</project>
--- a/org.adempiere.eclipse.equinox.http.servlet/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servlet/.classpath
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/org.adempiere.eclipse.equinox.http.servlet/.project
+++ b/org.adempiere.eclipse.equinox.http.servlet/.project
@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
--- a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
--- a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
@ -8,7 +8,7 @@ Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
 et;tag=v20100503
 Bundle-Activator: org.eclipse.equinox.http.servlet.internal.Activator
 Export-Package: org.eclipse.equinox.http.servlet;version="1.1.0"
-Bundle-Version: 1.1.0.v20100503
+Bundle-Version: 5.1.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Name: %bundleName
@ -20,3 +20,4 @@ Import-Package: javax.servlet;version="2.3",
 org.osgi.framework;version="1.3.0",
 org.osgi.service.http;version="1.2.0"
 Bundle-ManifestVersion: 2
+Bundle-ClassPath: .
--- a/org.adempiere.eclipse.equinox.http.servlet/build.properties
+++ b/org.adempiere.eclipse.equinox.http.servlet/build.properties
@ -1,7 +1,6 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.properties
-jre.compilation.profile = J2SE-1.3
+               plugin.properties,\
+               .
 javacErrors.. = -assertIdentifier,-enumIdentifier
+output.. = target/classes/
+source.. = src/
--- a/org.adempiere.eclipse.equinox.http.servlet/pom.xml
+++ b/org.adempiere.eclipse.equinox.http.servlet/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.eclipse.equinox.http.servlet</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.project
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.project
@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
@ -9,10 +9,11 @@ Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
 letbridge;tag=v20100503
 Bundle-Activator: org.eclipse.equinox.http.servletbridge.internal.Acti
 vator
-Bundle-Version: 1.0.200.v20100503
+Bundle-Version: 5.1.0.qualifier
 Import-Package: javax.servlet;version="2.3",javax.servlet.http;version
 ="2.3",org.eclipse.equinox.http.servlet;version="1.0.0",org.eclipse.e
 quinox.servletbridge;version="1.0.0",org.osgi.framework;version="1.3.
 0",org.osgi.service.http;version="1.2.0"
 Bundle-ManifestVersion: 2
+Bundle-ClassPath: .

--- a/org.adempiere.eclipse.equinox.http.servletbridge/build.properties
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/build.properties
@ -1,7 +1,6 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.properties
-jre.compilation.profile = J2SE-1.3
+               plugin.properties,\
+               .
 javacErrors.. = -assertIdentifier,-enumIdentifier
+output.. = target/classes/
+source.. = src/
--- a/org.adempiere.eclipse.equinox.http.servletbridge/pom.xml
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.eclipse.equinox.http.servletbridge</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
--- a/org.adempiere.eclipse.equinox.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.servletbridge/.classpath
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/org.adempiere.eclipse.equinox.servletbridge/.project
+++ b/org.adempiere.eclipse.equinox.servletbridge/.project
@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@ -20,9 +25,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/.jsdtscope
+++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/.jsdtscope
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="">
+		<attributes>
+			<attribute name="provider" value="org.eclipse.wst.jsdt.web.core.internal.project.ModuleSourcePathProvider"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path=""/>
+</classpath>
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.wst.jsdt.ui.superType.container
@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.wst.jsdt.ui.superType.name
@ -0,0 +1 @@
+Window
--- a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
@ -7,9 +7,10 @@ Bundle-SymbolicName: org.adempiere.eclipse.equinox.servletbridge;singleton:=true
 Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
 org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbr
 idge;tag=v20100503
-Bundle-Version: 1.2.0.v20100503
+Bundle-Version: 5.1.0.qualifier
 Export-Package: org.eclipse.equinox.servletbridge;version="1.1.0"
 Import-Package: javax.servlet;version="2.3.0",
 javax.servlet.http;version="2.3.0",
 org.eclipse.equinox.http.servlet;version="1.1.0"
 Bundle-ManifestVersion: 2
+Bundle-ClassPath: .
--- a/org.adempiere.eclipse.equinox.servletbridge/build.properties
+++ b/org.adempiere.eclipse.equinox.servletbridge/build.properties
@ -1,7 +1,6 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.properties
-jre.compilation.profile = J2SE-1.3
+               plugin.properties,\
+               .
 javacErrors.. = -assertIdentifier,-enumIdentifier
+output.. = target/classes/
+source.. = src/
--- a/org.adempiere.eclipse.equinox.servletbridge/pom.xml
+++ b/org.adempiere.eclipse.equinox.servletbridge/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.eclipse.equinox.servletbridge</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
--- a/org.adempiere.extend/.classpath
+++ b/org.adempiere.extend/.classpath
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="spiffy-with_source-all-0.05.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/org.adempiere.extend/.project
+++ b/org.adempiere.extend/.project
@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
--- a/org.adempiere.extend/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.extend/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
--- a/org.adempiere.extend/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.extend/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.extend/FunctionalTestSuite.launch
+++ b/org.adempiere.extend/FunctionalTestSuite.launch
@ -14,6 +14,8 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="test.functional.FunctionalTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.adempiere.extend"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
--- a/org.adempiere.extend/InventoryTest.launch
+++ b/org.adempiere.extend/InventoryTest.launch
@ -40,7 +40,9 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tools/lib/jfreechart-1.0.11.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tools/lib/javaee.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="test.functional.inventory.InventoryTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.adempiere.extend"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@ -3,8 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere extend
 Bundle-SymbolicName: org.adempiere.extend;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: extend.jar,
- spiffy-with_source-all-0.05.jar
 Eclipse-RegisterBuddy: org.adempiere.tools
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: compiere.model,
@ -17,3 +15,4 @@ Import-Package: junit.framework;version="3.8.2",
 org.junit.runners;version="4.8.2",
 org.supercsv.io,
 org.supercsv.prefs
+Bundle-ClassPath: .
--- a/org.adempiere.extend/Profile-SingleMProductTest.launch
+++ b/org.adempiere.extend/Profile-SingleMProductTest.launch
@ -26,6 +26,8 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="test.performance.SingleMProductTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.adempiere.extend"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
--- a/org.adempiere.extend/buckminster.cspex
+++ b/org.adempiere.extend/buckminster.cspex
@ -1,19 +0,0 @@
-<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
-	xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
-	<actions>
-		<!-- public action with ant actor to do the actual copying -->
-		<cs:public name="fetch.dependency.jars" actor="ant">
-			<cs:actorProperties>
-				<cs:property key="buildFile" value="copyjars.xml" />
-				<cs:property key="targets" value="copy" />
-			</cs:actorProperties>
-		</cs:public>		
-	</actions>
-	<groups>
-		<!-- buckminster.prebind the prebind group will be executed during materialization -->
-		<cs:private name="buckminster.postbind">
-			<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />			
-		</cs:private>
-	</groups>
-</cspecExtension>
--- a/org.adempiere.extend/build.properties
+++ b/org.adempiere.extend/build.properties
@ -1,7 +1,4 @@
-output.extend.jar = bin/
 bin.includes = META-INF/,\
-               extend.jar,\
-               spiffy-with_source-all-0.05.jar
-jars.compile.order = extend.jar
-source.extend.jar = src/
-
+               .
+output.. = target/classes/
+source.. = src/
--- a/org.adempiere.extend/copyjars.xml
+++ b/org.adempiere.extend/copyjars.xml
@ -1,6 +0,0 @@
-<project name="zklibrary" basedir="." default="copy">
-	<target name="copy">
-		<get src="${url.file.srv}/jarfile/5.1/spiffy-with_source-all-0.05.jar" dest="spiffy-with_source-all-0.05.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/extend.jar" dest="extend.jar" usetimestamp="true" verbose="true" retries="5" />
-	</target>
-</project>
--- a/org.adempiere.extend/pom.xml
+++ b/org.adempiere.extend/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.extend</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
--- a/org.adempiere.install/.classpath
+++ b/org.adempiere.install/.classpath
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<accessrules>
 			<accessrule kind="accessible" pattern="sun/security/tools/*"/>
 		</accessrules>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="ant-contrib-1.0b3.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/org.adempiere.install/.project
+++ b/org.adempiere.install/.project
@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
--- a/org.adempiere.install/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.install/.settings/org.eclipse.core.resources.prefs
@ -1,3 +1,3 @@
-#Fri Apr 17 16:24:40 EEST 2009
 eclipse.preferences.version=1
 encoding//src/org/compiere/install/SetupRes_hr.java=UTF-8
+encoding/<project>=UTF-8
--- a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
--- a/org.adempiere.install/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.install/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@ -3,8 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Setup
 Bundle-SymbolicName: org.adempiere.install;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: install.jar,
- ant-contrib-1.0b3.jar
 Export-Package: org.adempiere.install,
 org.compiere.install
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
@ -18,3 +16,4 @@ Import-Package: javax.mail;version="1.5",
 org.osgi.framework
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.adempiere.install.InstallBundleActivator
+Bundle-ClassPath: .
--- a/org.adempiere.install/buckminster.cspex
+++ b/org.adempiere.install/buckminster.cspex
@ -1,19 +0,0 @@
-<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
-	xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
-	<actions>
-		<!-- public action with ant actor to do the actual copying -->
-		<cs:public name="fetch.dependency.jars" actor="ant">
-			<cs:actorProperties>
-				<cs:property key="buildFile" value="copyjars.xml" />
-				<cs:property key="targets" value="copy" />
-			</cs:actorProperties>
-		</cs:public>
-	</actions>
-	<groups>
-		<!-- buckminster.prebind the prebind group will be executed during materialization -->
-		<cs:private name="buckminster.postbind">
-			<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />			
-		</cs:private>
-	</groups>
-</cspecExtension>
--- a/org.adempiere.install/build.properties
+++ b/org.adempiere.install/build.properties
@ -1,6 +1,5 @@
-source.install.jar = src/
-output.install.jar = bin/
 bin.includes = META-INF/,\
-               install.jar,\
               plugin.xml,\
-               ant-contrib-1.0b3.jar
+               .
+output.. = target/classes/
+source.. = src/
--- a/org.adempiere.install/copyjars.xml
+++ b/org.adempiere.install/copyjars.xml
@ -1,5 +0,0 @@
-<project name="zklibrary" basedir="." default="copy">
-	<target name="copy">
-		<get src="${url.maven2.lib}/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar" dest="ant-contrib-1.0b3.jar" usetimestamp="true" verbose="true" retries="5" />
-	</target>
-</project>
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@ -24,7 +24,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:false,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.10.1.v20170504-0840@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:false,org.apache.commons.codec*1.9.0.v20170208-1614@default:false,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.scr*2.0.10.v20170501-2007@default:default,org.apache.felix.scr*2.0.8.v20170501-2007@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.0.5.v201605172130@default:default,org.restlet*2.3.2.v20150501-1520@default:default,org.slf4j.api*1.7.10.v20170428-1633@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.jcl@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
--- a/org.adempiere.install/pom.xml
+++ b/org.adempiere.install/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.install</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
--- a/org.adempiere.payment.processor-feature/.project
+++ b/org.adempiere.payment.processor-feature/.project
@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
--- a/org.adempiere.payment.processor-feature/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.payment.processor-feature/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.payment.processor-feature/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.payment.processor-feature/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.payment.processor-feature/feature.xml
+++ b/org.adempiere.payment.processor-feature/feature.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.payment.processor"
+      id="org.adempiere.payment.processor.feature"
      label="Payment Processor"
      version="5.1.0.qualifier">

@ -16,10 +16,6 @@
      [Enter License Description here.]
   </license>

-   <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
-   </requires>
-
   <plugin
         id="org.adempiere.payment.processor"
         download-size="0"
--- a/org.adempiere.payment.processor-feature/pom.xml
+++ b/org.adempiere.payment.processor-feature/pom.xml
@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.idempiere</groupId>
+		<artifactId>org.idempiere.parent</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.adempiere.payment.processor.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+</project>
--- a/org.adempiere.payment.processor/.classpath
+++ b/org.adempiere.payment.processor/.classpath
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="jpayment.jar"/>
-	<classpathentry exported="true" kind="lib" path="payflow.jar"/>
-	<classpathentry exported="true" kind="lib" path="Verisign.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry exported="true" kind="lib" path="lib/jpayment.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/payflow.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/Verisign.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/org.adempiere.payment.processor/.project
+++ b/org.adempiere.payment.processor/.project
@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
--- a/org.adempiere.payment.processor/.settings/org.eclipse.core.resources.prefs
+++ b/org.adempiere.payment.processor/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
--- a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
--- a/org.adempiere.payment.processor/.settings/org.eclipse.m2e.core.prefs
+++ b/org.adempiere.payment.processor/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@ -5,8 +5,8 @@ Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
 Bundle-Version: 5.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
-Bundle-ClassPath: jpayment.jar,
- payflow.jar,
- Verisign.jar,
- .
+Bundle-ClassPath: .,
+ lib/jpayment.jar,
+ lib/payflow.jar,
+ lib/Verisign.jar

--- a/org.adempiere.payment.processor/build.properties
+++ b/org.adempiere.payment.processor/build.properties
@ -1,8 +1,8 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
+               plugin.xml,\
               .,\
-               jpayment.jar,\
-               payflow.jar,\
-               Verisign.jar,\
-               plugin.xml
+               lib/jpayment.jar,\
+               lib/payflow.jar,\
+               lib/Verisign.jar
+source.. = src/
+output.. = target/classes/
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`org.eclipse.wst.jsdt.launching.baseBrowserLibrary`