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

IDEMPIERE-3688:update jetty to 9.4.9 (test for maven build only)

This commit is contained in:
hieplq 2018-04-15 16:50:51 +07:00
parent 6a7d344d34
commit 6bdede763b
5 changed files with 149 additions and 1781 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.server-feature/pom.xml
View File

@ -136,7 +136,7 @@
<artifactItem> <artifactItem>
<groupId>org.mortbay.jetty.alpn</groupId> <groupId>org.mortbay.jetty.alpn</groupId>
<artifactId>alpn-boot</artifactId> <artifactId>alpn-boot</artifactId>
<version>8.1.12.v20180117</version> <version>${jetty.alpn-boot.version}</version>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>../</outputDirectory> <outputDirectory>../</outputDirectory>

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

File diff suppressed because one or more lines are too long

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

@ -11,6 +11,13 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<zk-osgi-zip-file>https://www.zkoss.org/zkdownload/downloadEvalFile?id=1245081552</zk-osgi-zip-file> <zk-osgi-zip-file>https://www.zkoss.org/zkdownload/downloadEvalFile?id=1245081552</zk-osgi-zip-file>
<!-- https://github.com/eclipse/jetty.project/blob/jetty-9.4.9.v20180320/pom.xml up to verison of jetty -->
<jetty.alpn.api.version>1.1.3.v20160715</jetty.alpn.api.version>
<jetty.jsp.version>8.5.24.2</jetty.jsp.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>
</properties> </properties>
<build> <build>
@ -46,18 +53,18 @@
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>org.mortbay.jasper:apache-jsp:jar:8.5.23</id> <id>org.mortbay.jasper:apache-jsp:jar:${jetty.jsp.version}</id>
<!-- https://github.com/jetty-project/jasper-jsp/issues/5 --> <!-- https://github.com/jetty-project/jasper-jsp/issues/5 -->
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>org.mortbay.jasper:apache-el:jar:8.5.23</id> <id>org.mortbay.jasper:apache-el:jar:${jetty.jsp.version}</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>org.eclipse.jetty.toolchain:jetty-osgi-servlet-api:jar:3.1.0.M3</id> <id>org.eclipse.jetty.toolchain:jetty-osgi-servlet-api:jar:${jetty.osgi.servlet.api.version}</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
@ -211,11 +218,6 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact>
<id>org.eclipse.jetty:jetty-alpn-server:jar:${jetty.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact> <artifact>
<id>org.eclipse.jetty.alpn:alpn-api:jar:1.1.3.v20160715</id> <id>org.eclipse.jetty.alpn:alpn-api:jar:1.1.3.v20160715</id>
<source>true</source> <source>true</source>
@ -246,6 +248,16 @@
<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>
<id>org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version}</id>
<source>true</source>
<transitive>false</transitive>
</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
@ -595,13 +607,7 @@
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<configuration> <configuration>
<appArgLine>-application <appArgLine>-application org.eclipse.equinox.p2.publisher.CategoryPublisher -artifactRepository file:${project.build.directory}/repository -metadataRepository file:${project.build.directory}/repository -categoryDefinition file:${project.build.directory}/repository/category.xml -categoryQualifier -compress</appArgLine>
org.eclipse.equinox.p2.publisher.CategoryPublisher
-artifactRepository file:${project.build.directory}/repository
-metadataRepository file:${project.build.directory}/repository
-categoryDefinition
file:${project.build.directory}/repository/category.xml
-categoryQualifier -compress</appArgLine>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>

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

File diff suppressed because it is too large Load Diff

6
org.idempiere.parent/pom.xml
View File

@ -13,14 +13,16 @@
<tycho.version>1.1.0</tycho.version> <tycho.version>1.1.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version> <tycho.extras.version>${tycho.version}</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>9.4.7.v20170914</jetty.version> <jetty.version>9.4.9.v20180320</jetty.version>
<jp.version>6.3.1</jp.version> <jp.version>6.3.1</jp.version>
<zk.version>8.5.0</zk.version> <zk.version>8.5.0</zk.version>
<zk.javassist.src.version>3.18.2-GA</zk.javassist.src.version> <zk.javassist.src.version>3.18.2-GA</zk.javassist.src.version>
<maven.dependency.version>3.0.2</maven.dependency.version> <maven.dependency.version>3.0.2</maven.dependency.version>
<download.maven.version>1.4.0</download.maven.version> <download.maven.version>1.4.0</download.maven.version>
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version> <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
<asm.version>5.2.0.v20180228-1718</asm.version> <asm.version>6.0.0.v20180116-1719</asm.version>
<!-- https://www.eclipse.org/jetty/documentation/9.3.x/alpn-chapter.html#alpn-versions -->
<jetty.alpn-boot.version>8.1.12.v20180117</jetty.alpn-boot.version>
<!-- default value of properties, use when run without profile --> <!-- default value of properties, use when run without profile -->
<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target> <idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>