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

IDEMPIERE-5035 Update of Dependency (November 2021) (#972)

This commit is contained in:
hengsin 2021-11-11 00:36:38 +08:00 committed by GitHub
parent ae7f71c9cd
commit 5469bddbda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 99 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,19 +13,19 @@
<setEntry value="org.eclipse.equinox.event:1.6.0.v20210212-1143:default:true:2:true"/>
<setEntry value="org.eclipse.equinox.http.registry:1.2.0.v20200614-1851:default:true:default:true"/>
<setEntry value="org.eclipse.equinox.simpleconfigurator:1.4.0.v20210315-2228:default:true:1:true"/>
<setEntry value="org.eclipse.jetty.annotations:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.apache-jsp:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.http:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.osgi.boot:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.osgi.httpservice:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.websocket.common:10.0.6:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.core.server:10.0.6:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.common:10.0.6:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.server:10.0.6:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.server:10.0.6:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.annotations:10.0.7:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.apache-jsp:10.0.7:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.http:10.0.7:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.osgi.boot:10.0.7:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.osgi.httpservice:10.0.7:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.websocket.common:10.0.7:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.core.server:10.0.7:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.common:10.0.7:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.server:10.0.7:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.server:10.0.7:default:true:3:true"/>
<setEntry value="org.idempiere.felix.webconsole:9.0.0.qualifier:default:true:default:true"/>
<setEntry value="org.mortbay.jasper.apache-el:9.0.29:default:true:default:true"/>
<setEntry value="org.mortbay.jasper.apache-jsp:9.0.29:default:true:default:true"/>
<setEntry value="org.mortbay.jasper.apache-el:9.0.52:default:true:default:true"/>
<setEntry value="org.mortbay.jasper.apache-jsp:9.0.52:default:true:default:true"/>
</setAttribute>
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.adempiere.server.application"/>

2
org.adempiere.ui.zk/pom.xml
View File

@ -53,7 +53,7 @@
<artifactItem>
<groupId>org.zkoss.zkforge</groupId>
<artifactId>ckez</artifactId>
<version>4.16.1.1</version>
<version>4.16.2.0</version>
</artifactItem>
<artifactItem>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>

2
org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Jetty OSGI Boot Fragment
Bundle-SymbolicName: org.idempiere.jetty.osgi.boot.fragment
Bundle-Version: 9.0.0.qualifier
Fragment-Host: org.eclipse.jetty.osgi.boot;bundle-version="10.0.6"
Fragment-Host: org.eclipse.jetty.osgi.boot;bundle-version="10.0.7"
Automatic-Module-Name: org.idempiere.jetty.logging.fragment
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.adempiere.base;bundle-version="9.0.0"

66
org.idempiere.p2.targetplatform/maven.locations.xml
View File

@ -282,11 +282,23 @@ Export-Package: *;-noimport:=true
<version>4.0.3</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-tf</artifactId>
<version>4.1.2</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-dynamic</artifactId>
<version>4.1.2</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
<version>4.1.2</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.glassfish.pfl</groupId>
@ -562,7 +574,7 @@ Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<!-- org.apache.aries -->
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.3</version>
@ -1161,133 +1173,139 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<version>9.0.29</version>
<version>9.0.52</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-jsp</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-httpservice</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-common</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-server</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.2</version>
<type>jar</type>
</location>
<!-- org.slf4j -->

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="idempiere-210901" sequenceNumber="1635250903">
<target name="idempiere-210901" sequenceNumber="1636543592">
<locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="zcommon" version="9.6.0.1"/>
@ -414,11 +414,23 @@ Export-Package: *;-noimport:=true
<version>4.0.3</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-tf</artifactId>
<version>4.1.2</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-dynamic</artifactId>
<version>4.1.2</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
<version>4.1.2</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.glassfish.pfl</groupId>
@ -694,7 +706,7 @@ Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<!-- org.apache.aries -->
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.3</version>
@ -1293,133 +1305,139 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<version>9.0.29</version>
<version>9.0.52</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-jsp</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-httpservice</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-common</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-server</artifactId>
<version>10.0.6</version>
<version>10.0.7</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.2</version>
<type>jar</type>
</location>
<!-- org.slf4j -->