From d2a2e3d19f59fb15b8bba3679b4f289d739aabb8 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 31 Oct 2020 19:48:16 +0700 Subject: [PATCH] Idempiere 4492 improve target platform (continue) (#335) * IDEMPIERE-4492 update jetty to 9.4.33.v20201020 update atmosphere to 2.5.15 * IDEMPIERE-4492 update jetty to 9.4.33.v20201020 (update configuration) update to default jetty configuration delete unused configuration (alpn, http2,..) * IDEMPIERE-4492 update orbit eclipse repository to 4.17 * IDEMPIERE-4492 update orbit eclipse repository to 4.17 (on parent pom) * IDEMPIERE-4492 update jasper to 6.15.0 * IDEMPIERE-4492 update jasper to 6.15.0 (IDEMPIERE-4504) get rid of bundle "org.w3c.dom.events version 3.0.0" by use old version of org.w3c.dom.smil note: on target platform a bundle has multi version then tycho can pickup correct version define on feature (tab included plugins, field version) but on eclipse when sync launching from .product it don't respect that value, always set highest version to bundle workaround: on target platform manual un-select bundle org.w3c.dom.smil 1.0.1 * IDEMPIERE-4492 update atmosphere to 2.6.4 * IDEMPIERE-4492 refine target platform use targetplatform-dsl to generate target platform https://github.com/eclipse-cbi/targetplatform-dsl + don't need to care update bundle version when update repository + at moment org.idempiere.eclipse.platform-feature include some feature form eclipse repository so target has to include that feature so target platform will include all bundler request by feature and bundle request by plugins of that feature and so on (ever optional so it make target content has more plugins than what we use on project next step will convert include feature to include plugins to define only what we used * IDEMPIERE-4492 refine target platform (continue) don't include framework feature, use include plugins to void load transitive dependency so minimize target flatform remove some unused feature from idempiere product * IDEMPIERE-4492 update c3p0 and database jdbc (patch from Carlos) * IDEMPIERE-4492 improve target platform (continue) provide test bundle require to repository for use on offline remove some unused bundle also fix for IDEMPIERE-4475 * IDEMPIERE-4492 improve target platform (continue IDEMPIERE-4475) add launch for unittest add more require bundle for unit test --- .../model.generator.launch | 43 ++-- .../packinfolder.app.launch | 43 ++-- .../sign.database.build.launch | 43 ++-- .../synchronize-terminology.app.launch | 43 ++-- .../translation.app.launch | 43 ++-- org.adempiere.install/install.app.launch | 18 +- .../install.console.app.launch | 18 +- org.adempiere.server-feature/server.product | 12 +- .../server.product.functionaltest.launch | 88 +++----- .../server.product.launch | 41 ++-- .../org.idempiere.p2.targetplatform.target | 61 ++---- .../org.idempiere.p2.targetplatform.tpd | 59 +----- org.idempiere.p2/category.xml | 43 ++-- org.idempiere.parent/pom.xml | 2 +- org.idempiere.test-feature/.project | 23 ++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + org.idempiere.test-feature/build.properties | 1 + org.idempiere.test-feature/feature.xml | 125 +++++++++++ org.idempiere.test-feature/pom.xml | 11 + org.idempiere.test/idempiere.unit.test.launch | 196 ++---------------- pom.xml | 1 + 22 files changed, 372 insertions(+), 548 deletions(-) create mode 100644 org.idempiere.test-feature/.project create mode 100644 org.idempiere.test-feature/.settings/org.eclipse.core.resources.prefs create mode 100644 org.idempiere.test-feature/.settings/org.eclipse.m2e.core.prefs create mode 100644 org.idempiere.test-feature/build.properties create mode 100644 org.idempiere.test-feature/feature.xml create mode 100644 org.idempiere.test-feature/pom.xml diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch index 6fb3fd8d9a..0b9d94a0b6 100644 --- a/org.adempiere.base-feature/model.generator.launch +++ b/org.adempiere.base-feature/model.generator.launch @@ -30,9 +30,6 @@ - - - @@ -41,37 +38,25 @@ - - - - - - - - - - - + - - - - - - + + - + + + @@ -81,11 +66,11 @@ + - - + @@ -98,19 +83,17 @@ - - + - + + - - - - + + diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch index 83b0a2227b..2ba86d48ef 100644 --- a/org.adempiere.base-feature/packinfolder.app.launch +++ b/org.adempiere.base-feature/packinfolder.app.launch @@ -30,9 +30,6 @@ - - - @@ -41,37 +38,25 @@ - - - - - - - - - - - + - - - - - - + + - + + + @@ -81,11 +66,11 @@ + - - + @@ -98,19 +83,17 @@ - - + - + + - - - - + + diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index 6d1318d431..3723fa6add 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -30,9 +30,6 @@ - - - @@ -41,37 +38,25 @@ - - - - - - - - - - - + - - - - - - + + - + + + @@ -81,11 +66,11 @@ + - - + @@ -98,19 +83,17 @@ - - + - + + - - - - + + diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index cb10270fab..d4a034886c 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -30,9 +30,6 @@ - - - @@ -41,37 +38,25 @@ - - - - - - - - - - - + - - - - - - + + - + + + @@ -81,11 +66,11 @@ + - - + @@ -98,19 +83,17 @@ - - + - + + - - - - + + diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index 08c2f349dd..a86a26bc10 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -30,9 +30,6 @@ - - - @@ -41,37 +38,25 @@ - - - - - - - - - - - + - - - - - - + + - + + + @@ -81,11 +66,11 @@ + - - + @@ -98,19 +83,17 @@ - - + - + + - - - - + + diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 77ef2af5e4..0f301f70b1 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -44,12 +44,12 @@ - - + + - - + + @@ -59,7 +59,7 @@ - + @@ -74,14 +74,14 @@ - - + - + + - + diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index 2cc9d06aef..1df3dac7bb 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -44,12 +44,12 @@ - - + + - - + + @@ -57,7 +57,7 @@ - + @@ -71,14 +71,14 @@ - - + - + + - + diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index 6871236204..3a15fc320c 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -60,15 +60,15 @@ - - - - - - + + + + + + diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index 062a013d4c..9984140045 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -30,9 +30,6 @@ - - - @@ -42,56 +39,38 @@ - - - - - - - - - - - + - - - - - - - - - + - - + - - - - - + + + + + + @@ -114,12 +93,12 @@ - - + + @@ -129,19 +108,17 @@ + - - + - - @@ -156,20 +133,17 @@ - - - - - + + + - - - - - + + + + @@ -178,15 +152,14 @@ - - + - + - + @@ -195,18 +168,15 @@ - - - + - + + + - - - - - + + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index d716c6dbf9..4d32496d5e 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -76,7 +76,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -112,13 +112,13 @@ - - - - - - - + + + + + + + @@ -180,7 +180,7 @@ - + @@ -229,6 +229,7 @@ + @@ -245,7 +246,7 @@ - + @@ -294,7 +295,7 @@ - + @@ -313,10 +314,10 @@ - + - + @@ -339,6 +340,11 @@ + + + + + @@ -350,6 +356,7 @@ + @@ -360,7 +367,7 @@ - + @@ -371,7 +378,7 @@ - + @@ -386,7 +393,7 @@ - + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 4bf4035c1d..7d211cac7d 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,15 +1,11 @@ - + - - - - @@ -18,7 +14,6 @@ - @@ -36,7 +31,6 @@ - @@ -76,22 +70,12 @@ - - - - - - - - - - @@ -104,7 +88,6 @@ - @@ -117,9 +100,7 @@ - - @@ -127,9 +108,7 @@ - - @@ -137,13 +116,8 @@ - - - - - @@ -171,7 +145,6 @@ - @@ -193,36 +166,22 @@ - - - - - - - - - - - - - - @@ -252,11 +211,9 @@ - - @@ -277,7 +234,6 @@ - @@ -295,7 +251,6 @@ - @@ -331,13 +286,22 @@ + + + - + + - + + + + + + @@ -373,7 +337,6 @@ - diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd index 283dd9afb1..c81683e143 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd @@ -6,10 +6,6 @@ with source configurePhase allEnvironments location "https://idempiere.github.io/binary.file/p2.maven/org.idempiere.webservice.client-p2-R20190412" { com.sun.istack.commons-runtime com.sun.org.apache.xml.internal.resolver - com.sun.xml.bind.external.rngom - com.sun.xml.bind.jaxb-jxc - com.sun.xml.bind.jaxb-osgi - com.sun.xml.bind.jaxb-xjc com.sun.xml.fastinfoset.FastInfoset com.sun.xml.messaging.saaj.impl com.sun.xml.stream.buffer.streambuffer @@ -18,7 +14,6 @@ location "https://idempiere.github.io/binary.file/p2.maven/org.idempiere.webserv jakarta.xml.ws-api org.glassfish.external.management-api org.glassfish.gmbal.gmbal - org.glassfish.ha.ha-api org.glassfish.jaxb.txw2 org.glassfish.pfl.pfl-asm org.glassfish.pfl.pfl-basic @@ -36,7 +31,6 @@ location "https://idempiere.github.io/binary.file/p2.zk/9.5.0.1" { zk zkbind zkplus - zkplus-legacy zkwebfragment zul zweb @@ -76,22 +70,12 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { com.sun.xml.bind.jaxb-impl com.sun.xml.ws.jaxws-rt groovy - groovy-ant - groovy-cli-commons - groovy-cli-picocli groovy-console groovy-datetime - groovy-docgenerator - groovy-groovydoc - groovy-groovysh - groovy-jmx groovy-json groovy-jsr223 - groovy-macro groovy-nio - groovy-servlet groovy-sql - groovy-swing groovy-xml jakarta.annotation-api jakarta.jws-api @@ -104,7 +88,6 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { javax.transaction-api javax.validation.api javax.websocket-api - javax.xml.rpc-api joda-time json net.sf.jasperreports.engine @@ -117,9 +100,7 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { org.apache.commons.commons-configuration2 org.apache.commons.digester org.apache.commons.discovery - org.apache.commons.javaflow org.apache.cxf.cxf-core - org.apache.cxf.cxf-rt-bindings-object org.apache.cxf.cxf-rt-bindings-soap org.apache.cxf.cxf-rt-bindings-xml org.apache.cxf.cxf-rt-databinding-jaxb @@ -127,9 +108,7 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { org.apache.cxf.cxf-rt-frontend-jaxrs org.apache.cxf.cxf-rt-frontend-jaxws org.apache.cxf.cxf-rt-frontend-simple - org.apache.cxf.cxf-rt-management org.apache.cxf.cxf-rt-rs-extension-providers - org.apache.cxf.cxf-rt-rs-http-sci org.apache.cxf.cxf-rt-rs-service-description org.apache.cxf.cxf-rt-security org.apache.cxf.cxf-rt-transports-http @@ -137,13 +116,8 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { org.apache.cxf.cxf-rt-ws-addr org.apache.cxf.cxf-rt-ws-policy org.apache.cxf.cxf-rt-wsdl - org.apache.cxf.cxf-spring-boot-autoconfigure org.apache.cxf.rt-ws-transfer - org.apache.felix.inventory org.apache.felix.webconsole - org.apache.felix.webconsole.plugins.ds - org.apache.felix.webconsole.plugins.memoryusage - org.apache.felix.webconsole.plugins.packageadmin org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec org.apache.neethi org.apache.poi.poi @@ -171,7 +145,6 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { org.apache.taglibs.standard-impl org.apache.taglibs.standard-jstlel org.apache.taglibs.taglibs-standard-spec - org.apache.velocity org.apache.ws.xmlschema.core org.apache.xmlbeans org.apache.xmlgraphics.batik-anim @@ -193,36 +166,22 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { org.apache.xmlgraphics.batik-xml org.atmosphere.runtime org.cryptacular - org.eclipse.jetty.alpn.api - org.eclipse.jetty.alpn.client - org.eclipse.jetty.alpn.openjdk8.server - org.eclipse.jetty.alpn.server org.eclipse.jetty.annotations org.eclipse.jetty.apache-jsp org.eclipse.jetty.client org.eclipse.jetty.continuation org.eclipse.jetty.deploy org.eclipse.jetty.http - org.eclipse.jetty.http2.client - org.eclipse.jetty.http2.client.http - org.eclipse.jetty.http2.common - org.eclipse.jetty.http2.hpack - org.eclipse.jetty.http2.server org.eclipse.jetty.io org.eclipse.jetty.jaas org.eclipse.jetty.jmx org.eclipse.jetty.jndi org.eclipse.jetty.osgi-servlet-api - org.eclipse.jetty.osgi.alpn.fragment org.eclipse.jetty.osgi.boot org.eclipse.jetty.osgi.boot.jsp - org.eclipse.jetty.osgi.boot.warurl org.eclipse.jetty.osgi.httpservice org.eclipse.jetty.plus - org.eclipse.jetty.proxy - org.eclipse.jetty.rewrite org.eclipse.jetty.security - org.eclipse.jetty.security.jaspi org.eclipse.jetty.server org.eclipse.jetty.servlet org.eclipse.jetty.servlets @@ -252,11 +211,9 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { org.passay org.springframework.spring-jcl org.w3c.dom.smil - org.w3c.dom.svg.patch org.zkoss.zsoup slf4j.api slf4j.jcl - slf4j.jdk14 stax2-api } @@ -280,7 +237,6 @@ location "https://download.eclipse.org/eclipse/updates/4.17" { org.eclipse.ecf.provider.filetransfer org.eclipse.ecf.provider.filetransfer.httpclient45 org.eclipse.ecf.provider.filetransfer.ssl - org.eclipse.ecf.ssl org.eclipse.equinox.app org.eclipse.equinox.common org.eclipse.equinox.concurrent @@ -299,7 +255,6 @@ location "https://download.eclipse.org/eclipse/updates/4.17" { org.eclipse.equinox.p2.jarprocessor org.eclipse.equinox.p2.metadata org.eclipse.equinox.p2.metadata.repository - org.eclipse.equinox.p2.operations org.eclipse.equinox.p2.repository org.eclipse.equinox.p2.touchpoint.eclipse org.eclipse.equinox.p2.touchpoint.natives @@ -340,13 +295,22 @@ location "https://download.eclipse.org/eclipse/updates/4.17" { org.eclipse.text //<< for test + org.opentest4j + org.apiguardian + org.junit org.junit.jupiter.api org.junit.jupiter.params org.junit.jupiter.engine - org.opentest4j + org.junit.jupiter.migrationsupport + org.junit.vintage.engine org.junit.platform.engine org.junit.platform.commons - org.apiguardian + org.junit.platform.launcher + org.junit.platform.runner + org.junit.platform.suite.api + org.eclipse.pde.junit.runtime + org.eclipse.jdt.junit.runtime + org.eclipse.jdt.junit5.runtime //>> } @@ -383,7 +347,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202008312006 org.glassfish.jersey.ext.entityfiltering org.glassfish.jersey.media.jersey-media-json-jackson org.hamcrest.core - org.junit org.w3c.css.sac org.w3c.dom.svg } \ No newline at end of file diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml index 530f1e1f35..45e77f689c 100644 --- a/org.idempiere.p2/category.xml +++ b/org.idempiere.p2/category.xml @@ -1,52 +1,61 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 3e5cf78ab9..a898900fcc 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -32,7 +32,7 @@ https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository orbit-2020-09-R20200831200620 https://raw.githubusercontent.com/idempiere/binary.file/master - org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group + org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.test.feature.feature.group org.adempiere.server.product 2.8.5 diff --git a/org.idempiere.test-feature/.project b/org.idempiere.test-feature/.project new file mode 100644 index 0000000000..06c4f6cc4e --- /dev/null +++ b/org.idempiere.test-feature/.project @@ -0,0 +1,23 @@ + + + org.idempiere.test-feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.FeatureNature + + diff --git a/org.idempiere.test-feature/.settings/org.eclipse.core.resources.prefs b/org.idempiere.test-feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..99f26c0203 --- /dev/null +++ b/org.idempiere.test-feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.idempiere.test-feature/.settings/org.eclipse.m2e.core.prefs b/org.idempiere.test-feature/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000000..f897a7f1cb --- /dev/null +++ b/org.idempiere.test-feature/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.idempiere.test-feature/build.properties b/org.idempiere.test-feature/build.properties new file mode 100644 index 0000000000..64f93a9f0b --- /dev/null +++ b/org.idempiere.test-feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/org.idempiere.test-feature/feature.xml b/org.idempiere.test-feature/feature.xml new file mode 100644 index 0000000000..013a6a51ea --- /dev/null +++ b/org.idempiere.test-feature/feature.xml @@ -0,0 +1,125 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.test-feature/pom.xml b/org.idempiere.test-feature/pom.xml new file mode 100644 index 0000000000..3c8fefbb7a --- /dev/null +++ b/org.idempiere.test-feature/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + + org.idempiere + org.idempiere.parent + 7.1.0-SNAPSHOT + ../org.idempiere.parent/pom.xml + + org.idempiere.test.feature + eclipse-feature + \ No newline at end of file diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch index 77a72edbd9..de462aeb16 100644 --- a/org.idempiere.test/idempiere.unit.test.launch +++ b/org.idempiere.test/idempiere.unit.test.launch @@ -50,10 +50,6 @@ - - - - @@ -69,60 +65,35 @@ - - - - - - + - - - - - - - - - - - - - - - - - - - - - + @@ -130,29 +101,15 @@ - - - - - - - - - - - - - - @@ -162,27 +119,20 @@ - - - - - - - @@ -192,9 +142,7 @@ - - @@ -206,48 +154,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -263,15 +177,9 @@ - - - - - - @@ -296,130 +204,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + - - - - - - - - - + + + - - + @@ -429,25 +289,11 @@ - - - - - - - - - - - - - - @@ -455,10 +301,8 @@ - - @@ -469,15 +313,8 @@ - - - - - - - @@ -491,33 +328,26 @@ - - - - - - + - - + + + - - - diff --git a/pom.xml b/pom.xml index 645f4e9433..1171c4eb6c 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ org.idempiere.webservices.client-feature org.idempiere.p2 org.idempiere.javadoc + org.idempiere.test-feature org.idempiere.test ${idempiere.target}