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 @@ net.sf.jasperreports jasperreports-chart-themes - ${jp-version} + ${jp.version} net.sf.jasperreports jasperreports-chart-customizers - ${jp-version} + ${jp.version} net.sf.jasperreports jasperreports-functions - ${jp-version} + ${jp.version} org.mozilla 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 @@ false - org.eclipse.jetty:jetty-alpn-server:jar:${jetty-version} + org.eclipse.jetty:jetty-alpn-server:jar:${jetty.version} true false @@ -273,93 +273,93 @@ true - org.zkoss.zk:zkplus:jar:sources:${zk-version} + org.zkoss.zk:zkplus:jar:sources:${zk.version} false false - zkplus;version="${zk-version}";roots:="." + zkplus;version="${zk.version}";roots:="." zkplus zkplus.source - org.zkoss.common:zweb:jar:sources:${zk-version} + org.zkoss.common:zweb:jar:sources:${zk.version} false false - zweb;version="${zk-version}";roots:="." + zweb;version="${zk.version}";roots:="." zweb zweb.source - org.zkoss.zk:zul:jar:sources:${zk-version} + org.zkoss.zk:zul:jar:sources:${zk.version} false false - zul;version="${zk-version}";roots:="." + zul;version="${zk.version}";roots:="." zul zul.source - org.zkoss.zk:zk:jar:sources:${zk-version} + org.zkoss.zk:zk:jar:sources:${zk.version} false false - zk;version="${zk-version}";roots:="." + zk;version="${zk.version}";roots:="." zk zk.source - org.zkoss.zk:zhtml:jar:sources:${zk-version} + org.zkoss.zk:zhtml:jar:sources:${zk.version} false false - zhtml;version="${zk-version}";roots:="." + zhtml;version="${zk.version}";roots:="." zhtml zhtml.source - org.zkoss.zk:zkbind:jar:sources:${zk-version} + org.zkoss.zk:zkbind:jar:sources:${zk.version} false false - zkbind;version="${zk-version}";roots:="." + zkbind;version="${zk.version}";roots:="." zkbind zkbind.source - org.zkoss.common:zel:jar:sources:${zk-version} + org.zkoss.common:zel:jar:sources:${zk.version} false false - zel;version="${zk-version}";roots:="." + zel;version="${zk.version}";roots:="." zel zel.source - org.zkoss.common:zcommon:jar:sources:${zk-version} + org.zkoss.common:zcommon:jar:sources:${zk.version} false false - zcommon;version="${zk-version}";roots:="." + zcommon;version="${zk.version}";roots:="." zcommon zcommon.source - org.javassist:javassist:jar:sources:${zk-javassist-src-version} + org.javassist:javassist:jar:sources:${zk.javassist.src.version} false false - zjavassist;version="${zk-version}";roots:="." + zjavassist;version="${zk.version}";roots:="." zjavassist - ${zk-version} + ${zk.version} zjavassist.source @@ -377,7 +377,7 @@ true - org.zkoss.zk:zkplus:${zk-version} + org.zkoss.zk:zkplus:${zk.version} false false @@ -386,7 +386,7 @@ - org.zkoss.common:zweb:${zk-version} + org.zkoss.common:zweb:${zk.version} false false @@ -395,7 +395,7 @@ - org.zkoss.zk:zul:${zk-version} + org.zkoss.zk:zul:${zk.version} false false @@ -404,7 +404,7 @@ - org.zkoss.zk:zk:${zk-version} + org.zkoss.zk:zk:${zk.version} false false @@ -413,7 +413,7 @@ - org.zkoss.zk:zhtml:${zk-version} + org.zkoss.zk:zhtml:${zk.version} false false @@ -422,7 +422,7 @@ - org.zkoss.zk:zkbind:${zk-version} + org.zkoss.zk:zkbind:${zk.version} false false @@ -431,7 +431,7 @@ - org.zkoss.common:zel:${zk-version} + org.zkoss.common:zel:${zk.version} false false @@ -440,7 +440,7 @@ - org.zkoss.common:zcommon:${zk-version} + org.zkoss.common:zcommon:${zk.version} false false @@ -462,7 +462,7 @@ true - net.sf.jasperreports:jasperreports:jar:${jp-version} + net.sf.jasperreports:jasperreports:jar:${jp.version} false false true @@ -477,18 +477,18 @@ - org.javassist:javassist:${zk-javassist-src-version} + org.javassist:javassist:${zk.javassist.src.version} false false true zjavassist zjavassist - - ${zk-version} + ${zk.version} @@ -511,7 +511,7 @@ ${zk-osgi-zip-file} true - zk-bin-osgi-${zk-version}.zip + zk-bin-osgi-${zk.version}.zip ${project.build.directory} 5 @@ -532,40 +532,40 @@ - ${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zcommon.osgi.jar - ${project.build.directory}/repository/plugins/zcommon_${zk-version}.jar + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zcommon.osgi.jar + ${project.build.directory}/repository/plugins/zcommon_${zk.version}.jar - ${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zel.osgi.jar - ${project.build.directory}/repository/plugins/zel_${zk-version}.jar + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zel.osgi.jar + ${project.build.directory}/repository/plugins/zel_${zk.version}.jar - ${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zhtml.osgi.jar - ${project.build.directory}/repository/plugins/zhtml_${zk-version}.jar + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zhtml.osgi.jar + ${project.build.directory}/repository/plugins/zhtml_${zk.version}.jar - ${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zjavassist.osgi.jar - ${project.build.directory}/repository/plugins/zjavassist_${zk-version}.jar + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zjavassist.osgi.jar + ${project.build.directory}/repository/plugins/zjavassist_${zk.version}.jar - ${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zk.osgi.jar - ${project.build.directory}/repository/plugins/zk_${zk-version}.jar + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zk.osgi.jar + ${project.build.directory}/repository/plugins/zk_${zk.version}.jar - ${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zkbind.osgi.jar - ${project.build.directory}/repository/plugins/zkbind_${zk-version}.jar + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkbind.osgi.jar + ${project.build.directory}/repository/plugins/zkbind_${zk.version}.jar - ${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zkplus.osgi.jar - ${project.build.directory}/repository/plugins/zkplus_${zk-version}.jar + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkplus.osgi.jar + ${project.build.directory}/repository/plugins/zkplus_${zk.version}.jar - ${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zul.osgi.jar - ${project.build.directory}/repository/plugins/zul_${zk-version}.jar + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zul.osgi.jar + ${project.build.directory}/repository/plugins/zul_${zk.version}.jar - ${project.build.directory}/zk-bin-osgi-${zk-version}/dist/lib/zweb.osgi.jar - ${project.build.directory}/repository/plugins/zweb_${zk-version}.jar + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zweb.osgi.jar + ${project.build.directory}/repository/plugins/zweb_${zk.version}.jar ${project.build.directory}/repository/artifacts.jar 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 @@ Maven parent project for idempiere - 1.1.0 - ${tycho-version} + 1.1.0 + ${tycho.version} UTF-8 - 9.4.7.v20170914 - 6.3.1 - 8.5.0 - 3.18.2-GA - 3.0.2 - 1.4.0 - 1.0.0 + 9.4.7.v20170914 + 6.3.1 + 8.5.0 + 3.18.2-GA + 3.0.2 + 1.4.0 + 1.0.0 + + org.idempiere.p2.targetplatform - - https://sourceforge.net/projects/idempiere/files/binary.file/jarfile - ${idempiere-repository-url}/jp-p2/jp-${jp-version} - ${idempiere-repository-url}/zk-p2/zk-${zk-version} - http://download.eclipse.org/eclipse/updates/4.7 - http://download.eclipse.org/jetty/updates/jetty-bundles-9.x - http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository - http://p2.restlet.com/2.3 - http://central.maven.org/maven2 - https://maven.repository.redhat.com/ga - http://repo.opennms.org/maven2 - https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases - https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts - http://bits.netbeans.org/maven2 - http://clojars.org/repo - https://maven.atlassian.com/3rdparty - http://mavensync.zkoss.org/maven2 - http://repo.jenkins-ci.org/releases http://downloads.sourceforge.net/project/idempiere/binary.file @@ -47,63 +31,16 @@ local http://localhost - ${idempiere-repository-url}/binary.file/jarfile/jp-p2/jp-${jp-version} - ${idempiere-repository-url}/binary.file/jarfile/zk-p2/zk-8.5.0 - ${idempiere-repository-url}/eclipse-4.7.1 - ${idempiere-repository-url}/jetty-9.4.7 - ${idempiere-repository-url}/orbit-buildrepo-R20170919201930 - ${idempiere-repository-url}/restlet-2.3 - ${idempiere-repository-url}/Central - ${idempiere-repository-url}/Redhat-GA - ${idempiere-repository-url}/OpenNMS - ${idempiere-repository-url}/jr-ce-releases - ${idempiere-repository-url}/third-party-ce-artifacts - ${idempiere-repository-url}/third-party-ce-artifacts - ${idempiere-repository-url}/Clojars - ${idempiere-repository-url}/atlassian-3rdparty - ${idempiere-repository-url}/zkoss - ${idempiere-repository-url}/zkoss ${idempiere-repository-url}/binary.file org.idempiere.p2.targetplatform.offline - - offline-file - - file:///mnt/data/dev/project/material/localRepository - ${idempiere-repository-url}/binary.file/jarfile/jp-p2/jp-${jp-version} - ${idempiere-repository-url}/binary.file/jarfile/zk-p2/zk-8.5.0 - - ${idempiere-repository-url}/eclipse-4.7.1 - ${idempiere-repository-url}/jetty-9.4.7 - ${idempiere-repository-url}/orbit-buildrepo-R20170919201930 - ${idempiere-repository-url}/restlet-2.3 - - - online - https://sourceforge.net/projects/idempiere/files/binary.file/jarfile - ${idempiere-repository-url}/jp-p2/jp-${jp-version} - ${idempiere-repository-url}/zk-p2/zk-8.5.0 - http://download.eclipse.org/eclipse/updates/4.7 - http://download.eclipse.org/jetty/updates/jetty-bundles-9.x - http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository - http://p2.restlet.com/2.3 - http://central.maven.org/maven2 - https://maven.repository.redhat.com/ga - http://repo.opennms.org/maven2 - https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases - https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts - http://bits.netbeans.org/maven2 - http://clojars.org/repo - https://maven.atlassian.com/3rdparty - http://mavensync.zkoss.org/maven2 - http://repo.jenkins-ci.org/releases http://downloads.sourceforge.net/project/idempiere/binary.file org.idempiere.p2.targetplatform @@ -111,93 +48,54 @@ - - - equinox - p2 - ${idempiere-equinox-url} - - - - jetty - p2 - ${idempiere-jetty-url} - - - - orbit - p2 - ${idempiere-orbit-url} - - - - restlet - p2 - ${idempiere-restlet-url} - - - - jasper - p2 - ${idempiere-jasper-url} - - - - zkoss-p2 - p2 - ${idempiere-zkoss-url} - - Central - ${idempiere-maven-central-url} + http://central.maven.org/maven2 Redhat-GA - ${idempiere-maven-redhat-ga-url} + https://maven.repository.redhat.com/ga OpenNMS - ${idempiere-maven-opennms-url} + http://repo.opennms.org/maven2 jr-ce-releases - ${idempiere-maven-jr-ce-releases-url} + https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases jp-third-party-ce - ${idempiere-maven-jp-third-party-ce-url} + https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts NetBeans - ${idempiere-maven-netbeans-url} + http://bits.netbeans.org/maven2 Clojars - ${idempiere-maven-clojars-url} + http://clojars.org/repo atlassian-3rdparty - ${idempiere-maven-atlassian-3rdparty-url} + https://maven.atlassian.com/3rdparty zkoss - ${idempiere-maven-zkoss-url} + http://mavensync.zkoss.org/maven2 jenkins - ${idempiere-maven-jenkins-url} + http://repo.jenkins-ci.org/releases @@ -208,7 +106,7 @@ org.eclipse.m2e lifecycle-mapping - ${lifecycle-mapping-version} + ${lifecycle.mapping.version} @@ -232,27 +130,27 @@ org.eclipse.tycho tycho-compiler-plugin - ${tycho-version} + ${tycho.version} org.eclipse.tycho maven-dependency-plugin - ${tycho-version} + ${tycho.version} com.googlecode.maven-download-plugin download-maven-plugin - ${download-maven-version} + ${download.maven.version} org.eclipse.tycho tycho-p2-director-plugin - ${tycho-version} + ${tycho.version} org.eclipse.tycho tycho-p2-repository-plugin - ${tycho-version} + ${tycho.version} org.eclipse.tycho.extras @@ -279,6 +177,11 @@ maven-shade-plugin 3.1.0 + + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency.version} + @@ -286,13 +189,13 @@ org.eclipse.tycho tycho-maven-plugin - ${tycho-version} + ${tycho.version} true org.eclipse.tycho target-platform-configuration - ${tycho-version} + ${tycho.version} honor @@ -320,105 +223,7 @@ ${project.version} - - - eclipse-plugin - com.ibm.icu - - [60.2.0,61.0.0) - - - - eclipse-plugin - ch.qos.logback.classic - - [ - 1.1.2.v20160208-0839,2.0.0) - - - - eclipse-plugin - ch.qos.logback.core - - [ - 1.1.2.v20160208-0839,2.0.0) - - - - eclipse-plugin - ch.qos.logback.slf4j - - [ - 1.1.2.v20160301-0943,2.0.0) - - - - eclipse-plugin - com.fasterxml.jackson.core.jackson-annotations - - [ - 2.6.2.v20161117-2150,3.0.0) - - - - eclipse-plugin - com.fasterxml.jackson.core.jackson-core - - [ - 2.6.2.v20161117-2150,3.0.0) - - - - eclipse-plugin - com.fasterxml.jackson.core.jackson-databind - - [ - 2.6.2.v20161117-2150,3.0.0) - - - - eclipse-plugin - com.google.gson - - [ - 2.7.0.v20170129-0911,3.0.0) - - - - eclipse-plugin - com.google.guava - - [ - 21.0.0.v20170206-1425,22.0.0) - - - - eclipse-plugin - com.ibm.icu.base - - [ - 58.2.0.v20170418-1837,61.0.0) - - - - eclipse-plugin - org.apache.lucene.core - - [ - 3.5.0,4.0.0) - - - - eclipse-plugin - - groovy-all - - [ - 2.4.7,3.0.0) - - - - + @@ -438,7 +243,7 @@ org.eclipse.tycho tycho-source-plugin - ${tycho-version} + ${tycho.version} plugin-source