Skip to content

Commit

Permalink
IDEMPIERE-3136:update jetty to 9.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
hieplq authored and ERPZI committed Apr 17, 2020
1 parent 2e77575 commit 2155251
Show file tree
Hide file tree
Showing 59 changed files with 10 additions and 14,227 deletions.
10 changes: 5 additions & 5 deletions org.adempiere.sdk-feature/adempiere.cquery
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<cq:property key="target.os" value="*"/>
<cq:property key="target.ws" value="*"/>
<cq:advisorNode namePattern="^org\.objectweb\.asm(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,6.0.0)"/>
<cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" useTargetPlatform="false" useWorkspace="false" versionOverride="[0.0.0,9.3.11]"/>
<cq:advisorNode namePattern="^org\.eclipse\.jetty\.alpn\.api$" versionOverride="[0.0.0,9.3.11)"/>
<cq:advisorNode namePattern="^org\.mortbay\.jasper\.apache-jsp$" componentType="osgi.bundle" versionOverride="(8.0.0,8.0.33]"/>
<cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" useTargetPlatform="false" useWorkspace="false" versionOverride="[9.2.0,9.3.11)"/>
<cq:advisorNode namePattern="^org\.atmosphere\.runtime$" componentType="osgi.bundle" useTargetPlatform="false" useWorkspace="false" versionOverride="[2.4.9,2.4.9]"/>
<cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" useTargetPlatform="false" useWorkspace="false" versionOverride="[0.0.0,9.5.0)"/>
<cq:advisorNode namePattern="^org\.eclipse\.jetty\.alpn\.api$" versionOverride="[0.0.0,9.5.0)"/>
<cq:advisorNode namePattern="^org\.mortbay\.jasper\.apache-jsp$" componentType="osgi.bundle" versionOverride="(8.0.0,9.5.0)"/>
<cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" useTargetPlatform="false" useWorkspace="false" versionOverride="[9.2.0,9.5.0)"/>
<cq:advisorNode namePattern="^org\.atmosphere\.runtime$" componentType="osgi.bundle" useTargetPlatform="false" useWorkspace="false" versionOverride="[0.0.0,3.0.0)"/>
<cq:advisorNode namePattern="^.*$" useTargetPlatform="false" useWorkspace="false"/>
</cq:componentQuery>
1 change: 0 additions & 1 deletion org.adempiere.sdk-feature/adempiere.rmap
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<bc:propertyRef key="workspace.root"/>
</bc:replace>
</rm:propertyElement>
<rm:locator pattern="^org\.eclipse\.jetty\.http(\.source)?$" searchPathRef="workspace.project"/>
<rm:locator pattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin(\.source)?$" searchPathRef="bundles.maven"/>
<rm:locator pattern="^org\.idempiere\.hazelcast\.service(\.source)?$" searchPathRef="workspace.feature" failOnError="false"/>
<rm:locator pattern="^org\.idempiere\.hazelcast\.service(\.source)?$" searchPathRef="workspace.project"/>
Expand Down
2 changes: 1 addition & 1 deletion org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory">
<Arg name="config"><Ref refid="sslHttpConfig"/></Arg>
<Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set>
<Set name="initialStreamSendWindow"><Property name="jetty.http2.initialStreamSendWindow" default="65535"/></Set>
<Set name="initialStreamRecvWindow"><Property name="jetty.http2.initialStreamRecvWindow" default="65535"/></Set>
</New>
</Arg>
</Call>
Expand Down
4 changes: 4 additions & 0 deletions org.adempiere.server-feature/server.product
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.http" autoStart="false" startLevel="0" />
<plugin id="org.eclipse.jetty.http2.common" autoStart="false" startLevel="0" />
<plugin id="org.eclipse.jetty.http2.hpack" autoStart="false" startLevel="0" />
<plugin id="org.eclipse.jetty.http2.server" autoStart="false" startLevel="0" />
<plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.osgi.httpservice" autoStart="false" startLevel="0" />
<plugin id="org.eclipse.jetty.websocket.javax.websocket.server" autoStart="true" startLevel="0" />
Expand Down
7 changes: 0 additions & 7 deletions org.eclipse.jetty.http/.classpath

This file was deleted.

33 changes: 0 additions & 33 deletions org.eclipse.jetty.http/.project

This file was deleted.

35 changes: 0 additions & 35 deletions org.eclipse.jetty.http/META-INF/MANIFEST.MF

This file was deleted.

This file was deleted.

27 changes: 0 additions & 27 deletions org.eclipse.jetty.http/about.html

This file was deleted.

4 changes: 0 additions & 4 deletions org.eclipse.jetty.http/build.properties

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2155251

Please sign in to comment.