diff --git a/note.for.update.readme b/note.for.update.readme new file mode 100644 index 0000000000..d40dd346b6 --- /dev/null +++ b/note.for.update.readme @@ -0,0 +1,26 @@ +1. cache repository: + - org.idempiere.p2.targetplatform.target + when update url of repository on target file, should change name of target also. format suggest idempiere-yymmdd + - repository on POM file (org.idempiere.parent/pom.xml) + each repository link should have unique id + + ${idempiere-equinox-repository-id} + ${idempiere-equinox-url} + p2 + + + when change value of url change value of id also + +2. feature + when feature list on org.idempiere.p2/category.xml change (version, delete, add,...) do update this file before build + +3. build + maven to p2 ([idempiere-root]/org.idempiere.maven.to.p2) build with profile buildP2FromMaven + mvn verify -P buildP2FromMaven + +4. equinox repository link +on org.idempiere.parent/pom.xml have two link idempiere-equinox-url, idempiere-orbit-url +it for run tycho-eclipserun-plugin and target for run standalone bom like org.idempiere.maven.to.p2 + +it's don't need up to date and don't need same to link on org.idempiere.p2.targetplatform.target +but better make it same \ No newline at end of file diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF index 3fec665a66..b58d4c0877 100644 --- a/org.adempiere.base.callout/META-INF/MANIFEST.MF +++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF @@ -10,4 +10,5 @@ Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml, OSGI-INF/bpartnerq Bundle-ActivationPolicy: lazy Export-Package: org.compiere.model Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.base.callout diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF index 0a529e0289..963dfb9f28 100644 --- a/org.adempiere.base.process/META-INF/MANIFEST.MF +++ b/org.adempiere.base.process/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Import-Package: javax.mail;version="1.5", org.apache.commons.collections.keyvalue;version="3.2.0" Eclipse-RegisterBuddy: org.adempiere.base Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.base.process diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index d77cb78095..c4aee5c15e 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -67,8 +67,8 @@ Import-Package: com.sun.mail.smtp;version="1.5", junit.framework;version="3.8.2";resolution:=optional, junit.textui;version="3.8.2";resolution:=optional, net.sf.cglib.proxy, - net.sourceforge.barbecue;version="1.5.0.beta1", - net.sourceforge.barbecue.linear.ean;version="1.5.0.beta1", + net.sourceforge.barbecue, + net.sourceforge.barbecue.linear.ean, org.apache.activemq;version="5.3.0", org.apache.commons.collections;version="3.2.0", org.apache.commons.collections.keyvalue;version="3.2.0", @@ -123,3 +123,4 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", bcprov;bundle-version="1.54.0", groovy-all;bundle-version="0.0.0", org.krysalis.barcode4j;bundle-version="0.0.0" +Automatic-Module-Name: org.adempiere.base diff --git a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF index f2797eb5c4..c58c7561b8 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF @@ -21,3 +21,4 @@ Import-Package: javax.servlet;version="2.3", org.osgi.service.http;version="1.2.0" Bundle-ManifestVersion: 2 Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.eclipse.equinox.http.servlet diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF index 29c0ad550c..fd8b5fcad9 100644 --- a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF @@ -16,4 +16,5 @@ Import-Package: javax.servlet;version="2.3",javax.servlet.http;version 0",org.osgi.service.http;version="1.2.0" Bundle-ManifestVersion: 2 Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.eclipse.equinox.http.servletbridge diff --git a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF index 58f1fa202d..070c38ed5e 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF @@ -14,3 +14,4 @@ Import-Package: javax.servlet;version="2.3.0", org.eclipse.equinox.http.servlet;version="1.1.0" Bundle-ManifestVersion: 2 Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.eclipse.equinox.servletbridge diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF index 4537929d40..36dc00e646 100644 --- a/org.adempiere.extend/META-INF/MANIFEST.MF +++ b/org.adempiere.extend/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Import-Package: junit.framework;version="3.8.2", org.supercsv.io, org.supercsv.prefs Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.extend diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF index be51c7a47d..7f0b1fb4c1 100644 --- a/org.adempiere.install/META-INF/MANIFEST.MF +++ b/org.adempiere.install/META-INF/MANIFEST.MF @@ -17,3 +17,4 @@ Import-Package: javax.mail;version="1.5", Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.install.InstallBundleActivator Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.install diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index a679191f08..8aa2002c82 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -24,8 +24,8 @@ - - + + diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF index 5270c0f023..7da604b92f 100644 --- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF +++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF @@ -9,4 +9,5 @@ Bundle-ClassPath: ., lib/jpayment.jar, lib/payflow.jar, lib/Verisign.jar +Automatic-Module-Name: org.adempiere.payment.processor diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF index 87517776eb..aaaf7e804a 100644 --- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF @@ -7,3 +7,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0", org.adempiere.base;bundle-version="0.0.0" Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.pipo.handlers diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF index b4d50265ff..1761107a4d 100644 --- a/org.adempiere.pipo/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo/META-INF/MANIFEST.MF @@ -18,3 +18,4 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", Service-Component: OSGI-INF/dictionaryservice.xml Bundle-Activator: org.adempiere.plugin.utils.PackInApplicationActivator Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.pipo diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF index a6dc595846..d9f5971be5 100644 --- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF +++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF @@ -49,3 +49,4 @@ Import-Package: org.adempiere.base, org.osgi.util.tracker;version="1.5.0" Export-Package: org.adempiere.plugin.utils Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.plugin.utils diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF index d6b9242ecc..eb482f2009 100644 --- a/org.adempiere.replication.server/META-INF/MANIFEST.MF +++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF @@ -12,3 +12,4 @@ Import-Package: javax.jms;version="1.1.0", Service-Component: OSGI-INF/serverfactory.xml Bundle-ActivationPolicy: lazy Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.replication.server diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF index dc170f3794..7e96e4a07b 100644 --- a/org.adempiere.replication/META-INF/MANIFEST.MF +++ b/org.adempiere.replication/META-INF/MANIFEST.MF @@ -12,3 +12,4 @@ Import-Package: javax.jms;version="1.1.0", org.apache.activemq;version="5.3.0" Eclipse-RegisterBuddy: org.adempiere.base Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.replication diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml index e9d12947a4..e5155a3dd8 100644 --- a/org.adempiere.report.jasper-feature/feature.xml +++ b/org.adempiere.report.jasper-feature/feature.xml @@ -35,13 +35,6 @@ install-size="0" version="0.0.0"/> - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath index fda455228c..75976faf99 100644 --- a/org.adempiere.report.jasper.library/.classpath +++ b/org.adempiere.report.jasper.library/.classpath @@ -4,12 +4,11 @@ - + - diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF index 63d9e05a06..ef2071b78b 100644 --- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF @@ -13,93 +13,9 @@ Bundle-ClassPath: ., lib/jasperreports-fonts.jar, lib/jasperreports-functions.jar, lib/olap4j.jar, - lib/rhino.jar, lib/spring-beans.jar, lib/spring-core.jar, lib/xmpcore.jar -Import-Package: bsh, - bsh.classpath, - bsh.collection, - bsh.commands, - bsh.engine, - bsh.org.objectweb.asm, - bsh.reflect, - bsh.servlet, - bsh.util, - javax.servlet;version="3.1.0", - javax.servlet.http;version="3.1.0", - javax.servlet.resources;version="3.1.0", - org.apache.commons.codec.digest;version="1.6.0", - org.apache.tools.ant, - org.apache.tools.ant.attribute, - org.apache.tools.ant.dispatch, - org.apache.tools.ant.filters, - org.apache.tools.ant.filters.util, - org.apache.tools.ant.helper, - org.apache.tools.ant.input, - org.apache.tools.ant.launch, - org.apache.tools.ant.listener, - org.apache.tools.ant.loader, - org.apache.tools.ant.property, - org.apache.tools.ant.taskdefs, - org.apache.tools.ant.taskdefs.compilers, - org.apache.tools.ant.taskdefs.condition, - org.apache.tools.ant.taskdefs.cvslib, - org.apache.tools.ant.taskdefs.email, - org.apache.tools.ant.taskdefs.launcher, - org.apache.tools.ant.taskdefs.optional, - org.apache.tools.ant.taskdefs.optional.ccm, - org.apache.tools.ant.taskdefs.optional.clearcase, - org.apache.tools.ant.taskdefs.optional.depend, - org.apache.tools.ant.taskdefs.optional.depend.constantpool, - org.apache.tools.ant.taskdefs.optional.ejb, - org.apache.tools.ant.taskdefs.optional.extension, - org.apache.tools.ant.taskdefs.optional.extension.resolvers, - org.apache.tools.ant.taskdefs.optional.i18n, - org.apache.tools.ant.taskdefs.optional.image, - org.apache.tools.ant.taskdefs.optional.j2ee, - org.apache.tools.ant.taskdefs.optional.javacc, - org.apache.tools.ant.taskdefs.optional.javah, - org.apache.tools.ant.taskdefs.optional.jdepend, - org.apache.tools.ant.taskdefs.optional.jlink, - org.apache.tools.ant.taskdefs.optional.jsp, - org.apache.tools.ant.taskdefs.optional.jsp.compilers, - org.apache.tools.ant.taskdefs.optional.junit, - org.apache.tools.ant.taskdefs.optional.native2ascii, - org.apache.tools.ant.taskdefs.optional.net, - org.apache.tools.ant.taskdefs.optional.pvcs, - org.apache.tools.ant.taskdefs.optional.script, - org.apache.tools.ant.taskdefs.optional.sos, - org.apache.tools.ant.taskdefs.optional.sound, - org.apache.tools.ant.taskdefs.optional.splash, - org.apache.tools.ant.taskdefs.optional.ssh, - org.apache.tools.ant.taskdefs.optional.testing, - org.apache.tools.ant.taskdefs.optional.unix, - org.apache.tools.ant.taskdefs.optional.vss, - org.apache.tools.ant.taskdefs.optional.windows, - org.apache.tools.ant.taskdefs.rmic, - org.apache.tools.ant.types, - org.apache.tools.ant.types.mappers, - org.apache.tools.ant.types.optional, - org.apache.tools.ant.types.optional.depend, - org.apache.tools.ant.types.optional.image, - org.apache.tools.ant.types.resolver, - org.apache.tools.ant.types.resources, - org.apache.tools.ant.types.resources.comparators, - org.apache.tools.ant.types.resources.selectors, - org.apache.tools.ant.types.selectors, - org.apache.tools.ant.types.selectors.modifiedselector, - org.apache.tools.ant.types.spi, - org.apache.tools.ant.util, - org.apache.tools.ant.util.depend, - org.apache.tools.ant.util.depend.bcel, - org.apache.tools.ant.util.facade, - org.apache.tools.ant.util.java15, - org.apache.tools.ant.util.optional, - org.apache.tools.ant.util.regexp, - org.apache.tools.bzip2, - org.apache.tools.mail, - org.apache.tools.tar, - org.apache.tools.zip, - org.apache.xml.serializer;version="2.7.1" DynamicImport-Package: * +Import-Package: org.w3c.dom.events;version="[3.0.0,4.0.0)" +Automatic-Module-Name: org.adempiere.report.jasper.library diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties index 860892e7b1..08faa30823 100644 --- a/org.adempiere.report.jasper.library/build.properties +++ b/org.adempiere.report.jasper.library/build.properties @@ -7,7 +7,6 @@ bin.includes = META-INF/,\ lib/jasperreports-fonts.jar,\ lib/jasperreports-functions.jar,\ lib/olap4j.jar,\ - lib/rhino.jar,\ lib/spring-beans.jar,\ lib/spring-core.jar,\ lib/xmpcore.jar diff --git a/org.adempiere.report.jasper.library/pom.xml b/org.adempiere.report.jasper.library/pom.xml index 09911c1d8f..096f719ed0 100644 --- a/org.adempiere.report.jasper.library/pom.xml +++ b/org.adempiere.report.jasper.library/pom.xml @@ -48,11 +48,6 @@ jasperreports-functions ${jp.version} - - org.mozilla - rhino - 1.7.6 - org.olap4j olap4j @@ -93,7 +88,7 @@ wget - ${url.file.srv}/jarfile/jp-6.3.1/jasperreports-fonts-6.3.1.jar + ${url.file.srv}/jarfile/jp-${jp.version}/jasperreports-fonts-${jp.version}.jar false lib jasperreports-fonts.jar diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF index a25a90945d..094d5661ab 100644 --- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF @@ -9,9 +9,11 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.report.jasper;bundle-version="0.0.0" Import-Package: net.sf.jasperreports.engine, net.sf.jasperreports.engine.export, + net.sf.jasperreports.swing, net.sf.jasperreports.view, org.adempiere.report.jasper, org.osgi.framework Service-Component: OSGI-INF/jrviewerprovider.xml Bundle-ActivationPolicy: lazy Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.report.jasper.swing diff --git a/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java b/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java index b5e6960963..56f4202bdd 100644 --- a/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java +++ b/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java @@ -22,7 +22,7 @@ import net.sf.jasperreports.engine.JasperExportManager; import net.sf.jasperreports.engine.JasperPrint; import net.sf.jasperreports.engine.JasperReport; import net.sf.jasperreports.engine.export.JRXlsExporter; -import net.sf.jasperreports.view.JRViewer; +import net.sf.jasperreports.swing.JRViewer; import org.compiere.apps.EMailDialog; import org.compiere.model.MUser; @@ -76,8 +76,8 @@ public class JasperReportViewer extends JRViewer { tlbToolBar.add(comboBox); // Set default viewer zoom level - btnFitPage.setSelected(true); - setZooms(); + //btnFitPage.setSelected(true); + //setZooms(); } public JasperPrint getJasperPrint() { @@ -89,12 +89,12 @@ public class JasperReportViewer extends JRViewer { } - @Override + //@Override protected void paintPage(Graphics2D grx) { ClassLoader cl = Thread.currentThread().getContextClassLoader(); try { Thread.currentThread().setContextClassLoader(JasperReport.class.getClassLoader()); - super.paintPage(grx); + //super.paintPage(grx); } finally { Thread.currentThread().setContextClassLoader(cl); } diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF index c90cefe1ba..37bf088441 100644 --- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF @@ -12,5 +12,6 @@ Import-Package: javax.servlet;version="2.5.0", org.apache.commons.codec, org.apache.commons.codec.binary Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.report.jasper.webapp diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF index e564aba746..55624d4410 100644 --- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: iDempiere JasperReport integration Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true Bundle-Version: 5.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: net.sourceforge.barbecue;version="1.5.0.beta1", +Import-Package: net.sourceforge.barbecue, org.apache.commons.codec, org.apache.commons.codec.binary, org.apache.commons.logging;version="1.1.1", @@ -15,3 +15,4 @@ Service-Component: OSGI-INF/processfactory.xml Export-Package: org.adempiere.report.jasper Bundle-ActivationPolicy: lazy Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.report.jasper diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index 8f0684c25b..4e4581b15f 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -89,13 +89,6 @@ version="0.0.0" unpack="false"/> - - - - - - + + + + diff --git a/org.adempiere.server-feature/idempiere-server.sh b/org.adempiere.server-feature/idempiere-server.sh index 131b8d7cc4..6b4cc1e436 100644 --- a/org.adempiere.server-feature/idempiere-server.sh +++ b/org.adempiere.server-feature/idempiere-server.sh @@ -21,7 +21,7 @@ echo Starting iDempiere Server echo =================================== -VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl +VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=$BASE/jettyhome -Djetty.base=$BASE/jettyhome diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index 9f9a7883a2..bb538b7049 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -9,7 +9,7 @@ -console - -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml + -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index c934321719..11e55d29d5 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -22,13 +22,13 @@ - + - - + + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index f1b25e7b4e..000a8a39d3 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.12.100.v20180210-1608.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.0.v20180409-1500.jar osgi.install.area=setup osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.eclipse.equinox.util,\ @@ -43,9 +43,8 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ javax.transaction,\ org.eclipse.jetty.osgi-servlet-api,\ javax.annotation-api,\ - org.slf4j.api,\ - org.slf4j.jcl,\ - org.slf4j.jdk14,\ + slf4j.api,\ + slf4j.jcl,\ org.apache.commons.codec,\ org.eclipse.osgi.compatibility.state,\ org.eclipse.osgi.compatibility.plugins,\ diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF index f2dfea2b31..8b905ddfb9 100644 --- a/org.adempiere.server/META-INF/MANIFEST.MF +++ b/org.adempiere.server/META-INF/MANIFEST.MF @@ -40,3 +40,4 @@ Export-Package: org.adempiere.server, Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/acctprocessorfactory.xml, OSGI-INF/alertprocessorfactory.xml, OSGI-INF/ldapprocessorfactory.xml, OSGI-INF/requestprocessorfactory.xml, OSGI-INF/schedulerfactory.xml, OSGI-INF/workflowprocessorfactory.xml Bundle-Activator: org.adempiere.server.AdempiereServerActivator +Automatic-Module-Name: org.adempiere.server diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index f32e0c5dcb..0323e0a73a 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -40,10 +40,6 @@ id="org.eclipse.ecf.core.ssl.feature" version="0.0.0"/> - - diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF index 0ba734d43b..b5b3a0ffa0 100644 --- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF @@ -89,3 +89,4 @@ Import-Package: javax.net.ssl, org.osgi.framework;version="1.5.0" Service-Component: OSGI-INF/*.xml Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.adempiere.ui.swing diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 0820a867e6..933f0e738f 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -159,3 +159,4 @@ Eclipse-ExtensibleAPI: true Web-ContextPath: webui Service-Component: OSGI-INF/reportviewerprovider.xml, OSGI-INF/defaultinfofactory.xml, OSGI-INF/defaulteditorfactory.xml, OSGI-INF/jrviewerprovider.xml, OSGI-INF/resourcefinder.xml, OSGI-INF/defaultpaymentformfactory.xml, OSGI-INF/processfactory.xml, OSGI-INF/defaultprintshippinglabel.xml, OSGI-INF/defaultcreatefromfactory.xml, OSGI-INF/defaultformfactory.xml, OSGI-INF/feedbackservice.xml, OSGI-INF/zulgadgetfactory.xml, OSGI-INF/jfgchartrenderer.xml Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.adempiere.ui.zk diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF index 2f5fbd0da2..46c74f8c94 100644 --- a/org.adempiere.ui/META-INF/MANIFEST.MF +++ b/org.adempiere.ui/META-INF/MANIFEST.MF @@ -28,3 +28,4 @@ Export-Package: org.compiere.apps, Bundle-ClassPath: ., lib/org-netbeans-api-visual.jar, lib/org-openide-util.jar +Automatic-Module-Name: org.adempiere.ui diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF index 71cad98ed7..29b5295dd8 100644 --- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF @@ -9,3 +9,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.compiere.wstore Jetty-WarPatchFragmentFolderPath: / Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.webstore.resource diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF index 3f5bc63952..a3787fbb50 100644 --- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF @@ -18,3 +18,4 @@ Import-Package: javax.servlet, org.apache.taglibs.standard.tag.el.core Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0" Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.webstore.servlet diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF index 2ee23321a3..d04f4101a1 100644 --- a/org.adempiere.webstore/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore/META-INF/MANIFEST.MF @@ -82,6 +82,7 @@ Import-Package: javax.servlet;version="3.0.0", org.osgi.service.http;version="1.2.1" Bundle-Activator: org.adempiere.webstore.Activator Bundle-ClassPath: . +Automatic-Module-Name: org.adempiere.webstore diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF index 983976fe24..1881c4239d 100644 --- a/org.apache.ecs/META-INF/MANIFEST.MF +++ b/org.apache.ecs/META-INF/MANIFEST.MF @@ -13,3 +13,4 @@ Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml", org.apache.ecs.xhtml;uses:="org.apache.ecs", org.apache.ecs.xml;uses:="org.apache.ecs" Bundle-ClassPath: . +Automatic-Module-Name: org.apache.ecs diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index f214324601..2c5117642f 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -17,4 +17,5 @@ Import-Package: org.jfree.io;version="1.0.23", Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator Service-Component: OSGI-INF/oracleprovider.xml +Automatic-Module-Name: org.compiere.db.oracle.provider diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index ae8b53bd49..40ff7440da 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -18,3 +18,4 @@ Import-Package: junit.framework;version="3.8.2", Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.db.postgresql.PostgreSQLBundleActivator Service-Component: OSGI-INF/pgprovider.xml +Automatic-Module-Name: org.compiere.db.postgresql.provider diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml index b6e74451d3..98967a6e35 100644 --- a/org.idempiere.eclipse.platform-feature/feature.xml +++ b/org.idempiere.eclipse.platform-feature/feature.xml @@ -53,10 +53,6 @@ id="org.eclipse.ecf.filetransfer.ssl.feature" version="0.0.0"/> - - - - - - + + org.idempiere + org.idempiere.parent + 5.1.0-SNAPSHOT + ../../org.idempiere.parent/pom.xml + + 4.0.0 + 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 + 2.9.5 + 3.1.4 + 1.1.0.Final + 5.0.3 + 20171018 + 1.7.25 + + + + + orbit-photon-R20180531190352 + http://download.eclipse.org/tools/orbit/downloads/drops2/R20180531190352/repository + p2 + + + org.jfree.chart + http://nexus.orbisgis.org/content/repositories/osgi-maven + + + jasperstudio-6.6.0 + https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0 + 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.slf4j:slf4j-api:jar:${slf4j.version} + true + false + + + org.slf4j:slf4j-jdk14:jar:${slf4j.version} + true + false + + + org.slf4j:slf4j-jcl:jar:${slf4j.version} + 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="${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} + true + false + + + commons-digester:commons-digester:jar:2.1 + true + false + + + com.google.zxing:core:jar:3.2.1 + true + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxen:jar:1.1.1_2 + true + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino:jar:1.7.6_1 + true + false + + + org.jfree:jfreechart-osgi:jar:1.0.19 + true + false + + + org.jfree:jcommon-osgi:jar:1.0.23 + true + false + + + org.apache.poi:poi:jar:3.15 + true + false + true + + org.apache.poi.poi + poi-ooxml + *;resolution:=optional + * + + + + org.apache.poi:poi-ooxml:jar:3.15 + true + false + true + + org.apache.poi.poi-ooxml + poi-ooxml + *;resolution:=optional + * + + + + org.apache.poi:poi-ooxml-schemas:jar:3.15 + true + false + true + + org.apache.poi.poi-ooxml-schemas + poi-ooxml-schemas + *;resolution:=optional + * + + + + com.fasterxml.jackson.core:jackson-core:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.core:jackson-annotations:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.core:jackson-databind:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.datatype:jackson-datatype-guava:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.datatype:jackson-datatype-json-org:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${jackson.version} + true + false + + + com.fasterxml.jackson.module:jackson-module-jsonSchema:jar:${jackson.version} + true + false + + + org.codehaus.woodstox:stax2-api:jar:${stax2.api.version} + true + false + + + javax.validation:validation-api:jar:${validation.api.version} + true + false + + + com.fasterxml.woodstox:woodstox-core:jar:${woodstox.core.version} + true + false + + + org.json:json:jar:${json.version} + true + false + + + + + + + org.javassist:javassist:${zk.javassist.src.version} + false + false + true + + zjavassist + zjavassist + + + ${zk.version} + + + + + + org.apache.batik.anim:1.9.1.v20180528-1434 + + + org.apache.batik.bridge:1.9.1.v20180313-1559 + + + org.apache.batik.codec:1.9.1.v20180313-1559 + + + org.apache.batik.constants:1.9.1.v20180227-1645 + + + org.apache.batik.css:1.9.1.v20180313-1559 + + + org.apache.batik.dom:1.9.1.v20180528-1434 + + + org.apache.batik.dom.svg:1.9.1.v20180313-1559 + + + org.apache.batik.ext.awt:1.9.1.v20180227-1645 + + + org.apache.batik.extension:1.9.1.v20180313-1559 + + + org.apache.batik.gvt:1.9.1.v20180227-1645 + + + org.apache.batik.i18n:1.9.1.v20180227-1645 + + + org.apache.batik.parser:1.9.1.v20180313-1559 + + + org.apache.batik.pdf:1.9.1.v20180417-1407 + + + org.apache.batik.script:1.9.1.v20180313-1559 + + + org.apache.batik.svggen:1.9.1.v20180313-1559 + + + org.apache.batik.swing:1.9.1.v20180313-1559 + + + org.apache.batik.transcoder:1.9.1.v20180313-1559 + + + org.apache.batik.util:1.9.1.v20180227-1645 + + + org.apache.batik.util.gui:1.9.1.v20180227-1645 + + + org.apache.batik.xml:1.9.1.v20180227-1645 + + + org.apache.xmlgraphics:2.2.0.v20180410-1551 + + + com.jaspersoft.studio.bundles.barbecue:1.5.0.beta1_b02 + + + com.jaspersoft.studio.bundles.itext:2.1.7.js6_b02 + + + org.w3c.dom.svg.patch:1.1.0.b02 + + + org.krysalis.barcode4j:2.1.0 + + + + + + + + + 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 + + copy + + + + + ${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 + + + + + + + + move-file + package + + rename + + + + + ${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.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.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 9f9dfb9d69..9b6ad9cb8c 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,4 +1,4 @@ - + @@ -49,925 +49,934 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml index b64aa8a8d0..3a8dd13886 100644 --- a/org.idempiere.p2/category.xml +++ b/org.idempiere.p2/category.xml @@ -36,36 +36,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -84,5 +54,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product index 9f9a7883a2..bb538b7049 100644 --- a/org.idempiere.p2/server.product +++ b/org.idempiere.p2/server.product @@ -9,7 +9,7 @@ -console - -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml + -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 154ab074cc..51bc17bd33 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -10,101 +10,30 @@ Maven parent project for idempiere - 1.1.0 + 1.2.0 ${tycho.version} UTF-8 - 9.4.9.v20180320 - 6.3.1 + 9.4.11.v20180605 + 6.7.0 8.5.0 3.18.2-GA 3.0.2 1.4.0 1.0.0 - 6.0.0.v20180116-1719 8.1.12.v20180117 org.idempiere.p2.targetplatform - http://download.eclipse.org/eclipse/updates/4.7 + http://download.eclipse.org/eclipse/updates/4.8 + eclipse-photon + http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository + orbit-photon-R20180606145124 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 +62,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 +346,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 +371,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 +388,134 @@ - \ 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 + + + JavaSE-1.8 + JavaSE-1.8 + + + + + + + + buildP2FromMaven + + + ${idempiere-equinox-repository-id} + ${idempiere-equinox-url} + p2 + + + ${idempiere-orbit-repository-id} + ${idempiere-orbit-url} + p2 + + + + + + diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF index fb45f5f397..bb8e071428 100644 --- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF +++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF @@ -342,3 +342,4 @@ Import-Package: fit, org.w3c.dom.xpath Service-Component: OSGI-INF/fitfixturefactory.xml Bundle-ClassPath: . +Automatic-Module-Name: org.idempiere.ui.zk.selenium diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 0353eafd50..a17f70a8d1 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -218,3 +218,4 @@ Export-Package: javax.ws.rs, org.springframework.web.util Web-ContextPath: ADInterface Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.idempiere.webservices diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF index 80b250f2f7..f89e8316e3 100644 --- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF @@ -197,3 +197,4 @@ Import-Package: javax.servlet;version="3.1.0", javax.servlet.descriptor;version="3.1.0", javax.servlet.http;version="3.1.0", org.slf4j;version="1.7.2" +Automatic-Module-Name: org.idempiere.zk.extra diff --git a/org.slf4j.jdk14/.classpath b/org.slf4j.jdk14/.classpath deleted file mode 100644 index 7ce6501307..0000000000 --- a/org.slf4j.jdk14/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.slf4j.jdk14/.project b/org.slf4j.jdk14/.project deleted file mode 100644 index d0a0a4db2c..0000000000 --- a/org.slf4j.jdk14/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - org.slf4j.jdk14 - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.slf4j.jdk14/.settings/org.eclipse.core.resources.prefs b/org.slf4j.jdk14/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/org.slf4j.jdk14/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.slf4j.jdk14/.settings/org.eclipse.jdt.core.prefs b/org.slf4j.jdk14/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dca..0000000000 --- a/org.slf4j.jdk14/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +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.compliance=1.8 -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.slf4j.jdk14/.settings/org.eclipse.m2e.core.prefs b/org.slf4j.jdk14/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb..0000000000 --- a/org.slf4j.jdk14/.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.slf4j.jdk14/.settings/org.eclipse.pde.core.prefs b/org.slf4j.jdk14/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index f29e940a00..0000000000 --- a/org.slf4j.jdk14/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/org.slf4j.jdk14/META-INF/MANIFEST.MF b/org.slf4j.jdk14/META-INF/MANIFEST.MF deleted file mode 100644 index 4175f6f623..0000000000 --- a/org.slf4j.jdk14/META-INF/MANIFEST.MF +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: SLF4J with JDK logger -Bundle-SymbolicName: org.slf4j.jdk14 -Bundle-Version: 5.1.0.qualifier -Fragment-Host: org.slf4j.api;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.slf4j.impl;version=1.7.2 -Import-Package: org.slf4j;version=1.7.2, - org.slf4j.spi;version=1.7.2,org.slf4j.helpers;version=1.7.2 -Bundle-ClassPath: lib/slf4j-jdk14.jar diff --git a/org.slf4j.jdk14/buckminster.cspex b/org.slf4j.jdk14/buckminster.cspex deleted file mode 100644 index c6cc7e6633..0000000000 --- a/org.slf4j.jdk14/buckminster.cspex +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/org.slf4j.jdk14/build.properties b/org.slf4j.jdk14/build.properties deleted file mode 100644 index 4f2dec414f..0000000000 --- a/org.slf4j.jdk14/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = META-INF/,\ - lib/slf4j-jdk14.jar diff --git a/org.slf4j.jdk14/copyjars.xml b/org.slf4j.jdk14/copyjars.xml deleted file mode 100644 index c7b46d1e1c..0000000000 --- a/org.slf4j.jdk14/copyjars.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/org.slf4j.jdk14/pom.xml b/org.slf4j.jdk14/pom.xml deleted file mode 100644 index 266f925169..0000000000 --- a/org.slf4j.jdk14/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - 4.0.0 - - org.idempiere - org.idempiere.parent - 5.1.0-SNAPSHOT - ../org.idempiere.parent/pom.xml - - org.slf4j.jdk14 - eclipse-plugin - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - validate - - copy - - - - - org.slf4j - slf4j-jdk14 - 1.7.2 - - - lib - true - true - true - - - - - - - \ No newline at end of file diff --git a/org.slf4j.jdk14/readme.txt b/org.slf4j.jdk14/readme.txt deleted file mode 100644 index 88b8741f09..0000000000 --- a/org.slf4j.jdk14/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Need to repackage the slf4j-jdk14 bundle from maven here since the slf4j api bundle from orbit is with the org.slf4j.api -symbolic name but the slf4j-jdk14 expect the slf4j.api symbolic name. diff --git a/pom.xml b/pom.xml index f010093fb5..03dfd1e482 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,6 @@ org.idempiere.ui.zk.selenium org.idempiere.webservices org.idempiere.zk.extra - org.slf4j.jdk14 org.adempiere.report.jasper-feature org.adempiere.bundles.external-feature org.adempiere.base-feature @@ -74,4 +73,4 @@ ${idempiere.target} - \ No newline at end of file +