diff --git a/org.idempiere.maven.to.p2/.classpath b/org.idempiere.maven.to.p2/.classpath new file mode 100644 index 0000000000..51a8bbad89 --- /dev/null +++ b/org.idempiere.maven.to.p2/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/org.idempiere.maven.to.p2/.project b/org.idempiere.maven.to.p2/.project new file mode 100644 index 0000000000..a5408c2ffd --- /dev/null +++ b/org.idempiere.maven.to.p2/.project @@ -0,0 +1,23 @@ + + + org.idempiere.maven.to.p2 + + + + + + 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.maven.to.p2/.settings/org.eclipse.core.resources.prefs b/org.idempiere.maven.to.p2/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..99f26c0203 --- /dev/null +++ b/org.idempiere.maven.to.p2/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.idempiere.maven.to.p2/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.maven.to.p2/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..3a21537071 --- /dev/null +++ b/org.idempiere.maven.to.p2/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +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.maven.to.p2/.settings/org.eclipse.m2e.core.prefs b/org.idempiere.maven.to.p2/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000000..f897a7f1cb --- /dev/null +++ b/org.idempiere.maven.to.p2/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/pom.xml new file mode 100644 index 0000000000..7155624bf8 --- /dev/null +++ b/org.idempiere.maven.to.p2/pom.xml @@ -0,0 +1,844 @@ + + 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 + + + + + + + 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:8.5.23 + true + false + + + org.mortbay.jasper:apache-el:jar:8.5.23 + true + false + + + org.eclipse.jetty.toolchain:jetty-osgi-servlet-api:jar:3.1.0.M3 + 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.ow2.asm:asm-commons:jar:6.0 + true + false + + + org.ow2.asm:asm-tree:jar:6.0 + true + false + + + org.ow2.asm:asm:jar: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 + + + org.apache.commons:commons-digester3:jar:3.2 + 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:jetty-alpn-server:jar:${jetty-version} + 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.1 + true + false + + + + + + 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="${project.version}";roots:="." + zkplus + zkplus.source + + + + org.zkoss.common:zweb:jar:sources:${zk-version} + false + false + + zweb;version="${project.version}";roots:="." + zweb + zweb.source + + + + org.zkoss.zk:zul:jar:sources:${zk-version} + false + false + + zul;version="${project.version}";roots:="." + zul + zul.source + + + + org.zkoss.zk:zk:jar:sources:${zk-version} + false + false + + zk;version="${project.version}";roots:="." + zk + zk.source + + + + org.zkoss.zk:zhtml:jar:sources:${zk-version} + false + false + + zhtml;version="${project.version}";roots:="." + zhtml + zhtml.source + + + + org.zkoss.zk:zkbind:jar:sources:${zk-version} + false + false + + zkbind;version="${project.version}";roots:="." + zkbind + zkbind.source + + + + org.zkoss.common:zel:jar:sources:${zk-version} + false + false + + zel;version="${project.version}";roots:="." + zel + zel.source + + + + org.zkoss.common:zcommon:jar:sources:${zk-version} + false + false + + zcommon;version="${project.version}";roots:="." + zcommon + zcommon.source + + + + org.javassist:javassist:jar:sources:${zk-javassist-src-version} + false + false + + zjavassist;version="${project.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 + + + + 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 + + + -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 + + + + + + + \ No newline at end of file diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 4fd9558521..971a70b2df 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -14,9 +14,31 @@ 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 + + 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 @@ -176,279 +198,6 @@ - - - org.passay - passay - 1.3.0 - - - - org.mortbay.jasper - apache-jsp - 8.5.23 - - - - org.mortbay.jasper - apache-el - 8.5.23 - - - - org.eclipse.jetty.toolchain - jetty-osgi-servlet-api - 3.1.0.M3 - - - - org.eclipse.jetty.orbit - org.eclipse.jdt.core - 3.8.2.v20130121 - - - - javax.websocket - javax.websocket-api - 1.1 - provided - - - - javax.annotation - javax.annotation-api - 1.3.1 - - - - javax.management.j2ee - javax.management.j2ee-api - 1.1.1 - - - - com.sun.mail - javax.mail - 1.6.0 - - - - org.ow2.asm - asm-commons - 6.0 - - - - org.ow2.asm - asm-tree - 6.0 - - - - org.ow2.asm - asm - 6.0 - - - - org.apache.taglibs - taglibs-standard-impl - 1.2.5 - - - - org.apache.taglibs - taglibs-standard-spec - 1.2.5 - - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.5 - - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - 1.0.10 - - - - org.apache.aries - org.apache.aries.util - 1.1.3 - - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.cglib - 3.2.5_1 - - - - org.apache.activemq - activemq-core - 5.7.0 - - - - org.apache.activemq - kahadb - 5.7.0 - - - - org.apache.felix - org.apache.felix.webconsole - 4.3.4 - provided - - - - org.apache.felix - org.apache.felix.webconsole.plugins.ds - 2.0.8 - - - - org.apache.felix - org.apache.felix.webconsole.plugins.memoryusage - 1.0.6 - - - - org.apache.felix - org.apache.felix.inventory - 1.0.6 - provided - - - - org.apache.felix - org.apache.felix.webconsole.plugins.packageadmin - 1.0.4 - - - - org.javassist - javassist - 3.22.0-GA - - - - com.itextpdf - itextpdf - 5.5.12 - - - - org.bouncycastle - bcpkix-jdk15on - 1.58 - - - - org.bouncycastle - bcprov-jdk15on - 1.58 - - - - org.bouncycastle - bcmail-jdk15on - 1.58 - - - - org.bouncycastle - bctsp-jdk15on - 1.46 - - - - org.apache.velocity - velocity - 1.7 - - - - org.apache.commons - commons-digester3 - 3.2 - - - - com.google.code.maven-play-plugin.org.apache.commons - commons-javaflow - 1590792 - - - - org.cryptacular - cryptacular - 1.2.1 - - - - net.sf.supercsv - super-csv - 2.4.0 - - - - org.atmosphere - atmosphere-runtime - 2.4.16 - - - - org.eclipse.jetty - jetty-alpn-server - ${jetty-version} - test - - - - org.eclipse.jetty.alpn - alpn-api - 1.1.3.v20160715 - provided - - - - org.codehaus.groovy - groovy-all - 2.4.13 - - - - com.ibm.icu - icu4j - 60.2 - - - - joda-time - joda-time - 2.9.9 - - - - org.apache.commons - commons-configuration2 - 2.2 - - - - org.apache.commons - commons-collections4 - 4.1 - - - - @@ -495,8 +244,33 @@ org.eclipse.tycho tycho-p2-director-plugin + ${tycho-version} + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + + org.eclipse.tycho.extras + tycho-p2-extras-plugin ${tycho.extras.version} + + org.eclipse.tycho + tycho-p2-publisher-plugin + ${tycho.extras.version} + + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho.extras.version} + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0.1 + @@ -512,14 +286,6 @@ target-platform-configuration ${tycho-version} - - - - consider honor