From 4415031372e4eb9e1b12132fddabd4dfbc928912 Mon Sep 17 00:00:00 2001 From: hieplq Date: Fri, 9 Mar 2018 14:33:31 +0700 Subject: [PATCH] IDEMPIERE-3531:add export product now product package same buckminster age. product output directory: org.idempiere.p2/target/products/org.adempiere.server.product p2 repository output direcotry: org.idempiere.p2/target/repository --- org.idempiere.maven.to.p2/pom.xml | 252 ++---------------------------- org.idempiere.p2/pom.xml | 49 +++++- org.idempiere.parent/pom.xml | 237 +++++++++++++++++++++++++++- 3 files changed, 285 insertions(+), 253 deletions(-) diff --git a/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/pom.xml index 2d12b8b643..c2d76cf873 100644 --- a/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/pom.xml @@ -86,22 +86,11 @@ true false - + org.apache.taglibs:taglibs-standard-impl:jar:1.2.5 true @@ -606,230 +595,13 @@ 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 + -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 diff --git a/org.idempiere.p2/pom.xml b/org.idempiere.p2/pom.xml index f3c8ef93ea..2a0db0bb6d 100644 --- a/org.idempiere.p2/pom.xml +++ b/org.idempiere.p2/pom.xml @@ -12,6 +12,29 @@ + + + org.eclipse.tycho + tycho-p2-repository-plugin + + + + build-site-p2 + + assemble-repository + + + + + + true + + false + + + org.eclipse.tycho tycho-p2-director-plugin @@ -23,24 +46,34 @@ materialize-products - - - archive-products - - archive-products - - + repository - org.adempiere.server.product + ${idempiere.product.id} idempiere-server-${unqualifiedVersion}-${buildQualifier} + + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + + -application org.eclipse.equinox.p2.director -repository file:${project.build.directory}/repository -destination ${project.build.directory}/products/${idempiere.product.id}/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch} -installIU "${extra.ui.install}" -profileProperties org.eclipse.update.install.features=true -p2.os ${tycho.env.osgi.os} -p2.ws ${tycho.env.osgi.ws} -p2.arch ${tycho.env.osgi.arch} -consoleLog -roaming + + + + + eclipse-run + + package + + + \ No newline at end of file diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 151fd55935..1b59715b44 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -19,11 +19,13 @@ 3.0.2 1.4.0 1.0.0 - + org.idempiere.p2.targetplatform http://download.eclipse.org/eclipse/updates/4.7 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 @@ -166,6 +168,231 @@ 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 @@ -178,9 +405,9 @@ 3.1.0 - org.apache.maven.plugins - maven-dependency-plugin - ${maven.dependency.version} + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency.version} @@ -223,7 +450,7 @@ ${project.version} - +