midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4492 fix for rest api (#343) 

* 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

* IDEMPIERE-4492 fix for rest api

refer:https://github.com/eclipse-ee4j/jersey/issues/3588#issuecomment-720033467

* IDEMPIERE-4492 fix for rest api

refer:https://github.com/eclipse-ee4j/jersey/issues/3588#issuecomment-720033467
This commit is contained in:
hieplq 2020-11-01 19:22:11 +07:00 committed by GitHub
parent b4c93c76b3
commit 6e96c43303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 81 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.report.jasper-feature/feature.xml
View File

@ -271,7 +271,7 @@
id="javax.validation.api"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.0.Final"
unpack="false"/>
<plugin

11
org.adempiere.server-feature/server.product
View File

@ -57,18 +57,19 @@
<plugin id="org.eclipse.jetty.websocket.javax.websocket" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.javax.websocket.server" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.server" autoStart="true" startLevel="3" />
<plugin id="org.glassfish.jersey.core.jersey-common" autoStart="true" startLevel="0" />
<plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-el" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-jsp" autoStart="true" startLevel="0" />
<property name="osgi.instance.area.default" value="@config.dir/../workspace" />
<property name="osgi.noShutdown" value="true" />
<property name="osgi.framework.activeThreadType" value="normal" />
<property name="org.eclipse.equinox.simpleconfigurator.exclusiveInstallation" value="false" />
<property name="osgi.compatibility.bootdelegation" value="true" />
<property name="osgi.console.enable.builtin" value="false" />
<property name="org.eclipse.update.reconcile" value="false" />
<property name="eclipse.product" value="org.adempiere.server.product" />
<property name="osgi.compatibility.bootdelegation" value="true" />
<property name="osgi.checkConfiguration" value="true" />
<property name="osgi.instance.area.default" value="@config.dir/../workspace" />
<property name="org.eclipse.equinox.simpleconfigurator.exclusiveInstallation" value="false" />
<property name="osgi.noShutdown" value="true" />
<property name="eclipse.product" value="org.adempiere.server.product" />
</configurations>
<preferencesInfo>

3
org.adempiere.server-feature/server.product.functionaltest.launch
View File

@ -161,7 +161,6 @@
<setEntry value="org.glassfish.hk2.locator@default:default"/>
<setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/>
<setEntry value="org.glassfish.hk2.utils@default:default"/>
<setEntry value="org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-common@default:default"/>
<setEntry value="org.jfree.chart@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
@ -176,7 +175,7 @@
<setEntry value="org.passay@default:default"/>
<setEntry value="org.springframework.spring-jcl@default:default"/>
<setEntry value="slf4j.api@default:default"/>
<setEntry value="slf4j.jcl@default:default"/>
<setEntry value="slf4j.jcl@default:false"/>
<setEntry value="stax2-api@default:default"/>
<setEntry value="zcommon@default:default"/>
<setEntry value="zel@default:default"/>

49
org.adempiere.server-feature/server.product.launch
View File

@ -22,6 +22,7 @@
<setEntry value="org.eclipse.jetty.websocket.javax.websocket.server:9.4.33.v20201020:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.websocket:9.4.33.v20201020:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.server:9.4.33.v20201020:default:true:3:true"/>
<setEntry value="org.glassfish.jersey.core.jersey-common:2.30.1.v20200513-1859:default:true:default:true"/>
<setEntry value="org.idempiere.felix.webconsole:7.1.0.qualifier:default:true:default:true"/>
<setEntry value="org.mortbay.jasper.apache-el:8.5.54:default:true:default:true"/>
<setEntry value="org.mortbay.jasper.apache-jsp:8.5.54:default:true:default:true"/>
@ -76,7 +77,7 @@
<setEntry value="bcpkix@default:default"/>
<setEntry value="bcprov@default:default"/>
<setEntry value="bctsp@default:default"/>
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:default"/>
<setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
<setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
<setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>
@ -88,7 +89,7 @@
<setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>
<setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider@default:default"/>
<setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>
<setEntry value="com.fasterxml.jackson.module.jackson-module-jsonSchema.source"/>
<setEntry value="com.fasterxml.jackson.module.jackson-module-jsonSchema.source@default:default"/>
<setEntry value="com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default"/>
<setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/>
<setEntry value="com.github.relaxng.Datatype@default:default"/>
@ -112,13 +113,13 @@
<setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/>
<setEntry value="com.sun.xml.ws.jaxws-rt@default:default"/>
<setEntry value="com.sun.xml.ws.policy@default:default"/>
<setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/>
<setEntry value="groovy-jsr223@default:false"/>
<setEntry value="groovy-nio@default:false"/>
<setEntry value="groovy-sql@default:false"/>
<setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy-console@default:default"/>
<setEntry value="groovy-datetime@default:default"/>
<setEntry value="groovy-json@default:default"/>
<setEntry value="groovy-jsr223@default:default"/>
<setEntry value="groovy-nio@default:default"/>
<setEntry value="groovy-sql@default:default"/>
<setEntry value="groovy-xml@default:default"/>
<setEntry value="groovy@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.jws-api@default:default"/>
@ -133,7 +134,8 @@
<setEntry value="javax.interceptor-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="javax.transaction-api@default:default"/>
<setEntry value="javax.validation.api@default:default"/>
<setEntry value="javax.validation.api*1.1.0.Final@default:default"/>
<setEntry value="javax.validation.api*2.0.1.Final@default:default"/>
<setEntry value="javax.websocket-api@default:default"/>
<setEntry value="joda-time@default:default"/>
<setEntry value="json@default:default"/>
@ -180,7 +182,7 @@
<setEntry value="org.apache.felix.gogo.command@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.felix.scr@default:default"/>
<setEntry value="org.apache.felix.webconsole@default:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
@ -229,7 +231,6 @@
<setEntry value="org.apache.xmlgraphics.batik-util@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-xml@default:default"/>
<setEntry value="org.apache.xmlgraphics@default:default"/>
<setEntry value="org.apiguardian@default:default"/>
<setEntry value="org.atmosphere.runtime@default:default"/>
<setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.dom4j@default:default"/>
@ -246,7 +247,7 @@
<setEntry value="org.eclipse.ecf.filetransfer@default:default"/>
<setEntry value="org.eclipse.ecf.identity@default:default"/>
<setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient45@default:default"/>
<setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:false"/>
<setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:default"/>
<setEntry value="org.eclipse.ecf.provider.filetransfer@default:default"/>
<setEntry value="org.eclipse.ecf@default:default"/>
<setEntry value="org.eclipse.equinox.app@default:default"/>
@ -295,7 +296,7 @@
<setEntry value="org.eclipse.jetty.jmx@default:default"/>
<setEntry value="org.eclipse.jetty.jndi@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/>
<setEntry value="org.eclipse.jetty.osgi.boot.jsp@default:false"/>
<setEntry value="org.eclipse.jetty.osgi.boot.jsp@default:default"/>
<setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>
<setEntry value="org.eclipse.jetty.osgi.httpservice@10:true"/>
<setEntry value="org.eclipse.jetty.plus@default:default"/>
@ -314,10 +315,10 @@
<setEntry value="org.eclipse.jetty.websocket.server@3:true"/>
<setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.xml@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:default"/>
<setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.eclipse.osgi@default:default"/>
<setEntry value="org.eclipse.text@default:default"/>
<setEntry value="org.glassfish.external.management-api@default:default"/>
<setEntry value="org.glassfish.gmbal.gmbal@default:default"/>
@ -326,12 +327,12 @@
<setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/>
<setEntry value="org.glassfish.hk2.utils@default:default"/>
<setEntry value="org.glassfish.jaxb.txw2@default:default"/>
<setEntry value="org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default"/>
<setEntry value="org.glassfish.jersey.containers.servlet.core@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-client@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-common@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-common@default:true"/>
<setEntry value="org.glassfish.jersey.core.jersey-server@default:default"/>
<setEntry value="org.glassfish.jersey.ext.entityfiltering@default:default"/>
<setEntry value="org.glassfish.jersey.inject.jersey-hk2@default:default"/>
<setEntry value="org.glassfish.jersey.media.jersey-media-json-jackson@default:default"/>
<setEntry value="org.glassfish.pfl.pfl-asm@default:default"/>
<setEntry value="org.glassfish.pfl.pfl-basic@default:default"/>
@ -340,11 +341,6 @@
<setEntry value="org.hamcrest.core@default:default"/>
<setEntry value="org.jfree.chart@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
<setEntry value="org.junit.jupiter.api@default:default"/>
<setEntry value="org.junit.jupiter.engine@default:default"/>
<setEntry value="org.junit.jupiter.params@default:default"/>
<setEntry value="org.junit.platform.commons@default:default"/>
<setEntry value="org.junit.platform.engine@default:default"/>
<setEntry value="org.junit@default:default"/>
<setEntry value="org.jvnet.mimepull@default:default"/>
<setEntry value="org.jvnet.staxex.stax-ex@default:default"/>
@ -356,7 +352,6 @@
<setEntry value="org.objectweb.asm.tree@default:default"/>
<setEntry value="org.objectweb.asm.util@default:default"/>
<setEntry value="org.objectweb.asm@default:default"/>
<setEntry value="org.opentest4j@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.sat4j.core@default:default"/>
<setEntry value="org.sat4j.pb@default:default"/>
@ -367,7 +362,7 @@
<setEntry value="org.w3c.dom.svg@default:default"/>
<setEntry value="org.zkoss.zsoup@default:default"/>
<setEntry value="slf4j.api@default:default"/>
<setEntry value="slf4j.jcl@default:false"/>
<setEntry value="slf4j.jcl@default:default"/>
<setEntry value="stax2-api@default:default"/>
<setEntry value="zcommon@default:default"/>
<setEntry value="zel@default:default"/>
@ -378,7 +373,7 @@
<setEntry value="zkplus@default:default"/>
<setEntry value="zkwebfragment@default:default"/>
<setEntry value="zul@default:default"/>
<setEntry value="zweb-dsp@default:false"/>
<setEntry value="zweb-dsp@default:default"/>
<setEntry value="zweb@default:default"/>
</setAttribute>
<setAttribute key="selected_workspace_bundles">
@ -393,7 +388,7 @@
<setEntry value="org.adempiere.plugin.utils@default:default"/>
<setEntry value="org.adempiere.replication.server@default:default"/>
<setEntry value="org.adempiere.replication@default:default"/>
<setEntry value="org.adempiere.report.jasper.library@default:false"/>
<setEntry value="org.adempiere.report.jasper.library@default:default"/>
<setEntry value="org.adempiere.report.jasper@default:default"/>
<setEntry value="org.adempiere.server@default:true"/>
<setEntry value="org.adempiere.ui.zk@default:true"/>

14
org.idempiere.eclipse.platform-feature/feature.xml
View File

@ -418,4 +418,18 @@
version="0.0.0"
unpack="false"/>
<plugin
id="javax.validation.api"
download-size="0"
install-size="0"
version="2.0.1.Final"
unpack="false"/>
<plugin
id="org.glassfish.jersey.inject.jersey-hk2"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

10
org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
View File

@ -16,9 +16,10 @@
<org.apache.taglibs.version>1.2.5</org.apache.taglibs.version>
<groovy.version>2.5.3</groovy.version>
<org.bouncycastle.version>1.66</org.bouncycastle.version><!--https://www.bouncycastle.org/latest_releases.html-->
<jackson.version>2.10.0</jackson.version> <!--jasperreport dependency-->
<jackson.version>2.10.1</jackson.version> <!--jasperreport/jersey dependency-->
<stax2.api.version>4.2</stax2.api.version> <!--jackson-dataformat-xml dependency-->
<validation.api.version>1.1.0.Final</validation.api.version> <!--it up to version of jasperreport engine-->
<validation.api.version>1.1.0.Final</validation.api.version> <!--it up to version of jackson-module-jsonSchema-->
<validation.api.jersey.version>2.0.1.Final</validation.api.jersey.version> <!--jersey-server also import it but from 2.0-->
<woodstox.core.version>6.0.1</woodstox.core.version> <!--jackson-dataformat-xml dependency-->
<json.version>20180813</json.version> <!--jackson-datatype-json-org dependency-->
<slf4j.version>1.7.25</slf4j.version>
@ -949,6 +950,11 @@
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>javax.validation:validation-api:jar:${validation.api.jersey.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>com.fasterxml.woodstox:woodstox-core:jar:${woodstox.core.version}</id>
<source>true</source>

44
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="idempiere-201030" sequenceNumber="1604136260">
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="idempiere-201101" sequenceNumber="1604210681">
<locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sun.istack.commons-runtime" version="3.0.8"/>
<unit id="com.sun.org.apache.xml.internal.resolver" version="20050927.0.0"/>
<unit id="com.sun.xml.fastinfoset.FastInfoset" version="1.2.16"/>
@ -23,7 +22,7 @@
<unit id="org.jvnet.staxex.stax-ex" version="1.8.1"/>
<repository location="https://idempiere.github.io/binary.file/p2.maven/org.idempiere.webservice.client-p2-R20190412"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="zcommon" version="9.5.0.1"/>
<unit id="zel" version="9.5.0.1"/>
<unit id="zhtml" version="9.5.0.1"/>
@ -37,24 +36,24 @@
<unit id="zweb-dsp" version="9.5.0.1"/>
<repository location="https://idempiere.github.io/binary.file/p2.zk/9.5.0.1"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="bcmail" version="1.66.0"/>
<unit id="bcpkix" version="1.66.0"/>
<unit id="bcprov" version="1.66.0"/>
<unit id="bctsp" version="1.46.0"/>
<unit id="com.diffplug.osgi.extension.sun.misc" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.10.0"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.10.0"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.10.0"/>
<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.10.0"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.10.0"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda" version="2.10.0"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org" version="2.10.0"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.10.0"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.10.0"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider" version="2.10.0"/>
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.10.0"/>
<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema" version="2.10.0"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.10.1"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.10.1"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.10.1"/>
<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.10.1"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.10.1"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda" version="2.10.1"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org" version="2.10.1"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.10.1"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.10.1"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider" version="2.10.1"/>
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.10.1"/>
<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema" version="2.10.1"/>
<unit id="com.fasterxml.woodstox.woodstox-core" version="6.0.1"/>
<unit id="com.github.relaxng.Datatype" version="2011.1.0"/>
<unit id="com.google.zxing.core" version="3.4.0"/>
@ -87,6 +86,7 @@
<unit id="javax.interceptor-api" version="1.2.2"/>
<unit id="javax.transaction-api" version="1.3.0"/>
<unit id="javax.validation.api" version="1.1.0.Final"/>
<unit id="javax.validation.api" version="2.0.1.Final"/>
<unit id="javax.websocket-api" version="1.1.0"/>
<unit id="joda-time" version="2.10.8"/>
<unit id="json" version="20180813.0.0"/>
@ -197,7 +197,6 @@
<unit id="org.eclipse.jetty.websocket.servlet" version="9.4.33.v20201020"/>
<unit id="org.eclipse.jetty.xml" version="9.4.33.v20201020"/>
<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3"/>
<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.22.1"/>
<unit id="org.jfree.chart" version="1.0.19"/>
<unit id="org.jfree.jcommon" version="1.0.23"/>
<unit id="org.krysalis.barcode4j" version="2.1.0"/>
@ -215,9 +214,9 @@
<unit id="slf4j.api" version="1.7.25"/>
<unit id="slf4j.jcl" version="1.7.25"/>
<unit id="stax2-api" version="4.2.0"/>
<repository location="https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029"/>
<repository location="https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201101"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="3.16.0.v20200828-0759"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
@ -304,7 +303,7 @@
<unit id="org.eclipse.jdt.junit5.runtime" version="1.0.1000.v20200720-0748"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.17"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
@ -330,6 +329,7 @@
<unit id="org.glassfish.hk2.api" version="2.6.1.v20200513-1859"/>
<unit id="org.glassfish.hk2.locator" version="2.6.1.v20200513-1859"/>
<unit id="org.glassfish.hk2.utils" version="2.6.1.v20200513-1859"/>
<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.30.1.v20200512-1802"/>
<unit id="org.glassfish.jersey.containers.servlet.core" version="2.30.1.v20200513-1859"/>
<unit id="org.glassfish.jersey.core.jersey-client" version="2.30.1.v20200513-1859"/>
<unit id="org.glassfish.jersey.core.jersey-common" version="2.30.1.v20200513-1859"/>
@ -342,4 +342,4 @@
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
</locations>
</target>
</target>

8
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
View File

@ -1,5 +1,5 @@
target "idempiere-201030"
target "idempiere-201101"
with source configurePhase allEnvironments
@ -37,7 +37,7 @@ location "https://idempiere.github.io/binary.file/p2.zk/9.5.0.1" {
zweb-dsp
}
location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" {
location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201101" {
bcmail
bcpkix
bcprov
@ -86,7 +86,7 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" {
javax.enterprise.cdi-api
javax.interceptor-api
javax.transaction-api
javax.validation.api
javax.validation.api [1.1.0.Final,1.1.0.Final]
javax.websocket-api
joda-time
json
@ -197,7 +197,6 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" {
org.eclipse.jetty.websocket.servlet
org.eclipse.jetty.xml
org.glassfish.hk2.osgi-resource-locator
org.glassfish.jersey.bundles.repackaged.jersey-guava
org.jfree.chart
org.jfree.jcommon
org.krysalis.barcode4j
@ -340,6 +339,7 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202008312006
org.glassfish.hk2.api
org.glassfish.hk2.locator
org.glassfish.hk2.utils
org.glassfish.jersey.inject.jersey-hk2
org.glassfish.jersey.containers.servlet.core
org.glassfish.jersey.core.jersey-client
org.glassfish.jersey.core.jersey-common

1
org.idempiere.p2/server.product
View File

@ -57,6 +57,7 @@
<plugin id="org.eclipse.jetty.websocket.javax.websocket" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.javax.websocket.server" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.server" autoStart="true" startLevel="3" />
<plugin id="org.glassfish.jersey.core.jersey-common" autoStart="true" startLevel="0" />
<plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-el" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-jsp" autoStart="true" startLevel="0" />

4
org.idempiere.test/idempiere.unit.test.launch
View File

@ -106,7 +106,8 @@
<setEntry value="javax.interceptor-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="javax.transaction-api@default:default"/>
<setEntry value="javax.validation.api@default:default"/>
<setEntry value="javax.validation.api*1.1.0.Final@default:default"/>
<setEntry value="javax.validation.api*2.0.1.Final@default:default"/>
<setEntry value="javax.websocket-api@default:default"/>
<setEntry value="joda-time@default:default"/>
<setEntry value="json@default:default"/>
@ -301,7 +302,6 @@
<setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/>
<setEntry value="org.glassfish.hk2.utils@default:default"/>
<setEntry value="org.glassfish.jaxb.txw2@default:default"/>
<setEntry value="org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default"/>
<setEntry value="org.glassfish.jersey.containers.servlet.core@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-client@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-common@default:default"/>

7
org.idempiere.webservices-feature/feature.xml
View File

@ -262,13 +262,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.glassfish.jersey.bundles.repackaged.jersey-guava"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.glassfish.jersey.core.jersey-common"
download-size="0"

1
org.idempiere.webservices/META-INF/MANIFEST.MF
View File

@ -93,7 +93,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.glassfish.hk2.api;bundle-version="2.5.0",
org.glassfish.hk2.locator;bundle-version="2.5.0",
org.glassfish.hk2.utils;bundle-version="2.5.0",
org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1",
jakarta.ws.rs-api;bundle-version="2.1.5",
jakarta.xml.ws-api;bundle-version="2.3.2",
jakarta.xml.soap-api;bundle-version="1.4.1",