From d7b2501ea6dd5e1a4d7223386a9df12358509ee7 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Tue, 27 Feb 2018 14:34:38 +0700
Subject: [PATCH] IDEMPIERE-3531:refine parameter naming covention

---
 org.adempiere.report.jasper.library/pom.xml |   6 +-
 org.idempiere.maven.to.p2/pom.xml           | 104 ++++----
 org.idempiere.parent/pom.xml                | 267 +++-----------------
 3 files changed, 91 insertions(+), 286 deletions(-)

diff --git a/org.adempiere.report.jasper.library/pom.xml b/org.adempiere.report.jasper.library/pom.xml
index a4ba5b6da9..2385027db6 100644
--- a/org.adempiere.report.jasper.library/pom.xml
+++ b/org.adempiere.report.jasper.library/pom.xml
@@ -36,17 +36,17 @@
 								<artifactItem>
 									<groupId>net.sf.jasperreports</groupId>
 									<artifactId>jasperreports-chart-themes</artifactId>
-									<version>${jp-version}</version>
+									<version>${jp.version}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.sf.jasperreports</groupId>
 									<artifactId>jasperreports-chart-customizers</artifactId>
-									<version>${jp-version}</version>
+									<version>${jp.version}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.sf.jasperreports</groupId>
 									<artifactId>jasperreports-functions</artifactId>
-									<version>${jp-version}</version>
+									<version>${jp.version}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.mozilla</groupId>
diff --git a/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/pom.xml
index 75f4d79dde..2d12b8b643 100644
--- a/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/pom.xml
@@ -223,7 +223,7 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.eclipse.jetty:jetty-alpn-server:jar:${jetty-version}</id>
+											<id>org.eclipse.jetty:jetty-alpn-server:jar:${jetty.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -273,93 +273,93 @@
 									<generateSourceFeature>true</generateSourceFeature>
 									<artifacts>
 										<artifact>
-											<id>org.zkoss.zk:zkplus:jar:sources:${zk-version}</id>
+											<id>org.zkoss.zk:zkplus:jar:sources:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
-												<Eclipse-SourceBundle>zkplus;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
+												<Eclipse-SourceBundle>zkplus;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
 												<Bundle-SymbolicName>zkplus</Bundle-SymbolicName>
 												<Bundle-Name>zkplus.source</Bundle-Name>
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.common:zweb:jar:sources:${zk-version}</id>
+											<id>org.zkoss.common:zweb:jar:sources:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
-												<Eclipse-SourceBundle>zweb;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
+												<Eclipse-SourceBundle>zweb;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
 												<Bundle-SymbolicName>zweb</Bundle-SymbolicName>
 												<Bundle-Name>zweb.source</Bundle-Name>
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.zk:zul:jar:sources:${zk-version}</id>
+											<id>org.zkoss.zk:zul:jar:sources:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
-												<Eclipse-SourceBundle>zul;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
+												<Eclipse-SourceBundle>zul;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
 												<Bundle-SymbolicName>zul</Bundle-SymbolicName>
 												<Bundle-Name>zul.source</Bundle-Name>
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.zk:zk:jar:sources:${zk-version}</id>
+											<id>org.zkoss.zk:zk:jar:sources:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
-												<Eclipse-SourceBundle>zk;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
+												<Eclipse-SourceBundle>zk;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
 												<Bundle-SymbolicName>zk</Bundle-SymbolicName>
 												<Bundle-Name>zk.source</Bundle-Name>
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.zk:zhtml:jar:sources:${zk-version}</id>
+											<id>org.zkoss.zk:zhtml:jar:sources:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
-												<Eclipse-SourceBundle>zhtml;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
+												<Eclipse-SourceBundle>zhtml;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
 												<Bundle-SymbolicName>zhtml</Bundle-SymbolicName>
 												<Bundle-Name>zhtml.source</Bundle-Name>
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.zk:zkbind:jar:sources:${zk-version}</id>
+											<id>org.zkoss.zk:zkbind:jar:sources:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
-												<Eclipse-SourceBundle>zkbind;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
+												<Eclipse-SourceBundle>zkbind;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
 												<Bundle-SymbolicName>zkbind</Bundle-SymbolicName>
 												<Bundle-Name>zkbind.source</Bundle-Name>
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.common:zel:jar:sources:${zk-version}</id>
+											<id>org.zkoss.common:zel:jar:sources:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
-												<Eclipse-SourceBundle>zel;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
+												<Eclipse-SourceBundle>zel;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
 												<Bundle-SymbolicName>zel</Bundle-SymbolicName>
 												<Bundle-Name>zel.source</Bundle-Name>
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.common:zcommon:jar:sources:${zk-version}</id>
+											<id>org.zkoss.common:zcommon:jar:sources:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
-												<Eclipse-SourceBundle>zcommon;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
+												<Eclipse-SourceBundle>zcommon;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
 												<Bundle-SymbolicName>zcommon</Bundle-SymbolicName>
 												<Bundle-Name>zcommon.source</Bundle-Name>
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.javassist:javassist:jar:sources:${zk-javassist-src-version}</id>
+											<id>org.javassist:javassist:jar:sources:${zk.javassist.src.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
-												<Eclipse-SourceBundle>zjavassist;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
+												<Eclipse-SourceBundle>zjavassist;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
 												<Bundle-SymbolicName>zjavassist</Bundle-SymbolicName>
-												<Bundle-Version>${zk-version}</Bundle-Version>
+												<Bundle-Version>${zk.version}</Bundle-Version>
 												<Bundle-Name>zjavassist.source</Bundle-Name>
 											</instructions>
 										</artifact>
@@ -377,7 +377,7 @@
 									<generateSourceFeature>true</generateSourceFeature>
 									<artifacts>
 										<artifact>
-											<id>org.zkoss.zk:zkplus:${zk-version}</id>
+											<id>org.zkoss.zk:zkplus:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
@@ -386,7 +386,7 @@
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.common:zweb:${zk-version}</id>
+											<id>org.zkoss.common:zweb:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
@@ -395,7 +395,7 @@
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.zk:zul:${zk-version}</id>
+											<id>org.zkoss.zk:zul:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
@@ -404,7 +404,7 @@
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.zk:zk:${zk-version}</id>
+											<id>org.zkoss.zk:zk:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
@@ -413,7 +413,7 @@
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.zk:zhtml:${zk-version}</id>
+											<id>org.zkoss.zk:zhtml:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
@@ -422,7 +422,7 @@
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.zk:zkbind:${zk-version}</id>
+											<id>org.zkoss.zk:zkbind:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
@@ -431,7 +431,7 @@
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.common:zel:${zk-version}</id>
+											<id>org.zkoss.common:zel:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
@@ -440,7 +440,7 @@
 											</instructions>
 										</artifact>
 										<artifact>
-											<id>org.zkoss.common:zcommon:${zk-version}</id>
+											<id>org.zkoss.common:zcommon:${zk.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<instructions>
@@ -462,7 +462,7 @@
 									<generateSourceFeature>true</generateSourceFeature>
 									<artifacts>
 										<artifact>
-											<id>net.sf.jasperreports:jasperreports:jar:${jp-version}</id>
+											<id>net.sf.jasperreports:jasperreports:jar:${jp.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
 											<override>true</override>
@@ -477,18 +477,18 @@
 
 							<artifacts>
 								<artifact>
-									<id>org.javassist:javassist:${zk-javassist-src-version}</id>
+									<id>org.javassist:javassist:${zk.javassist.src.version}</id>
 									<source>false</source>
 									<transitive>false</transitive>
 									<override>true</override>
 									<instructions>
 										<Bundle-SymbolicName>zjavassist</Bundle-SymbolicName>
 										<Bundle-Name>zjavassist</Bundle-Name>
-										<!-- this work-around can generate bundle with version is ${zk-version}, 
-											but feature still use version from artifact id, mean ${zk-javassist-src-version}, 
+										<!-- this work-around can generate bundle with version is ${zk.version}, 
+											but feature still use version from artifact id, mean ${zk.javassist.src.version}, 
 											it let target recognize wrong bundle -->
 										<!-- need to adjust feature at next step -->
-										<Bundle-Version>${zk-version}</Bundle-Version>
+										<Bundle-Version>${zk.version}</Bundle-Version>
 									</instructions>
 								</artifact>
 							</artifacts>
@@ -511,7 +511,7 @@
 						<configuration>
 							<url>${zk-osgi-zip-file}</url>
 							<unpack>true</unpack>
-							<outputFileName>zk-bin-osgi-${zk-version}.zip</outputFileName>
+							<outputFileName>zk-bin-osgi-${zk.version}.zip</outputFileName>
 							<outputDirectory>${project.build.directory}</outputDirectory>
 							<retries>5</retries>
 						</configuration>
@@ -532,40 +532,40 @@
 						<configuration>
 							<fileSets>
 								<fileSet>
-									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zcommon.osgi.jar</sourceFile>
-									<destinationFile>${project.build.directory}/repository/plugins/zcommon_${zk-version}.jar</destinationFile>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zcommon.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zcommon_${zk.version}.jar</destinationFile>
 								</fileSet>
 								<fileSet>
-									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zel.osgi.jar</sourceFile>
-									<destinationFile>${project.build.directory}/repository/plugins/zel_${zk-version}.jar</destinationFile>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zel.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zel_${zk.version}.jar</destinationFile>
 								</fileSet>
 								<fileSet>
-									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zhtml.osgi.jar</sourceFile>
-									<destinationFile>${project.build.directory}/repository/plugins/zhtml_${zk-version}.jar</destinationFile>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zhtml.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zhtml_${zk.version}.jar</destinationFile>
 								</fileSet>
 								<fileSet>
-									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zjavassist.osgi.jar</sourceFile>
-									<destinationFile>${project.build.directory}/repository/plugins/zjavassist_${zk-version}.jar</destinationFile>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zjavassist.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zjavassist_${zk.version}.jar</destinationFile>
 								</fileSet>
 								<fileSet>
-									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zk.osgi.jar</sourceFile>
-									<destinationFile>${project.build.directory}/repository/plugins/zk_${zk-version}.jar</destinationFile>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zk.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zk_${zk.version}.jar</destinationFile>
 								</fileSet>
 								<fileSet>
-									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zkbind.osgi.jar</sourceFile>
-									<destinationFile>${project.build.directory}/repository/plugins/zkbind_${zk-version}.jar</destinationFile>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkbind.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zkbind_${zk.version}.jar</destinationFile>
 								</fileSet>
 								<fileSet>
-									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zkplus.osgi.jar</sourceFile>
-									<destinationFile>${project.build.directory}/repository/plugins/zkplus_${zk-version}.jar</destinationFile>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkplus.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zkplus_${zk.version}.jar</destinationFile>
 								</fileSet>
 								<fileSet>
-									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zul.osgi.jar</sourceFile>
-									<destinationFile>${project.build.directory}/repository/plugins/zul_${zk-version}.jar</destinationFile>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zul.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zul_${zk.version}.jar</destinationFile>
 								</fileSet>
 								<fileSet>
-									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zweb.osgi.jar</sourceFile>
-									<destinationFile>${project.build.directory}/repository/plugins/zweb_${zk-version}.jar</destinationFile>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zweb.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zweb_${zk.version}.jar</destinationFile>
 								</fileSet>
 								<fileSet>
 									<sourceFile>${project.build.directory}/repository/artifacts.jar</sourceFile>
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index 2db65a2ffb..151fd55935 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -9,36 +9,20 @@
 	<name>Maven parent project for idempiere</name>
 
 	<properties>
-		<tycho-version>1.1.0</tycho-version>
-		<tycho.extras.version>${tycho-version}</tycho.extras.version>
+		<tycho.version>1.1.0</tycho.version>
+		<tycho.extras.version>${tycho.version}</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jetty-version>9.4.7.v20170914</jetty-version>
-		<jp-version>6.3.1</jp-version>
-		<zk-version>8.5.0</zk-version>
-		<zk-javassist-src-version>3.18.2-GA</zk-javassist-src-version>
-		<maven-dependency-version>3.0.2</maven-dependency-version>
-		<download-maven-version>1.4.0</download-maven-version>
-		<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
+		<jetty.version>9.4.7.v20170914</jetty.version>
+		<jp.version>6.3.1</jp.version>
+		<zk.version>8.5.0</zk.version>
+		<zk.javassist.src.version>3.18.2-GA</zk.javassist.src.version>
+		<maven.dependency.version>3.0.2</maven.dependency.version>
+		<download.maven.version>1.4.0</download.maven.version>
+		<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
+		
+		<!-- default value of properties, use when run without profile -->
 		<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
-
-		<idempiere-repository-url>https://sourceforge.net/projects/idempiere/files/binary.file/jarfile</idempiere-repository-url>
-		<idempiere-jasper-url>${idempiere-repository-url}/jp-p2/jp-${jp-version}</idempiere-jasper-url>
-		<idempiere-zkoss-url>${idempiere-repository-url}/zk-p2/zk-${zk-version}</idempiere-zkoss-url>
-		<!-- <idempiere-modifyBundle-url>${idempiere-repository-url}/modifyBundle-1.0.0</idempiere-modifyBundle-url> -->
 		<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.7</idempiere-equinox-url>
-		<idempiere-jetty-url>http://download.eclipse.org/jetty/updates/jetty-bundles-9.x</idempiere-jetty-url>
-		<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository</idempiere-orbit-url>
-		<idempiere-restlet-url>http://p2.restlet.com/2.3</idempiere-restlet-url>
-		<idempiere-maven-central-url>http://central.maven.org/maven2</idempiere-maven-central-url>
-		<idempiere-maven-redhat-ga-url>https://maven.repository.redhat.com/ga</idempiere-maven-redhat-ga-url>
-		<idempiere-maven-opennms-url>http://repo.opennms.org/maven2</idempiere-maven-opennms-url>
-		<idempiere-maven-jr-ce-releases-url>https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases</idempiere-maven-jr-ce-releases-url>
-		<idempiere-maven-jp-third-party-ce-url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts</idempiere-maven-jp-third-party-ce-url>
-		<idempiere-maven-netbeans-url>http://bits.netbeans.org/maven2</idempiere-maven-netbeans-url>
-		<idempiere-maven-clojars-url>http://clojars.org/repo</idempiere-maven-clojars-url>
-		<idempiere-maven-atlassian-3rdparty-url>https://maven.atlassian.com/3rdparty</idempiere-maven-atlassian-3rdparty-url>
-		<idempiere-maven-zkoss-url>http://mavensync.zkoss.org/maven2</idempiere-maven-zkoss-url>
-		<idempiere-maven-jenkins-url>http://repo.jenkins-ci.org/releases</idempiere-maven-jenkins-url>
 		<url.file.srv>http://downloads.sourceforge.net/project/idempiere/binary.file</url.file.srv>
 	</properties>
 
@@ -47,63 +31,16 @@
 			<id>local</id>
 			<properties>
 				<idempiere-repository-url>http://localhost</idempiere-repository-url>
-				<idempiere-jasper-url>${idempiere-repository-url}/binary.file/jarfile/jp-p2/jp-${jp-version}</idempiere-jasper-url>
-				<idempiere-zkoss-url>${idempiere-repository-url}/binary.file/jarfile/zk-p2/zk-8.5.0</idempiere-zkoss-url>
-				<!-- <idempiere-modifyBundle-url>${idempiere-repository-url}/binary.file/jarfile/modifyBundle-1.0.0</idempiere-modifyBundle-url> -->
 				<idempiere-equinox-url>${idempiere-repository-url}/eclipse-4.7.1</idempiere-equinox-url>
-				<idempiere-jetty-url>${idempiere-repository-url}/jetty-9.4.7</idempiere-jetty-url>
-				<idempiere-orbit-url>${idempiere-repository-url}/orbit-buildrepo-R20170919201930</idempiere-orbit-url>
-				<idempiere-restlet-url>${idempiere-repository-url}/restlet-2.3</idempiere-restlet-url>
-				<idempiere-maven-central-url>${idempiere-repository-url}/Central</idempiere-maven-central-url>
-				<idempiere-maven-redhat-ga-url>${idempiere-repository-url}/Redhat-GA</idempiere-maven-redhat-ga-url>
-				<idempiere-maven-opennms-url>${idempiere-repository-url}/OpenNMS</idempiere-maven-opennms-url>
-				<idempiere-maven-jr-ce-releases-url>${idempiere-repository-url}/jr-ce-releases</idempiere-maven-jr-ce-releases-url>
-				<idempiere-maven-jp-third-party-ce-url>${idempiere-repository-url}/third-party-ce-artifacts</idempiere-maven-jp-third-party-ce-url>
-				<idempiere-maven-netbeans-url>${idempiere-repository-url}/third-party-ce-artifacts</idempiere-maven-netbeans-url>
-				<idempiere-maven-clojars-url>${idempiere-repository-url}/Clojars</idempiere-maven-clojars-url>
-				<idempiere-maven-atlassian-3rdparty-url>${idempiere-repository-url}/atlassian-3rdparty</idempiere-maven-atlassian-3rdparty-url>
-				<idempiere-maven-zkoss-url>${idempiere-repository-url}/zkoss</idempiere-maven-zkoss-url>
-				<idempiere-maven-jenkins-url>${idempiere-repository-url}/zkoss</idempiere-maven-jenkins-url>
 				<url.file.srv>${idempiere-repository-url}/binary.file</url.file.srv>
 				<idempiere.target>org.idempiere.p2.targetplatform.offline</idempiere.target>
 			</properties>
 		</profile>
 
-		<profile>
-			<id>offline-file</id>
-			<properties>
-				<idempiere-repository-url>file:///mnt/data/dev/project/material/localRepository</idempiere-repository-url>
-				<idempiere-jasper-url>${idempiere-repository-url}/binary.file/jarfile/jp-p2/jp-${jp-version}</idempiere-jasper-url>
-				<idempiere-zkoss-url>${idempiere-repository-url}/binary.file/jarfile/zk-p2/zk-8.5.0</idempiere-zkoss-url>
-				<!-- <idempiere-modifyBundle-url>${idempiere-repository-url}/binary.file/jarfile/modifyBundle-1.0.0</idempiere-modifyBundle-url> -->
-				<idempiere-equinox-url>${idempiere-repository-url}/eclipse-4.7.1</idempiere-equinox-url>
-				<idempiere-jetty-url>${idempiere-repository-url}/jetty-9.4.7</idempiere-jetty-url>
-				<idempiere-orbit-url>${idempiere-repository-url}/orbit-buildrepo-R20170919201930</idempiere-orbit-url>
-				<idempiere-restlet-url>${idempiere-repository-url}/restlet-2.3</idempiere-restlet-url>
-			</properties>
-		</profile>
-
 		<profile>
 			<id>online</id>
 			<properties>
-				<idempiere-repository-url>https://sourceforge.net/projects/idempiere/files/binary.file/jarfile</idempiere-repository-url>
-				<idempiere-jasper-url>${idempiere-repository-url}/jp-p2/jp-${jp-version}</idempiere-jasper-url>
-				<idempiere-zkoss-url>${idempiere-repository-url}/zk-p2/zk-8.5.0</idempiere-zkoss-url>
-				<!-- <idempiere-modifyBundle-url>${idempiere-repository-url}/modifyBundle-1.0.0</idempiere-modifyBundle-url> -->
 				<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.7</idempiere-equinox-url>
-				<idempiere-jetty-url>http://download.eclipse.org/jetty/updates/jetty-bundles-9.x</idempiere-jetty-url>
-				<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository</idempiere-orbit-url>
-				<idempiere-restlet-url>http://p2.restlet.com/2.3</idempiere-restlet-url>
-				<idempiere-maven-central-url>http://central.maven.org/maven2</idempiere-maven-central-url>
-				<idempiere-maven-redhat-ga-url>https://maven.repository.redhat.com/ga</idempiere-maven-redhat-ga-url>
-				<idempiere-maven-opennms-url>http://repo.opennms.org/maven2</idempiere-maven-opennms-url>
-				<idempiere-maven-jr-ce-releases-url>https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases</idempiere-maven-jr-ce-releases-url>
-				<idempiere-maven-jp-third-party-ce-url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts</idempiere-maven-jp-third-party-ce-url>
-				<idempiere-maven-netbeans-url>http://bits.netbeans.org/maven2</idempiere-maven-netbeans-url>
-				<idempiere-maven-clojars-url>http://clojars.org/repo</idempiere-maven-clojars-url>
-				<idempiere-maven-atlassian-3rdparty-url>https://maven.atlassian.com/3rdparty</idempiere-maven-atlassian-3rdparty-url>
-				<idempiere-maven-zkoss-url>http://mavensync.zkoss.org/maven2</idempiere-maven-zkoss-url>
-				<idempiere-maven-jenkins-url>http://repo.jenkins-ci.org/releases</idempiere-maven-jenkins-url>
 				<url.file.srv>http://downloads.sourceforge.net/project/idempiere/binary.file</url.file.srv>
 				<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
 			</properties>
@@ -111,93 +48,54 @@
 	</profiles>
 
 	<repositories>
-		<!-- tycho don't support old style P2, so need to recreate P2 repository 
-			like restlet-2.3, orbit http://tonnymadsen.blogspot.hu/2013/05/tycho-and-pre-p2-update-sites.html -->
-		<repository>
-			<id>equinox</id>
-			<layout>p2</layout>
-			<url>${idempiere-equinox-url}</url>
-		</repository>
-
-		<repository>
-			<id>jetty</id>
-			<layout>p2</layout>
-			<url>${idempiere-jetty-url}</url>
-		</repository>
-
-		<repository>
-			<id>orbit</id>
-			<layout>p2</layout>
-			<url>${idempiere-orbit-url}</url>
-		</repository>
-
-		<repository>
-			<id>restlet</id>
-			<layout>p2</layout>
-			<url>${idempiere-restlet-url}</url>
-		</repository>
-
-		<repository>
-			<id>jasper</id>
-			<layout>p2</layout>
-			<url>${idempiere-jasper-url}</url>
-		</repository>
-
-		<repository>
-			<id>zkoss-p2</id>
-			<layout>p2</layout>
-			<url>${idempiere-zkoss-url}</url>
-		</repository>
-		<!-- <repository> <id>modifyBundle</id> <layout>p2</layout> <url>${idempiere-modifyBundle-url}</url> 
-			</repository> -->
 		<repository>
 			<id>Central</id>
-			<url>${idempiere-maven-central-url}</url>
+			<url>http://central.maven.org/maven2</url>
 		</repository>
 
 		<repository>
 			<id>Redhat-GA</id>
-			<url>${idempiere-maven-redhat-ga-url}</url>
+			<url>https://maven.repository.redhat.com/ga</url>
 		</repository>
 
 		<repository>
 			<id>OpenNMS</id>
-			<url>${idempiere-maven-opennms-url}</url>
+			<url>http://repo.opennms.org/maven2</url>
 		</repository>
 
 		<repository>
 			<id>jr-ce-releases</id>
-			<url>${idempiere-maven-jr-ce-releases-url}</url>
+			<url>https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases</url>
 		</repository>
 
 		<repository>
 			<id>jp-third-party-ce</id>
-			<url>${idempiere-maven-jp-third-party-ce-url}</url>
+			<url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts</url>
 		</repository>
 
 		<repository>
 			<id>NetBeans</id>
-			<url>${idempiere-maven-netbeans-url}</url>
+			<url>http://bits.netbeans.org/maven2</url>
 		</repository>
 
 		<repository>
 			<id>Clojars</id>
-			<url>${idempiere-maven-clojars-url}</url>
+			<url>http://clojars.org/repo</url>
 		</repository>
 
 		<repository>
 			<id>atlassian-3rdparty</id>
-			<url>${idempiere-maven-atlassian-3rdparty-url}</url>
+			<url>https://maven.atlassian.com/3rdparty</url>
 		</repository>
 
 		<repository>
 			<id>zkoss</id>
-			<url>${idempiere-maven-zkoss-url}</url>
+			<url>http://mavensync.zkoss.org/maven2</url>
 		</repository>
 
 		<repository>
 			<id>jenkins</id>
-			<url>${idempiere-maven-jenkins-url}</url>
+			<url>http://repo.jenkins-ci.org/releases</url>
 		</repository>
 	</repositories>
 
@@ -208,7 +106,7 @@
 					<!-- https://www.eclipse.org/m2e/documentation/m2e-execution-not-covered.html -->
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
-					<version>${lifecycle-mapping-version}</version>
+					<version>${lifecycle.mapping.version}</version>
 					<configuration>
 						<lifecycleMappingMetadata>
 							<pluginExecutions>
@@ -232,27 +130,27 @@
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-compiler-plugin</artifactId>
-					<version>${tycho-version}</version>
+					<version>${tycho.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>${tycho-version}</version>
+					<version>${tycho.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>com.googlecode.maven-download-plugin</groupId>
 					<artifactId>download-maven-plugin</artifactId>
-					<version>${download-maven-version}</version>
+					<version>${download.maven.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-p2-director-plugin</artifactId>
-					<version>${tycho-version}</version>
+					<version>${tycho.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-p2-repository-plugin</artifactId>
-					<version>${tycho-version}</version>
+					<version>${tycho.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho.extras</groupId>
@@ -279,6 +177,11 @@
 					<artifactId>maven-shade-plugin</artifactId>
 					<version>3.1.0</version>
 				</plugin>
+				<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>${maven.dependency.version}</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -286,13 +189,13 @@
 				<!-- enable the Tycho build extension -->
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<extensions>true</extensions>
 			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
 
@@ -320,105 +223,7 @@
 							<version>${project.version}</version>
 						</artifact>
 					</target>
-					<filters>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>com.ibm.icu</id>
-							<restrictTo>
-								<versionRange>[60.2.0,61.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>ch.qos.logback.classic</id>
-							<restrictTo>
-								<versionRange>[
-									1.1.2.v20160208-0839,2.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>ch.qos.logback.core</id>
-							<restrictTo>
-								<versionRange>[
-									1.1.2.v20160208-0839,2.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>ch.qos.logback.slf4j</id>
-							<restrictTo>
-								<versionRange>[
-									1.1.2.v20160301-0943,2.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>com.fasterxml.jackson.core.jackson-annotations</id>
-							<restrictTo>
-								<versionRange>[
-									2.6.2.v20161117-2150,3.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>com.fasterxml.jackson.core.jackson-core</id>
-							<restrictTo>
-								<versionRange>[
-									2.6.2.v20161117-2150,3.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>com.fasterxml.jackson.core.jackson-databind</id>
-							<restrictTo>
-								<versionRange>[
-									2.6.2.v20161117-2150,3.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>com.google.gson</id>
-							<restrictTo>
-								<versionRange>[
-									2.7.0.v20170129-0911,3.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>com.google.guava</id>
-							<restrictTo>
-								<versionRange>[
-									21.0.0.v20170206-1425,22.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>com.ibm.icu.base</id>
-							<restrictTo>
-								<versionRange>[
-									58.2.0.v20170418-1837,61.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>org.apache.lucene.core</id>
-							<restrictTo>
-								<versionRange>[
-									3.5.0,4.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-						<filter>
-							<type>eclipse-plugin</type>
-							<id>
-								groovy-all</id>
-							<restrictTo>
-								<versionRange>[
-									2.4.7,3.0.0)</versionRange>
-							</restrictTo>
-						</filter>
-
-					</filters>
+					
 					<!-- configure the p2 target environments for multi-platform build -->
 					<environments>
 						<environment>
@@ -438,7 +243,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<executions>
 					<execution>
 						<id>plugin-source</id>