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

IDEMPIERE-3531:convert osgi dependency on maven to p2 repository to support targerplatform 

correct version of commons-digester
add jetty.conscrypt.openjdk.uber to support IDEMPIERE-3687
This commit is contained in:
hieplq 2018-04-23 14:05:08 +07:00
parent c10b0cd46c
commit 667aba2de6
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -16,6 +16,7 @@
<jetty.jsp.version>8.5.24.2</jetty.jsp.version> <jetty.jsp.version>8.5.24.2</jetty.jsp.version>
<jetty.conscrypt.version>8.1.12.v20180117</jetty.conscrypt.version> <jetty.conscrypt.version>8.1.12.v20180117</jetty.conscrypt.version>
<jetty.osgi.servlet.api.version>3.1.0.M3</jetty.osgi.servlet.api.version> <jetty.osgi.servlet.api.version>3.1.0.M3</jetty.osgi.servlet.api.version>
<jetty.conscrypt.openjdk.uber.version>1.1.0</jetty.conscrypt.openjdk.uber.version>
</properties> </properties>
@ -194,7 +195,7 @@
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>org.apache.commons:commons-digester3:jar:3.2</id> <id>commons-digester:commons-digester:jar:2.1</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
@ -258,6 +259,16 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact>
<id>org.conscrypt:conscrypt-openjdk-uber:jar:${jetty.conscrypt.openjdk.uber.version}</id>
<source>true</source>
<transitive>false</transitive>
<instructions>
<Export-Package>org.conscrypt;version="${jetty.conscrypt.openjdk.uber.version}"</Export-Package>
<Bundle-Name>org.idempiere.org.conscrypt.openjdk-uber</Bundle-Name>
<Bundle-SymbolicName>org.idempiere.org.conscrypt.openjdk-uber</Bundle-SymbolicName>
</instructions>
</artifact>
</artifacts> </artifacts>
</feature> </feature>
<!-- zk public zk osgi on zip format download from sourceforge, so <!-- zk public zk osgi on zip format download from sourceforge, so

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="idempiere" sequenceNumber="102"> <?pde version="3.8"?><target name="idempiere" sequenceNumber="107">
<locations> <locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1"/> <unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1"/>
@ -904,8 +904,8 @@
<unit id="org.apache.commons.collections4.source" version="4.1.0"/> <unit id="org.apache.commons.collections4.source" version="4.1.0"/>
<unit id="org.apache.commons.configuration" version="2.2.0"/> <unit id="org.apache.commons.configuration" version="2.2.0"/>
<unit id="org.apache.commons.configuration.source" version="2.2.0"/> <unit id="org.apache.commons.configuration.source" version="2.2.0"/>
<unit id="org.apache.commons.digester" version="3.2.0"/> <unit id="org.apache.commons.digester" version="2.1.0"/>
<unit id="org.apache.commons.digester.source" version="3.2.0"/> <unit id="org.apache.commons.digester.source" version="2.1.0"/>
<unit id="org.apache.commons.javaflow" version="1590792.0.0"/> <unit id="org.apache.commons.javaflow" version="1590792.0.0"/>
<unit id="org.apache.commons.javaflow.source" version="1590792.0.0"/> <unit id="org.apache.commons.javaflow.source" version="1590792.0.0"/>
<unit id="org.apache.felix.inventory" version="1.0.6"/> <unit id="org.apache.felix.inventory" version="1.0.6"/>
@ -967,7 +967,7 @@
<unit id="zul.sources" version="8.5.0"/> <unit id="zul.sources" version="8.5.0"/>
<unit id="zweb" version="8.5.0"/> <unit id="zweb" version="8.5.0"/>
<unit id="zweb.sources" version="8.5.0"/> <unit id="zweb.sources" version="8.5.0"/>
<repository location="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/maven-p2-R20180414"/> <repository location="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/maven-p2-R20180421"/>
</location> </location>
</locations> </locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>