IDEMPIERE-5914 Upgrade Jetty from 10.0.15 to 10.0.18 (#2091)

This commit is contained in:
hengsin 2023-11-05 22:10:17 +08:00 committed by GitHub
parent ee212b7d37
commit 56d12a43cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 47 deletions

View File

@ -1180,13 +1180,13 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId> <artifactId>jetty-servlets</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId> <artifactId>jetty-security</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
@ -1198,13 +1198,13 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId> <artifactId>apache-jsp</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId> <artifactId>jetty-util</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
@ -1222,7 +1222,7 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId> <artifactId>apache-jstl</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
@ -1234,103 +1234,103 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId> <artifactId>jetty-client</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId> <artifactId>jetty-jmx</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId> <artifactId>jetty-plus</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId> <artifactId>jetty-deploy</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId> <artifactId>jetty-jndi</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId> <artifactId>jetty-util-ajax</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId> <artifactId>jetty-jaas</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId> <artifactId>jetty-rewrite</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId> <artifactId>jetty-slf4j-impl</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot</artifactId> <artifactId>jetty-osgi-boot</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-jsp</artifactId> <artifactId>jetty-osgi-boot-jsp</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId> <artifactId>jetty-osgi-boot-warurl</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId> <artifactId>jetty-osgi-boot-warurl</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-httpservice</artifactId> <artifactId>jetty-httpservice</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId> <artifactId>websocket-jetty-server</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId> <artifactId>websocket-javax-server</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-common</artifactId> <artifactId>websocket-javax-common</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
@ -1342,7 +1342,7 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-server</artifactId> <artifactId>websocket-core-server</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="idempiere-230620" sequenceNumber="1688978987"> <target name="idempiere-230620" sequenceNumber="1688978988">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="zcommon" version="9.6.4"/> <unit id="zcommon" version="9.6.4"/>
@ -1326,13 +1326,13 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId> <artifactId>jetty-servlets</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId> <artifactId>jetty-security</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
@ -1344,13 +1344,13 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId> <artifactId>apache-jsp</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId> <artifactId>jetty-util</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
@ -1368,7 +1368,7 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId> <artifactId>apache-jstl</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
@ -1380,103 +1380,103 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId> <artifactId>jetty-client</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId> <artifactId>jetty-jmx</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId> <artifactId>jetty-plus</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId> <artifactId>jetty-deploy</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId> <artifactId>jetty-jndi</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId> <artifactId>jetty-util-ajax</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId> <artifactId>jetty-jaas</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId> <artifactId>jetty-rewrite</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId> <artifactId>jetty-slf4j-impl</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot</artifactId> <artifactId>jetty-osgi-boot</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-jsp</artifactId> <artifactId>jetty-osgi-boot-jsp</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId> <artifactId>jetty-osgi-boot-warurl</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId> <artifactId>jetty-osgi-boot-warurl</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId> <groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-httpservice</artifactId> <artifactId>jetty-httpservice</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId> <artifactId>websocket-jetty-server</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId> <artifactId>websocket-javax-server</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-common</artifactId> <artifactId>websocket-javax-common</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
@ -1488,7 +1488,7 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven"> <location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-server</artifactId> <artifactId>websocket-core-server</artifactId>
<version>10.0.15</version> <version>10.0.18</version>
<type>jar</type> <type>jar</type>
</location> </location>
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">