From b1ec84d31b13de1ab771ef6e1891b959dbf77f04 Mon Sep 17 00:00:00 2001 From: hieplq Date: Tue, 11 Sep 2018 20:59:45 +0700 Subject: [PATCH] IDEMPIERE-3531: clear unused code, add profiles to easy use parent for more build --- .../.classpath | 0 .../{ => org.idempiere.maven.to.p2}/.project | 0 .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../org.idempiere.maven.to.p2/pom.xml | 619 +++++++++++ org.idempiere.maven.to.p2/pom.xml | 635 +---------- .../.classpath | 5 - .../.project | 23 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 11 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ...idempiere.p2.targetplatform.offline.target | 983 ------------------ .../pom.xml | 12 - org.idempiere.parent/pom.xml | 881 ++++++++-------- 15 files changed, 1084 insertions(+), 2091 deletions(-) rename org.idempiere.maven.to.p2/{ => org.idempiere.maven.to.p2}/.classpath (100%) rename org.idempiere.maven.to.p2/{ => org.idempiere.maven.to.p2}/.project (100%) rename org.idempiere.maven.to.p2/{ => org.idempiere.maven.to.p2}/.settings/org.eclipse.core.resources.prefs (100%) rename org.idempiere.maven.to.p2/{ => org.idempiere.maven.to.p2}/.settings/org.eclipse.jdt.core.prefs (100%) rename org.idempiere.maven.to.p2/{ => org.idempiere.maven.to.p2}/.settings/org.eclipse.m2e.core.prefs (100%) create mode 100644 org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml delete mode 100644 org.idempiere.p2.targetplatform.offline/.classpath delete mode 100644 org.idempiere.p2.targetplatform.offline/.project delete mode 100644 org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.jdt.core.prefs delete mode 100644 org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.m2e.core.prefs delete mode 100644 org.idempiere.p2.targetplatform.offline/org.idempiere.p2.targetplatform.offline.target delete mode 100644 org.idempiere.p2.targetplatform.offline/pom.xml diff --git a/org.idempiere.maven.to.p2/.classpath b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.classpath similarity index 100% rename from org.idempiere.maven.to.p2/.classpath rename to org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.classpath diff --git a/org.idempiere.maven.to.p2/.project b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.project similarity index 100% rename from org.idempiere.maven.to.p2/.project rename to org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.project diff --git a/org.idempiere.maven.to.p2/.settings/org.eclipse.core.resources.prefs b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.idempiere.maven.to.p2/.settings/org.eclipse.core.resources.prefs rename to org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.settings/org.eclipse.core.resources.prefs diff --git a/org.idempiere.maven.to.p2/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.idempiere.maven.to.p2/.settings/org.eclipse.jdt.core.prefs rename to org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.settings/org.eclipse.jdt.core.prefs diff --git a/org.idempiere.maven.to.p2/.settings/org.eclipse.m2e.core.prefs b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.idempiere.maven.to.p2/.settings/org.eclipse.m2e.core.prefs rename to org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/.settings/org.eclipse.m2e.core.prefs diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml new file mode 100644 index 0000000000..1494311a5e --- /dev/null +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml @@ -0,0 +1,619 @@ + + 4.0.0 + + org.idempiere + org.idempiere.parent + 5.1.0-SNAPSHOT + ../../org.idempiere.parent/pom.xml + + org.idempiere.maven.to.p2 + pom + + https://www.zkoss.org/zkdownload/downloadEvalFile?id=1245081552 + + 1.1.3.v20160715 + 8.5.24.2 + 8.1.12.v20180117 + 3.1.0.M3 + 1.1.0 + + + + + + + + org.reficio + p2-maven-plugin + 1.3.0 + + + default-cli + package + + site + + + + + org.idempiere.maven.feature + ${project.version} + + Idempiere + feature group all osgi bundle get from maven + repository + Idempiere + GPL v2.1 + true + + + org.passay:passay:jar:1.3.0 + true + false + + + org.mortbay.jasper:apache-jsp:jar:${jetty.jsp.version} + + false + false + + + org.mortbay.jasper:apache-el:jar:${jetty.jsp.version} + true + false + + + org.eclipse.jetty.toolchain:jetty-osgi-servlet-api:jar:${jetty.osgi.servlet.api.version} + true + false + + + org.eclipse.jetty.orbit:org.eclipse.jdt.core:jar:3.8.2.v20130121 + true + false + + + javax.websocket:javax.websocket-api:jar:1.1 + true + false + + + javax.annotation:javax.annotation-api:jar:1.3.1 + true + false + + + javax.management.j2ee:javax.management.j2ee-api:jar:1.1.1 + true + false + + + com.sun.mail:javax.mail:jar:1.6.0 + true + false + + + + org.apache.taglibs:taglibs-standard-impl:jar:1.2.5 + true + false + + + org.apache.taglibs:taglibs-standard-spec:jar:1.2.5 + true + false + + + org.apache.taglibs:taglibs-standard-jstlel:jar:1.2.5 + true + false + + + org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.10 + true + false + + + org.apache.aries:org.apache.aries.util:jar:1.1.3 + true + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib:jar:3.2.5_1 + true + false + + + org.apache.activemq:activemq-core:jar:5.7.0 + true + false + + + org.apache.activemq:kahadb:jar:5.7.0 + true + false + + + org.apache.felix:org.apache.felix.webconsole:jar:4.3.4 + true + false + + + org.apache.felix:org.apache.felix.webconsole.plugins.ds:jar:2.0.8 + true + false + + + org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:jar:1.0.6 + true + false + + + org.apache.felix:org.apache.felix.inventory:jar:1.0.6 + true + false + + + org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:jar:1.0.4 + true + false + + + com.itextpdf:itextpdf:jar:5.5.12 + true + false + + + org.bouncycastle:bcpkix-jdk15on:jar:1.58 + true + false + + + org.bouncycastle:bcprov-jdk15on:jar:1.58 + true + false + + + org.bouncycastle:bcmail-jdk15on:jar:1.58 + true + false + + + org.bouncycastle:bctsp-jdk15on:jar:1.46 + true + false + + + org.apache.velocity:velocity:jar:1.7 + true + false + + + commons-digester:commons-digester:jar:2.1 + true + false + + + com.google.code.maven-play-plugin.org.apache.commons:commons-javaflow:jar:1590792 + true + false + + + org.cryptacular:cryptacular:jar:1.2.1 + true + false + + + net.sf.supercsv:super-csv:jar:2.4.0 + true + false + + + org.atmosphere:atmosphere-runtime:jar:2.4.16 + true + false + + + org.eclipse.jetty.alpn:alpn-api:jar:1.1.3.v20160715 + true + false + + + org.codehaus.groovy:groovy-all:jar:2.4.13 + true + false + + + com.ibm.icu:icu4j:jar:60.2 + true + false + + + joda-time:joda-time:jar:2.9.9 + true + false + + + org.apache.commons:commons-configuration2:jar:2.2 + true + false + + + org.apache.commons:commons-collections4:jar:4.2 + true + false + + + org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version} + true + false + + + org.conscrypt:conscrypt-openjdk-uber:jar:${jetty.conscrypt.openjdk.uber.version} + true + false + + org.conscrypt;version="${jetty.conscrypt.openjdk.uber.version}" + org.idempiere.org.conscrypt.openjdk-uber + org.idempiere.org.conscrypt.openjdk-uber + + + + + + + org.idempiere.zk.source.feature + ${project.version} + + Idempiere + feature group all zk source get from maven + repository + Idempiere + GPL v2.1 + true + + + org.zkoss.zk:zkplus:jar:sources:${zk.version} + false + false + + zkplus;version="${zk.version}";roots:="." + zkplus + zkplus.source + + + + org.zkoss.common:zweb:jar:sources:${zk.version} + false + false + + zweb;version="${zk.version}";roots:="." + zweb + zweb.source + + + + org.zkoss.zk:zul:jar:sources:${zk.version} + false + false + + zul;version="${zk.version}";roots:="." + zul + zul.source + + + + org.zkoss.zk:zk:jar:sources:${zk.version} + false + false + + zk;version="${zk.version}";roots:="." + zk + zk.source + + + + org.zkoss.zk:zhtml:jar:sources:${zk.version} + false + false + + zhtml;version="${zk.version}";roots:="." + zhtml + zhtml.source + + + + org.zkoss.zk:zkbind:jar:sources:${zk.version} + false + false + + zkbind;version="${zk.version}";roots:="." + zkbind + zkbind.source + + + + org.zkoss.common:zel:jar:sources:${zk.version} + false + false + + zel;version="${zk.version}";roots:="." + zel + zel.source + + + + org.zkoss.common:zcommon:jar:sources:${zk.version} + false + false + + zcommon;version="${zk.version}";roots:="." + zcommon + zcommon.source + + + + org.javassist:javassist:jar:sources:${zk.javassist.src.version} + false + false + + zjavassist;version="${zk.version}";roots:="." + zjavassist + ${zk.version} + zjavassist.source + + + + + + org.idempiere.zk.feature + ${project.version} + + Idempiere + feature group all zk osgi bundle get from + sourcefore + Idempiere + GPL v2.1 + true + + + org.zkoss.zk:zkplus:${zk.version} + false + false + + zkplus + zkplus + + + + org.zkoss.common:zweb:${zk.version} + false + false + + zweb + zweb + + + + org.zkoss.zk:zul:${zk.version} + false + false + + zul + zul + + + + org.zkoss.zk:zk:${zk.version} + false + false + + zk + zk + + + + org.zkoss.zk:zhtml:${zk.version} + false + false + + zhtml + zhtml + + + + org.zkoss.zk:zkbind:${zk.version} + false + false + + zkbind + zkbind + + + + org.zkoss.common:zel:${zk.version} + false + false + + zel + zel + + + + org.zkoss.common:zcommon:${zk.version} + false + false + + zcommon + zcommon + + + + + + org.idempiere.jasperreport.feature + ${project.version} + + Idempiere + feature group all jasperreport osgi bundle get + from sourcefore + Idempiere + GPL v2.1 + true + + + net.sf.jasperreports:jasperreports:jar:${jp.version} + false + false + true + + net.sf.jasperreports.engine + net.sf.jasperreports.engine + + + + + + + + + org.javassist:javassist:${zk.javassist.src.version} + false + false + true + + zjavassist + zjavassist + + + ${zk.version} + + + + + + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-db-seed-pg + package + + wget + + + ${zk-osgi-zip-file} + true + zk-bin-osgi-${zk.version}.zip + ${project.build.directory} + 5 + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + + + rename-file + package + + rename + + + + + ${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/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/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/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/zweb.osgi.jar + ${project.build.directory}/repository/plugins/zweb_${zk.version}.jar + + + ${project.build.directory}/repository/artifacts.jar + ${project.build.directory}/artifacts.jar + + + ${project.build.directory}/repository/content.jar + ${project.build.directory}/content.jar + + + + + + + + + + org.eclipse.tycho.extras + tycho-p2-extras-plugin + + + generate-full-metadata + + package + + publish-features-and-bundles + + + + false + ${project.build.directory}/repository + + + + + + + + diff --git a/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/pom.xml index 81b3655939..fd606c7334 100644 --- a/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/pom.xml @@ -1,635 +1,18 @@ - + + 4.0.0 + org.idempiere.maven.to.p2.master + pom org.idempiere org.idempiere.parent 5.1.0-SNAPSHOT ../org.idempiere.parent/pom.xml - org.idempiere.maven.to.p2 - pom - - https://www.zkoss.org/zkdownload/downloadEvalFile?id=1245081552 - - 1.1.3.v20160715 - 8.5.24.2 - 8.1.12.v20180117 - 3.1.0.M3 - 1.1.0 - - - + + org.idempiere.maven.to.p2 + - - - - org.reficio - p2-maven-plugin - 1.3.0 - - - default-cli - package - - site - - - - - org.idempiere.maven.feature - ${project.version} - - Idempiere - feature group all osgi bundle get from maven - repository - Idempiere - GPL v2.1 - true - - - org.passay:passay:jar:1.3.0 - true - false - - - org.mortbay.jasper:apache-jsp:jar:${jetty.jsp.version} - - false - false - - - org.mortbay.jasper:apache-el:jar:${jetty.jsp.version} - true - false - - - org.eclipse.jetty.toolchain:jetty-osgi-servlet-api:jar:${jetty.osgi.servlet.api.version} - true - false - - - org.eclipse.jetty.orbit:org.eclipse.jdt.core:jar:3.8.2.v20130121 - true - false - - - javax.websocket:javax.websocket-api:jar:1.1 - true - false - - - javax.annotation:javax.annotation-api:jar:1.3.1 - true - false - - - javax.management.j2ee:javax.management.j2ee-api:jar:1.1.1 - true - false - - - com.sun.mail:javax.mail:jar:1.6.0 - true - false - - - - org.apache.taglibs:taglibs-standard-impl:jar:1.2.5 - true - false - - - org.apache.taglibs:taglibs-standard-spec:jar:1.2.5 - true - false - - - org.apache.taglibs:taglibs-standard-jstlel:jar:1.2.5 - true - false - - - org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.10 - true - false - - - org.apache.aries:org.apache.aries.util:jar:1.1.3 - true - false - - - org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib:jar:3.2.5_1 - true - false - - - org.apache.activemq:activemq-core:jar:5.7.0 - true - false - - - org.apache.activemq:kahadb:jar:5.7.0 - true - false - - - org.apache.felix:org.apache.felix.webconsole:jar:4.3.4 - true - false - - - org.apache.felix:org.apache.felix.webconsole.plugins.ds:jar:2.0.8 - true - false - - - org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:jar:1.0.6 - true - false - - - org.apache.felix:org.apache.felix.inventory:jar:1.0.6 - true - false - - - org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:jar:1.0.4 - true - false - - - com.itextpdf:itextpdf:jar:5.5.12 - true - false - - - org.bouncycastle:bcpkix-jdk15on:jar:1.58 - true - false - - - org.bouncycastle:bcprov-jdk15on:jar:1.58 - true - false - - - org.bouncycastle:bcmail-jdk15on:jar:1.58 - true - false - - - org.bouncycastle:bctsp-jdk15on:jar:1.46 - true - false - - - org.apache.velocity:velocity:jar:1.7 - true - false - - - commons-digester:commons-digester:jar:2.1 - true - false - - - com.google.code.maven-play-plugin.org.apache.commons:commons-javaflow:jar:1590792 - true - false - - - org.cryptacular:cryptacular:jar:1.2.1 - true - false - - - net.sf.supercsv:super-csv:jar:2.4.0 - true - false - - - org.atmosphere:atmosphere-runtime:jar:2.4.16 - true - false - - - org.eclipse.jetty.alpn:alpn-api:jar:1.1.3.v20160715 - true - false - - - org.codehaus.groovy:groovy-all:jar:2.4.13 - true - false - - - com.ibm.icu:icu4j:jar:60.2 - true - false - - - joda-time:joda-time:jar:2.9.9 - true - false - - - org.apache.commons:commons-configuration2:jar:2.2 - true - false - - - org.apache.commons:commons-collections4:jar:4.2 - true - false - - - org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version} - true - false - - - org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version} - true - false - - - org.conscrypt:conscrypt-openjdk-uber:jar:${jetty.conscrypt.openjdk.uber.version} - true - false - - org.conscrypt;version="${jetty.conscrypt.openjdk.uber.version}" - org.idempiere.org.conscrypt.openjdk-uber - org.idempiere.org.conscrypt.openjdk-uber - - - - - - - org.idempiere.zk.source.feature - ${project.version} - - Idempiere - feature group all zk source get from maven - repository - Idempiere - GPL v2.1 - true - - - org.zkoss.zk:zkplus:jar:sources:${zk.version} - false - false - - zkplus;version="${zk.version}";roots:="." - zkplus - zkplus.source - - - - org.zkoss.common:zweb:jar:sources:${zk.version} - false - false - - zweb;version="${zk.version}";roots:="." - zweb - zweb.source - - - - org.zkoss.zk:zul:jar:sources:${zk.version} - false - false - - zul;version="${zk.version}";roots:="." - zul - zul.source - - - - org.zkoss.zk:zk:jar:sources:${zk.version} - false - false - - zk;version="${zk.version}";roots:="." - zk - zk.source - - - - org.zkoss.zk:zhtml:jar:sources:${zk.version} - false - false - - zhtml;version="${zk.version}";roots:="." - zhtml - zhtml.source - - - - org.zkoss.zk:zkbind:jar:sources:${zk.version} - false - false - - zkbind;version="${zk.version}";roots:="." - zkbind - zkbind.source - - - - org.zkoss.common:zel:jar:sources:${zk.version} - false - false - - zel;version="${zk.version}";roots:="." - zel - zel.source - - - - org.zkoss.common:zcommon:jar:sources:${zk.version} - false - false - - zcommon;version="${zk.version}";roots:="." - zcommon - zcommon.source - - - - org.javassist:javassist:jar:sources:${zk.javassist.src.version} - false - false - - zjavassist;version="${zk.version}";roots:="." - zjavassist - ${zk.version} - zjavassist.source - - - - - - org.idempiere.zk.feature - ${project.version} - - Idempiere - feature group all zk osgi bundle get from - sourcefore - Idempiere - GPL v2.1 - true - - - org.zkoss.zk:zkplus:${zk.version} - false - false - - zkplus - zkplus - - - - org.zkoss.common:zweb:${zk.version} - false - false - - zweb - zweb - - - - org.zkoss.zk:zul:${zk.version} - false - false - - zul - zul - - - - org.zkoss.zk:zk:${zk.version} - false - false - - zk - zk - - - - org.zkoss.zk:zhtml:${zk.version} - false - false - - zhtml - zhtml - - - - org.zkoss.zk:zkbind:${zk.version} - false - false - - zkbind - zkbind - - - - org.zkoss.common:zel:${zk.version} - false - false - - zel - zel - - - - org.zkoss.common:zcommon:${zk.version} - false - false - - zcommon - zcommon - - - - - - org.idempiere.jasperreport.feature - ${project.version} - - Idempiere - feature group all jasperreport osgi bundle get - from sourcefore - Idempiere - GPL v2.1 - true - - - net.sf.jasperreports:jasperreports:jar:${jp.version} - false - false - true - - net.sf.jasperreports.engine - net.sf.jasperreports.engine - - - - - - - - - org.javassist:javassist:${zk.javassist.src.version} - false - false - true - - zjavassist - zjavassist - - - ${zk.version} - - - - - - - - - - - com.googlecode.maven-download-plugin - download-maven-plugin - - - download-db-seed-pg - package - - wget - - - ${zk-osgi-zip-file} - true - zk-bin-osgi-${zk.version}.zip - ${project.build.directory} - 5 - - - - - - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-file - package - - rename - - - - - ${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/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/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/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/zweb.osgi.jar - ${project.build.directory}/repository/plugins/zweb_${zk.version}.jar - - - ${project.build.directory}/repository/artifacts.jar - ${project.build.directory}/artifacts.jar - - - ${project.build.directory}/repository/content.jar - ${project.build.directory}/content.jar - - - - - - - - - - org.eclipse.tycho.extras - tycho-p2-extras-plugin - - - generate-full-metadata - - package - - publish-features-and-bundles - - - - false - ${project.build.directory}/repository - - - - - - - org.eclipse.tycho.extras - tycho-eclipserun-plugin - - -application org.eclipse.equinox.p2.publisher.CategoryPublisher -artifactRepository file:${project.build.directory}/repository -metadataRepository file:${project.build.directory}/repository -categoryDefinition file:${project.build.directory}/repository/category.xml -categoryQualifier -compress - - - - - eclipse-run - - package - - - - - - diff --git a/org.idempiere.p2.targetplatform.offline/.classpath b/org.idempiere.p2.targetplatform.offline/.classpath deleted file mode 100644 index 781c46d4ce..0000000000 --- a/org.idempiere.p2.targetplatform.offline/.classpath +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/org.idempiere.p2.targetplatform.offline/.project b/org.idempiere.p2.targetplatform.offline/.project deleted file mode 100644 index cd094569de..0000000000 --- a/org.idempiere.p2.targetplatform.offline/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.idempiere.p2.targetplatform.offline - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.core.resources.prefs b/org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 3a21537071..0000000000 --- a/org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -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.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.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.m2e.core.prefs b/org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb..0000000000 --- a/org.idempiere.p2.targetplatform.offline/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/org.idempiere.p2.targetplatform.offline/org.idempiere.p2.targetplatform.offline.target b/org.idempiere.p2.targetplatform.offline/org.idempiere.p2.targetplatform.offline.target deleted file mode 100644 index fedfc7ae11..0000000000 --- a/org.idempiere.p2.targetplatform.offline/org.idempiere.p2.targetplatform.offline.target +++ /dev/null @@ -1,983 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.idempiere.p2.targetplatform.offline/pom.xml b/org.idempiere.p2.targetplatform.offline/pom.xml deleted file mode 100644 index 2436cbbbee..0000000000 --- a/org.idempiere.p2.targetplatform.offline/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.idempiere - org.idempiere.parent - 5.1.0-SNAPSHOT - ../org.idempiere.parent/pom.xml - - org.idempiere.p2.targetplatform.offline - eclipse-target-definition - \ No newline at end of file diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 154ab074cc..32d4cde9df 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -27,84 +27,14 @@ org.idempiere.p2.targetplatform http://download.eclipse.org/eclipse/updates/4.7 + eclipse-oxygen + http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository + orbit-oxygen3a-R20180330011457 http://downloads.sourceforge.net/project/idempiere/binary.file org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group org.adempiere.server.product - - - local - - http://localhost - ${idempiere-repository-url}/eclipse-4.7.1 - ${idempiere-repository-url}/binary.file - org.idempiere.p2.targetplatform.offline - - - - - online - - http://download.eclipse.org/eclipse/updates/4.7 - http://downloads.sourceforge.net/project/idempiere/binary.file - org.idempiere.p2.targetplatform - - - - - - - Central - http://central.maven.org/maven2 - - - - Redhat-GA - https://maven.repository.redhat.com/ga - - - - OpenNMS - http://repo.opennms.org/maven2 - - - - jr-ce-releases - https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases - - - - jp-third-party-ce - https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts - - - - NetBeans - http://bits.netbeans.org/maven2 - - - - Clojars - http://clojars.org/repo - - - - atlassian-3rdparty - https://maven.atlassian.com/3rdparty - - - - zkoss - http://mavensync.zkoss.org/maven2 - - - - jenkins - http://repo.jenkins-ci.org/releases - - - @@ -133,6 +63,255 @@ + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho.extras.version} + + + + ${idempiere-equinox-repository-id} + ${idempiere-equinox-url} + p2 + + + ${idempiere-orbit-repository-id} + ${idempiere-orbit-url} + p2 + + + + + org.eclipse.ecf + eclipse-plugin + + + org.eclipse.equinox.util + eclipse-plugin + + + org.eclipse.equinox.ds + eclipse-plugin + + + org.eclipse.equinox.p2.garbagecollector + eclipse-plugin + + + org.eclipse.equinox.frameworkadmin.equinox + eclipse-plugin + + + org.eclipse.equinox.p2.publisher.eclipse + eclipse-plugin + + + org.eclipse.ecf.provider.filetransfer.httpclient4.ssl + eclipse-plugin + + + org.apache.commons.logging + eclipse-plugin + + + org.eclipse.ecf.provider.filetransfer.httpclient4 + eclipse-plugin + + + org.eclipse.equinox.p2.director + eclipse-plugin + + + org.eclipse.equinox.common + eclipse-plugin + + + org.eclipse.equinox.p2.metadata + eclipse-plugin + + + org.tukaani.xz + eclipse-plugin + + + org.eclipse.equinox.p2.core + eclipse-plugin + + + org.eclipse.core.net + eclipse-plugin + + + org.eclipse.equinox.concurrent + eclipse-plugin + + + org.eclipse.core.contenttype + eclipse-plugin + + + org.eclipse.equinox.p2.updatesite + eclipse-plugin + + + org.apache.httpcomponents.httpcore + eclipse-plugin + + + org.eclipse.equinox.p2.touchpoint.eclipse + eclipse-plugin + + + org.eclipse.core.jobs + eclipse-plugin + + + org.eclipse.equinox.preferences + eclipse-plugin + + + org.eclipse.equinox.registry + eclipse-plugin + + + org.eclipse.equinox.simpleconfigurator.manipulator + eclipse-plugin + + + org.eclipse.equinox.security + eclipse-plugin + + + org.eclipse.equinox.p2.jarprocessor + eclipse-plugin + + + org.eclipse.equinox.p2.engine + eclipse-plugin + + + org.eclipse.ecf.identity + eclipse-plugin + + + org.eclipse.equinox.app + eclipse-plugin + + + org.apache.felix.scr + eclipse-plugin + + + org.eclipse.equinox.p2.repository + eclipse-plugin + + + org.apache.httpcomponents.httpclient + eclipse-plugin + + + org.eclipse.equinox.p2.artifact.repository + eclipse-plugin + + + org.eclipse.osgi.compatibility.state + eclipse-plugin + + + org.eclipse.ecf.provider.filetransfer + eclipse-plugin + + + org.eclipse.equinox.launcher + eclipse-plugin + + + org.eclipse.osgi.util + eclipse-plugin + + + org.eclipse.equinox.frameworkadmin + eclipse-plugin + + + org.eclipse.equinox.p2.repository.tools + eclipse-plugin + + + org.eclipse.equinox.p2.publisher + eclipse-plugin + + + org.eclipse.equinox.p2.touchpoint.natives + eclipse-plugin + + + org.apache.commons.codec + eclipse-plugin + + + org.eclipse.osgi.services + eclipse-plugin + + + org.eclipse.ecf.filetransfer + eclipse-plugin + + + org.eclipse.ecf.provider.filetransfer.ssl + eclipse-plugin + + + org.eclipse.ecf.ssl + eclipse-plugin + + + org.sat4j.core + eclipse-plugin + + + org.eclipse.core.runtime + eclipse-plugin + + + org.eclipse.equinox.p2.transport.ecf + eclipse-plugin + + + org.eclipse.equinox.p2.director.app + eclipse-plugin + + + org.sat4j.pb + eclipse-plugin + + + org.eclipse.equinox.p2.metadata.repository + eclipse-plugin + + + org.eclipse.equinox.simpleconfigurator + eclipse-plugin + + + org.eclipse.equinox.console + eclipse-plugin + + + org.apache.felix.gogo.command + eclipse-plugin + + + org.apache.felix.gogo.runtime + eclipse-plugin + + + org.apache.felix.gogo.shell + eclipse-plugin + + + + org.eclipse.tycho tycho-compiler-plugin @@ -168,236 +347,6 @@ tycho-p2-publisher-plugin ${tycho.extras.version} - - org.eclipse.tycho.extras - tycho-eclipserun-plugin - ${tycho.extras.version} - - - - juno - p2 - ${idempiere-equinox-url} - - - - - - org.eclipse.ecf - eclipse-plugin - - - org.eclipse.equinox.util - eclipse-plugin - - - org.eclipse.equinox.ds - eclipse-plugin - - - org.eclipse.equinox.p2.garbagecollector - eclipse-plugin - - - org.eclipse.equinox.frameworkadmin.equinox - eclipse-plugin - - - org.eclipse.equinox.p2.publisher.eclipse - eclipse-plugin - - - org.eclipse.ecf.provider.filetransfer.httpclient4.ssl - eclipse-plugin - - - org.apache.commons.logging - eclipse-plugin - - - org.eclipse.ecf.provider.filetransfer.httpclient4 - eclipse-plugin - - - org.eclipse.equinox.p2.director - eclipse-plugin - - - org.eclipse.equinox.common - eclipse-plugin - - - org.eclipse.equinox.p2.metadata - eclipse-plugin - - - org.tukaani.xz - eclipse-plugin - - - org.eclipse.equinox.p2.core - eclipse-plugin - - - org.eclipse.core.net - eclipse-plugin - - - - org.eclipse.equinox.concurrent - eclipse-plugin - - - org.eclipse.core.contenttype - eclipse-plugin - - - org.eclipse.equinox.p2.updatesite - eclipse-plugin - - - org.apache.httpcomponents.httpcore - eclipse-plugin - - - org.eclipse.equinox.p2.touchpoint.eclipse - eclipse-plugin - - - org.eclipse.core.jobs - eclipse-plugin - - - org.eclipse.equinox.preferences - eclipse-plugin - - - org.eclipse.equinox.registry - eclipse-plugin - - - org.eclipse.equinox.simpleconfigurator.manipulator - eclipse-plugin - - - org.eclipse.equinox.security - eclipse-plugin - - - org.eclipse.equinox.p2.jarprocessor - eclipse-plugin - - - org.eclipse.equinox.p2.engine - eclipse-plugin - - - org.eclipse.ecf.identity - eclipse-plugin - - - org.eclipse.equinox.app - eclipse-plugin - - - org.apache.felix.scr - eclipse-plugin - - - org.eclipse.equinox.p2.repository - eclipse-plugin - - - org.apache.httpcomponents.httpclient - eclipse-plugin - - - org.eclipse.equinox.p2.artifact.repository - eclipse-plugin - - - org.eclipse.osgi.compatibility.state - eclipse-plugin - - - org.eclipse.ecf.provider.filetransfer - eclipse-plugin - - - org.eclipse.equinox.launcher - eclipse-plugin - - - org.eclipse.osgi.util - eclipse-plugin - - - org.eclipse.equinox.frameworkadmin - eclipse-plugin - - - org.eclipse.equinox.p2.repository.tools - eclipse-plugin - - - org.eclipse.equinox.p2.publisher - eclipse-plugin - - - org.eclipse.equinox.p2.touchpoint.natives - eclipse-plugin - - - org.apache.commons.codec - eclipse-plugin - - - org.eclipse.osgi.services - eclipse-plugin - - - org.eclipse.ecf.filetransfer - eclipse-plugin - - - org.eclipse.ecf.provider.filetransfer.ssl - eclipse-plugin - - - org.eclipse.ecf.ssl - eclipse-plugin - - - org.sat4j.core - eclipse-plugin - - - org.eclipse.core.runtime - eclipse-plugin - - - org.eclipse.equinox.p2.transport.ecf - eclipse-plugin - - - org.eclipse.equinox.p2.director.app - eclipse-plugin - - - org.sat4j.pb - eclipse-plugin - - - org.eclipse.equinox.p2.metadata.repository - eclipse-plugin - - - org.eclipse.equinox.simpleconfigurator - eclipse-plugin - - - - com.coderplus.maven.plugins copy-rename-maven-plugin @@ -423,127 +372,7 @@ ${tycho.version} true - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - honor - - - - - - eclipse-plugin - org.eclipse.core.runtime - 0.0.0 - - - eclipse-plugin - org.eclipse.equinox.common - 0.0.0 - - - - - - ${project.groupId} - ${idempiere.target} - ${project.version} - - - - - - - linux - gtk - x86_64 - - - win32 - win32 - x86_64 - - - - - - eclipse-plugin - org.eclipse.jetty.http - - ${jetty.version} - - - - eclipse-plugin - org.eclipse.jetty.io - - ${jetty.version} - - - - eclipse-plugin - org.eclipse.jetty.security - - ${jetty.version} - - - - eclipse-plugin - org.eclipse.jetty.server - - ${jetty.version} - - - - eclipse-plugin - org.eclipse.jetty.servlet - - ${jetty.version} - - - - eclipse-plugin - org.eclipse.jetty.util - - ${jetty.version} - - - - eclipse-plugin - org.objectweb.asm.tree - - ${asm.version} - - - - eclipse-plugin - org.objectweb.asm - - ${asm.version} - - - - eclipse-plugin - org.objectweb.asm.commons - - ${asm.version} - - - - eclipse-plugin - org.objectweb.asm.commons - - ${asm.version} - - - - - + org.eclipse.tycho @@ -560,4 +389,206 @@ - \ No newline at end of file + + + + buildIdempiere + + true + + + + Central + http://central.maven.org/maven2 + + + + Redhat-GA + https://maven.repository.redhat.com/ga + + + + OpenNMS + http://repo.opennms.org/maven2 + + + + jr-ce-releases + https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases + + + + jp-third-party-ce + https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts + + + + NetBeans + http://bits.netbeans.org/maven2 + + + + Clojars + http://clojars.org/repo + + + + atlassian-3rdparty + https://maven.atlassian.com/3rdparty + + + + zkoss + http://mavensync.zkoss.org/maven2 + + + + jenkins + http://repo.jenkins-ci.org/releases + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + honor + + + + + + eclipse-plugin + org.eclipse.core.runtime + 0.0.0 + + + eclipse-plugin + org.eclipse.equinox.common + 0.0.0 + + + + + + ${project.groupId} + ${idempiere.target} + ${project.version} + + + + + + + linux + gtk + x86_64 + + + win32 + win32 + x86_64 + + + + + + eclipse-plugin + org.eclipse.jetty.http + + ${jetty.version} + + + + eclipse-plugin + org.eclipse.jetty.io + + ${jetty.version} + + + + eclipse-plugin + org.eclipse.jetty.security + + ${jetty.version} + + + + eclipse-plugin + org.eclipse.jetty.server + + ${jetty.version} + + + + eclipse-plugin + org.eclipse.jetty.servlet + + ${jetty.version} + + + + eclipse-plugin + org.eclipse.jetty.util + + ${jetty.version} + + + + eclipse-plugin + org.objectweb.asm.tree + + ${asm.version} + + + + eclipse-plugin + org.objectweb.asm + + ${asm.version} + + + + eclipse-plugin + org.objectweb.asm.commons + + ${asm.version} + + + + eclipse-plugin + org.objectweb.asm.commons + + ${asm.version} + + + + + + + + + + + buildP2FromMaven + + + ${idempiere-equinox-repository-id} + ${idempiere-equinox-url} + p2 + + + ${idempiere-orbit-repository-id} + ${idempiere-orbit-url} + p2 + + + + + +