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

IDEMPIERE-5163 2022-01 Platform update (#1142)

This commit is contained in:
hengsin 2022-01-25 22:58:06 +08:00 committed by GitHub
parent f934d62efc
commit 0db580a7a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 68 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.base-feature/model.generator.launch
View File

@ -45,6 +45,7 @@
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/>

3
org.adempiere.base-feature/packinfolder.app.launch
View File

@ -53,6 +53,7 @@
<setEntry value="groovy-sql@default:false"/>
<setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/>
@ -73,6 +74,7 @@
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.servicemix.bundles.xerces@default:default"/>
<setEntry value="org.apache.xml.resolver@default:default"/>
@ -113,7 +115,6 @@
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>

1
org.adempiere.base-feature/sign.database.build.launch
View File

@ -54,6 +54,7 @@
<setEntry value="groovy-sql@default:false"/>
<setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/>

1
org.adempiere.base-feature/synchronize-terminology.app.launch
View File

@ -54,6 +54,7 @@
<setEntry value="groovy-sql@default:false"/>
<setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/>

1
org.adempiere.base-feature/translation.app.launch
View File

@ -54,6 +54,7 @@
<setEntry value="groovy-sql@default:false"/>
<setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/>

5
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -7,8 +7,7 @@ Bundle-ClassPath: .,
lib/bsh.jar,
lib/commons-validator.jar,
lib/cron4j.jar,
lib/avalon-framework-api.jar,
lib/classgraph.jar
lib/avalon-framework-api.jar
Export-Package: bsh,
bsh.classpath,
bsh.collection,
@ -19,7 +18,6 @@ Export-Package: bsh,
bsh.servlet,
bsh.util,
com.akunagroup.uk.postcode,
io.github.classgraph,
it.sauronsoftware.cron4j,
org.adempiere.apps.graph,
org.adempiere.base,
@ -71,6 +69,7 @@ Import-Package: com.google.zxing,
com.google.zxing.qrcode.decoder,
com.google.zxing.qrcode.encoder,
com.sun.mail.smtp;version="1.5",
io.github.classgraph;version="4.8.138",
io.grpc;version="1.27.0",
io.opencensus.common;version="0.28.0",
io.opencensus.contrib.http;version="0.28.0",

3
org.adempiere.base/build.properties
View File

@ -6,8 +6,7 @@ bin.includes = plugin.xml,\
lib/avalon-framework-api.jar,\
lib/bsh.jar,\
lib/commons-validator.jar,\
lib/cron4j.jar,\
lib/classgraph.jar
lib/cron4j.jar
src.includes = schema/
source.. = src/
output.. = target/classes/

5
org.adempiere.base/pom.xml
View File

@ -43,11 +43,6 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
</artifactItem>
<artifactItem>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.116</version>
</artifactItem>
</artifactItems>
<outputDirectory>lib</outputDirectory>
<stripVersion>true</stripVersion>

3
org.adempiere.install/install.app.launch
View File

@ -43,6 +43,7 @@
<setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/>
@ -62,6 +63,7 @@
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/>
@ -96,7 +98,6 @@
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>

21
org.adempiere.install/install.console.app.launch
View File

@ -43,31 +43,27 @@
<setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/>
<setEntry value="org.eclipse.core.jobs@default:default"/>
@ -84,9 +80,8 @@
<setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.hamcrest.core@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.junit@default:default"/>
<setEntry value="org.krysalis.barcode4j@default:default"/>
@ -99,6 +94,12 @@
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="xstream@default:default"/>
</setAttribute>
<setAttribute key="selected_workspace_bundles">

3
org.adempiere.install/install.silent.app.launch
View File

@ -43,6 +43,7 @@
<setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/>
@ -60,6 +61,7 @@
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/>
@ -93,7 +95,6 @@
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>

5
org.adempiere.server-feature/server.product.functionaltest.launch
View File

@ -105,7 +105,6 @@
<setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.ibm.icu@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="org.apache.commons.digester@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.istack.commons-runtime@default:default"/>
@ -126,6 +125,7 @@
<setEntry value="groovy-sql@default:false"/>
<setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.jws-api@default:default"/>
<setEntry value="jakarta.persistence-api@default:default"/>
@ -156,6 +156,7 @@
<setEntry value="org.apache.commons.commons-io@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.commons-text@default:default"/>
<setEntry value="org.apache.commons.digester@default:default"/>
<setEntry value="org.apache.commons.discovery@default:default"/>
<setEntry value="org.apache.commons.lang3@default:default"/>
<setEntry value="org.apache.commons.lang@default:default"/>
@ -330,7 +331,6 @@
<setEntry value="org.w3c.dom.svg@default:default"/>
<setEntry value="org.zkoss.zsoup@default:default"/>
<setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.api*2.0.0.alpha1@default:default"/>
<setEntry value="slf4j.jcl@default:false"/>
<setEntry value="stax2-api@default:default"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
@ -352,7 +352,6 @@
<setEntry value="wrapped.org.springframework.spring-context@default:default"/>
<setEntry value="wrapped.org.springframework.spring-core@default:default"/>
<setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
<setEntry value="wrapped.org.springframework.spring-jcl@default:default"/>
<setEntry value="wrapped.org.springframework.spring-web@default:default"/>
<setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
<setEntry value="xstream@default:default"/>

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

@ -126,6 +126,7 @@
<setEntry value="groovy-sql@default:false"/>
<setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.jws-api@default:default"/>
<setEntry value="jakarta.persistence-api@default:default"/>

3
org.adempiere.server-feature/setup/configuration/config.ini
View File

@ -80,7 +80,8 @@ osgi.bundles=org.apache.felix.scr@1:start,\
wrapped.dev.samstevens.totp.totp,\
org.antlr.antlr4-runtime,\
xstream,\
org.fusesource.hawtbuf.hawtbuf
org.fusesource.hawtbuf.hawtbuf,\
io.github.classgraph.classgraph
osgi.framework.extensions=
osgi.bundles.defaultStartLevel=4
osgi.compatibility.bootdelegation=true

3
org.adempiere.ui.zk/META-INF/MANIFEST.MF
View File

@ -19,6 +19,7 @@ Import-Package: com.google.common.annotations;version="30.1.1",
com.google.common.reflect;version="30.1.1",
com.google.common.util.concurrent;version="30.1.1",
groovy.transform.stc;version="2.4.7",
io.github.classgraph;version="4.8.138",
javax.annotation,
javax.annotation.processing,
javax.annotation.security,
@ -133,8 +134,6 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
web.js.ckez.ext.CKeditor.plugins.dialog,
web.js.ckez.ext.CKeditor.plugins.div.dialogs,
web.js.ckez.ext.CKeditor.plugins.find.dialogs,
web.js.ckez.ext.CKeditor.plugins.flash.dialogs,
web.js.ckez.ext.CKeditor.plugins.flash.images,
web.js.ckez.ext.CKeditor.plugins.forms.dialogs,
web.js.ckez.ext.CKeditor.plugins.forms.images,
web.js.ckez.ext.CKeditor.plugins.iframe.dialogs,

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.2.0</version>
<version>4.17.1.0</version>
</artifactItem>
<artifactItem>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>

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

@ -1348,4 +1348,11 @@ Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<!-- classgraph -->
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.138</version>
<type>jar</type>
</location>
</locations>

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

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="idempiere-210901" sequenceNumber="1640585624">
<target name="idempiere-220124" sequenceNumber="1643026597">
<locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="zcommon" version="9.6.0.1"/>
<unit id="zel" version="9.6.0.1"/>
<unit id="zhtml" version="9.6.0.1"/>
<unit id="zjavassist" version="9.6.0.1"/>
<unit id="zk" version="9.6.0.1"/>
<unit id="zkbind" version="9.6.0.1"/>
<unit id="zkplus" version="9.6.0.1"/>
<unit id="zkwebfragment" version="9.6.0.1"/>
<unit id="zul" version="9.6.0.1"/>
<unit id="zweb" version="9.6.0.1"/>
<unit id="zweb-dsp" version="9.6.0.1"/>
<repository location="https://idempiere.github.io/binary.file/p2.zk/9.6.0.1"/>
<unit id="zcommon" version="9.6.1"/>
<unit id="zel" version="9.6.1"/>
<unit id="zhtml" version="9.6.1"/>
<unit id="zjavassist" version="9.6.1"/>
<unit id="zk" version="9.6.1"/>
<unit id="zkbind" version="9.6.1"/>
<unit id="zkplus" version="9.6.1"/>
<unit id="zkwebfragment" version="9.6.1"/>
<unit id="zul" version="9.6.1"/>
<unit id="zweb" version="9.6.1"/>
<unit id="zweb-dsp" version="9.6.1"/>
<repository location="https://idempiere.github.io/binary.file/p2.zk/9.6.1"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="jakarta.xml.ws-api" version="2.3.3.v202109010034"/>
@ -1485,5 +1485,12 @@ Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<!-- classgraph -->
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.138</version>
<type>jar</type>
</location>
</locations>
</target>

4
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
View File

@ -1,9 +1,9 @@
target "idempiere-210901"
target "idempiere-220124"
with source configurePhase allEnvironments
location "https://idempiere.github.io/binary.file/p2.zk/9.6.0.1" {
location "https://idempiere.github.io/binary.file/p2.zk/9.6.1" {
zcommon
zel
zhtml

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

@ -16,7 +16,7 @@
<tycho.extras.version>${tycho.version}</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jp.version>6.17.0</jp.version>
<zk.version>9.6.0.1</zk.version>
<zk.version>9.6.1</zk.version>
<maven.dependency.version>3.1.1</maven.dependency.version>
<download.maven.version>1.4.1</download.maven.version>
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
@ -537,11 +537,16 @@
<url>https://maven.atlassian.com/3rdparty</url>
</repository>
<repository>
<id>idempiere-zkoss</id>
<url>https://idempiere.github.io/binary.file/maven.zk/</url>
</repository>
<repository>
<id>zkoss</id>
<url>https://mavensync.zkoss.org/maven2</url>
</repository>
<repository>
<id>jenkins</id>
<url>https://repo.jenkins-ci.org/releases</url>

1
org.idempiere.test/idempiere.unit.test.launch
View File

@ -84,6 +84,7 @@
<setEntry value="groovy-sql@default:false"/>
<setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.jws-api@default:default"/>
<setEntry value="jakarta.persistence-api@default:default"/>