IDEMPIERE-4013 iDempiere should not require Conscrypt

This commit is contained in:
Dirk Niemeyer 2019-10-22 13:18:17 +02:00
parent 7caf8655fd
commit 12cde3af20
15 changed files with 10 additions and 51 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -462,20 +462,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.eclipse.jetty.alpn.conscrypt.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.idempiere.org.conscrypt.openjdk-uber"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="slf4j.api" id="slf4j.api"
download-size="0" download-size="0"

View File

@ -28,7 +28,7 @@ VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events
-Dosgi.compatibility.bootdelegation=true -Dosgi.compatibility.bootdelegation=true
-Djetty.home=$BASE/jettyhome -Djetty.home=$BASE/jettyhome
-Djetty.base=$BASE/jettyhome -Djetty.base=$BASE/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 -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-https.xml
-Dosgi.console=localhost:$TELNET_PORT -Dosgi.console=localhost:$TELNET_PORT
-Dmail.mime.encodefilename=true -Dmail.mime.encodefilename=true
-Dmail.mime.decodefilename=true -Dmail.mime.decodefilename=true

View File

@ -5,7 +5,7 @@
<!-- SSL ContextFactory configuration --> <!-- SSL ContextFactory configuration -->
<!-- ============================================================= --> <!-- ============================================================= -->
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory"> <Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="Provider">Conscrypt</Set> <Set name="Provider"></Set>
<Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="etc/keystore"/></Set> <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="etc/keystore"/></Set>
<Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="@ADEMPIERE_KEYSTOREPASS@"/></Set> <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="@ADEMPIERE_KEYSTOREPASS@"/></Set>
<Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set> <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>

View File

@ -51,7 +51,6 @@
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.jetty.alpn.api" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.alpn.api" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.alpn.conscrypt.server" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.alpn.server" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.alpn.server" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" />

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -19,7 +19,6 @@
<org.apache.taglibs.version>1.2.5</org.apache.taglibs.version> <org.apache.taglibs.version>1.2.5</org.apache.taglibs.version>
<groovy.version>2.5.3</groovy.version> <groovy.version>2.5.3</groovy.version>
<org.bouncycastle.version>1.60</org.bouncycastle.version> <org.bouncycastle.version>1.60</org.bouncycastle.version>
<jetty.conscrypt.openjdk.uber.version>1.4.2</jetty.conscrypt.openjdk.uber.version>
<jackson.version>2.9.8</jackson.version> <!--it up to version of jasperreport engine--> <jackson.version>2.9.8</jackson.version> <!--it up to version of jasperreport engine-->
<stax2.api.version>3.1.4</stax2.api.version> <!--it up to version of jasperreport engine--> <stax2.api.version>3.1.4</stax2.api.version> <!--it up to version of jasperreport engine-->
<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 jasperreport engine-->
@ -390,26 +389,11 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact>
<id>org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact> <artifact>
<id>org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version}</id> <id>org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version}</id>
<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>
<artifact> <artifact>
<id>org.slf4j:slf4j-api:jar:${slf4j.version}</id> <id>org.slf4j:slf4j-api:jar:${slf4j.version}</id>
<source>true</source> <source>true</source>
@ -1398,11 +1382,6 @@
<generateSourceFeature>true</generateSourceFeature> <generateSourceFeature>true</generateSourceFeature>
<artifacts> <artifacts>
<artifact>
<id>org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact> <artifact>
<id>org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version}</id> <id>org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version}</id>
<source>true</source> <source>true</source>

View File

@ -1128,8 +1128,6 @@
<unit id="org.eclipse.jetty.alpn.api.source" version="1.1.3.v20160715"/> <unit id="org.eclipse.jetty.alpn.api.source" version="1.1.3.v20160715"/>
<unit id="org.eclipse.jetty.alpn.client" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.alpn.client" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.alpn.client.source" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.alpn.client.source" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.alpn.conscrypt.server" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.alpn.conscrypt.server.source" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.alpn.openjdk8.server" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.alpn.openjdk8.server" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.alpn.openjdk8.server.source" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.alpn.openjdk8.server.source" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.alpn.server" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.alpn.server" version="9.4.14.v20181114"/>
@ -1214,8 +1212,6 @@
<unit id="org.eclipse.jetty.websocket.servlet.source" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.websocket.servlet.source" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.xml" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.xml" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.xml.source" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.xml.source" version="9.4.14.v20181114"/>
<unit id="org.idempiere.org.conscrypt.openjdk-uber" version="1.4.2"/>
<unit id="org.idempiere.org.conscrypt.openjdk-uber.source" version="1.4.2"/>
<unit id="org.jfree.chart-osgi" version="1.0.19"/> <unit id="org.jfree.chart-osgi" version="1.0.19"/>
<unit id="org.jfree.jcommon-osgi" version="1.0.23"/> <unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
<unit id="org.krysalis.barcode4j" version="2.1.0"/> <unit id="org.krysalis.barcode4j" version="2.1.0"/>

View File

@ -51,7 +51,6 @@
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.jetty.alpn.api" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.alpn.api" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.alpn.conscrypt.server" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.alpn.server" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.alpn.server" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" />