diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index d37ac1c8b6..839e7dd653 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -43,511 +43,302 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + id="wrapped.org.apache.poi.poi-ooxml-lite" + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + + + + + + diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch index 4a05d56d92..0ddcb8cdd0 100644 --- a/org.adempiere.base-feature/model.generator.launch +++ b/org.adempiere.base-feature/model.generator.launch @@ -44,17 +44,18 @@ - + + @@ -68,7 +69,8 @@ - + + @@ -88,8 +90,12 @@ - + + + + + @@ -124,7 +130,9 @@ + + diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch index 2ff13275ea..3a3c509882 100644 --- a/org.adempiere.base-feature/packinfolder.app.launch +++ b/org.adempiere.base-feature/packinfolder.app.launch @@ -44,7 +44,6 @@ - @@ -57,6 +56,7 @@ + @@ -77,7 +77,8 @@ - + + @@ -101,7 +102,6 @@ - @@ -142,7 +142,9 @@ + + diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index 9b6f95ef0c..e84c656caf 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -45,7 +45,6 @@ - @@ -58,6 +57,7 @@ + @@ -78,7 +78,8 @@ - + + @@ -101,7 +102,6 @@ - @@ -142,7 +142,9 @@ + + diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index 1594cf600d..bf30922042 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -45,7 +45,6 @@ - @@ -58,6 +57,7 @@ + @@ -78,7 +78,8 @@ - + + @@ -102,7 +103,6 @@ - @@ -143,7 +143,9 @@ + + diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index 5aa7ec9b3c..e7d3cc10d8 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -45,7 +45,6 @@ - @@ -58,6 +57,7 @@ + @@ -78,7 +78,8 @@ - + + @@ -101,7 +102,6 @@ - @@ -142,7 +142,9 @@ + + diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index bb31d19ed9..5a56aaf27d 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -158,27 +158,28 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", org.passay;bundle-version="0.0.0", org.cryptacular, net.sf.supercsv.super-csv;bundle-version="0.0.0", - bcprov;bundle-version="1.54.0", + bcprov;bundle-version="1.72.0", org.krysalis.barcode4j;bundle-version="0.0.0", groovy, com.sun.activation.jakarta.activation;bundle-version="1.2.1", org.apache.commons.commons-compress;bundle-version="1.21.0", - com.google.gson;bundle-version="2.8.2", - com.google.http-client.google-http-client;bundle-version="1.38.1", + com.google.gson;bundle-version="2.9.0", + com.google.http-client.google-http-client;bundle-version="1.39.2", com.google.oauth-client;bundle-version="1.31.4", org.apache.httpcomponents.httpclient;bundle-version="4.5.10", org.apache.httpcomponents.httpcore;bundle-version="4.4.12", - com.google.guava;bundle-version="28.2.0", - com.github.librepdf.openpdf;bundle-version="1.3.26", - com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.26", - wrapped.org.apache.poi.poi;bundle-version="4.1.2", - wrapped.org.apache.poi.poi-ooxml;bundle-version="4.1.2", - wrapped.org.apache.xmlbeans.xmlbeans;bundle-version="3.1.0", + com.google.guava;bundle-version="30.1.1", + com.github.librepdf.openpdf;bundle-version="1.3.39", + com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.39", + wrapped.org.apache.poi.poi;bundle-version="5.2.2", + wrapped.org.apache.poi.poi-ooxml;bundle-version="5.2.2", wrapped.org.jfree.jcommon;bundle-version="1.0.24", wrapped.org.jfree.jfreechart;bundle-version="[1.0.19,1.0.19]", wrapped.com.google.http-client.google-http-client-gson;bundle-version="1.39.2", wrapped.com.google.zxing.javase;bundle-version="3.4.1", wrapped.dev.samstevens.totp.totp;bundle-version="1.7.1", - org.apache.poi.ooxml-schemas;bundle-version="4.1.2" + wrapped.org.apache.poi.poi-ooxml-lite;bundle-version="5.2.2", + org.apache.logging.log4j.api;bundle-version="2.17.2", + org.apache.logging.log4j.to-slf4j;bundle-version="2.17.2" Automatic-Module-Name: org.adempiere.base Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 9d9f110d18..f3dd7b73b3 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -41,7 +41,6 @@ - @@ -54,6 +53,7 @@ + @@ -67,7 +67,8 @@ - + + @@ -89,9 +90,13 @@ - + + + + + @@ -126,7 +131,9 @@ + + diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index e02604af15..1527c6d139 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -41,7 +41,6 @@ - @@ -54,6 +53,7 @@ + @@ -65,7 +65,8 @@ - + + @@ -86,9 +87,13 @@ - + + + + + @@ -123,7 +128,9 @@ + + diff --git a/org.adempiere.install/install.silent.app.launch b/org.adempiere.install/install.silent.app.launch index d2389e4a25..cad6279072 100644 --- a/org.adempiere.install/install.silent.app.launch +++ b/org.adempiere.install/install.silent.app.launch @@ -41,7 +41,6 @@ - @@ -54,6 +53,7 @@ + @@ -65,7 +65,8 @@ - + + @@ -86,9 +87,13 @@ - + + + + + @@ -123,7 +128,9 @@ + + diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml index 08027cc582..54bce73eba 100644 --- a/org.adempiere.report.jasper-feature/feature.xml +++ b/org.adempiere.report.jasper-feature/feature.xml @@ -19,350 +19,214 @@ - - + id="com.github.librepdf.openpdf" + version="0.0.0"/> + + + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + id="wrapped.org.apache.poi.poi-ooxml-lite" + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + + + + + + diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index b3fff0f730..cd30c67aa2 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -105,8 +105,6 @@ - - @@ -171,11 +169,9 @@ - - @@ -194,8 +190,9 @@ + + - @@ -381,6 +378,7 @@ + @@ -388,6 +386,7 @@ + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index effea2a776..cb73da1e6f 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -105,8 +105,6 @@ - - @@ -171,11 +169,9 @@ - - @@ -194,8 +190,9 @@ + + - @@ -381,6 +378,7 @@ + @@ -388,6 +386,7 @@ + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index dfb3ea3a6b..9dfa2bb61a 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -28,8 +28,8 @@ osgi.bundles=org.apache.felix.scr@1:start,\ org.eclipse.core.contenttype,\ wrapped.org.apache.poi.poi,\ wrapped.org.apache.poi.poi-ooxml,\ + wrapped.org.apache.poi.poi-ooxml-lite,\ org.apache.commons.commons-compress,\ - org.apache.poi.ooxml-schemas,\ wrapped.org.apache.xmlbeans.xmlbeans,\ org.eclipse.core.jobs,\ org.eclipse.equinox.preferences,\ @@ -50,10 +50,12 @@ osgi.bundles=org.apache.felix.scr@1:start,\ net.sf.supercsv.super-csv,\ com.github.librepdf.openpdf,\ com.github.librepdf.openpdf-fonts-extra,\ - com.jaspersoft.studio.bundles.barbecue,\ + wrapped.net.sourceforge.barbecue.barbecue,\ wrapped.org.jfree.jfreechart,\ wrapped.org.jfree.jcommon,\ org.krysalis.barcode4j,\ + org.apache.logging.log4j.api,\ + org.apache.logging.log4j.to-slf4j,\ bcprov,\ bcpkix,\ bcutil,\ @@ -105,7 +107,13 @@ osgi.bundles=org.apache.felix.scr@1:start,\ org.osgi.util.xml,\ org.postgresql.jdbc,\ com.zaxxer.HikariCP,\ - wrapped.com.oracle.database.jdbc.ojdbc10 + wrapped.com.oracle.database.jdbc.ojdbc10,\ + org.apache.aries.spifly.dynamic.bundle,\ + org.objectweb.asm.commons,\ + org.objectweb.asm.tree.analysis,\ + org.objectweb.asm.tree,\ + org.objectweb.asm.util,\ + org.objectweb.asm osgi.framework.extensions= osgi.bundles.defaultStartLevel=4 osgi.compatibility.bootdelegation=true diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSReportViewerRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSReportViewerRenderer.java index d95958b862..56e1464964 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSReportViewerRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSReportViewerRenderer.java @@ -72,7 +72,7 @@ public class XLSReportViewerRenderer implements IReportViewerRenderer { @Override public boolean isExport() { - return false; + return true; } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSXReportViewerRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSXReportViewerRenderer.java index 95d88cb410..9254e2e855 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSXReportViewerRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSXReportViewerRenderer.java @@ -72,7 +72,7 @@ public class XLSXReportViewerRenderer implements IReportViewerRenderer { @Override public boolean isExport() { - return false; + return true; } @Override diff --git a/org.idempiere.p2.targetplatform/README.md b/org.idempiere.p2.targetplatform/README.md index 025e5b5a8c..0d361f901a 100644 --- a/org.idempiere.p2.targetplatform/README.md +++ b/org.idempiere.p2.targetplatform/README.md @@ -1,12 +1,13 @@ #How to Update Target Plaform * Install Target Platform DSL Editor from https://github.com/eclipse-cbi/targetplatform-dsl * Update maven.locations.xml (if needed) -* Update org.idempiere.p2.targetplatform.tpd. Note that even if there's only update to maven.locations.xml, you should at minimum update the target timestamp (format is idempiere-yymmdd) value. +* Update org.idempiere.p2.targetplatform.tpd. Target name is of format idempiere-{version} (for e.g idempiere-12) * Turn off Project > Build Automatically * Right click on org.idempiere.p2.targetplatform.tpd and select "Create Target Definition File" * Open the updated org.idempiere.p2.targetplatform.target, switch to Source tab and copy location entries from maven.locations.xml +* Use current date (with format yyyymmdd) as sequenceNumber of org.idempiere.p2.targetplatform.target (for e.g 20240215) * Switch back to Definition tab and wait for resolution of the target plaform. Check target platform state to verify there's no unresolve plugins except the platform launcher fragment (select "Show only unresolved plug-ins"). If resolution of target platform is very slow, you can try "rm .metadata/.plugins/org.eclipse.pde.core/.p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs" (run at the root of your workspace folder) to speed it up. -* If there are update to embedded jars, quit Eclipse, remove the embedded jars and execute "mvn clean verify -U" +* If there are update to embedded jars or there are new embedded jars to download, quit Eclipse, remove the embedded jars and execute "mvn clean validate" * Reload target platform * Turn on Project > Build Automatically * If there are features that give missing plugin warnings, try "Clean all projects" and rebuild the whole workspace diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml index c503e2ddfa..70dbca1536 100644 --- a/org.idempiere.p2.targetplatform/maven.locations.xml +++ b/org.idempiere.p2.targetplatform/maven.locations.xml @@ -89,55 +89,55 @@ Export-Package: *;version="${version}";-noimport:=true com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.datatype jackson-datatype-guava - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.datatype jackson-datatype-joda - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.datatype jackson-datatype-json-org - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.jaxrs jackson-jaxrs-xml-provider - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.module jackson-module-jsonSchema - 2.12.4 + 2.15.3 jar @@ -171,7 +171,7 @@ Export-Package: *;version="${version}";-noimport:=true com.github.librepdf openpdf-fonts-extra - 1.3.26 + 1.3.39 jar @@ -448,7 +448,7 @@ Export-Package: *;-noimport:=true net.sf.jasperreports jasperreports - 6.17.0 + 6.21.0 jar @@ -457,6 +457,12 @@ Export-Package: *;-noimport:=true 2.1 jar + + net.sourceforge.barbecue + barbecue + 1.5-beta1 + jar + net.sf.supercsv @@ -819,39 +825,7 @@ Export-Package: *;version="${version}";-noimport:=true stax2-api 4.2.1 jar - - - - org.apache.cxf - cxf-rt-databinding-xmlbeans - 3.1.18 - jar - - - org.apache.xmlbeans - xmlbeans - 3.1.0 - jar - - - - org.apache.cxf - cxf-rt-bindings-object - 3.1.18 - jar - - - org.apache.cxf - cxf-rt-rs-extension-providers - 3.1.18 - jar - + org.codehaus.jettison jettison @@ -882,7 +856,7 @@ Export-Package: *;version="${version}";-noimport:=true org.apache.poi poi - 4.1.2 + 5.2.2 jar commons-codec commons-codec - 1.14 + 1.16.1 jar @@ -920,7 +894,7 @@ Export-Package: *;version="${version}";-noimport:=true org.apache.poi poi-ooxml - 4.1.2 + 5.2.2 jar + org.apache.poi + poi-ooxml-lite + 5.2.2 + jar + + + + org.apache.logging.log4j + log4j-api + 2.17.2 + jar + + + org.apache.logging.log4j + log4j-to-slf4j + 2.17.2 + jar + + + org.apache.xmlbeans + xmlbeans + 5.0.3 + jar + + com.github.virtuald curvesapi 1.06 @@ -1003,7 +1008,7 @@ Export-Package: *;version="${version}";-noimport:=true org.apache.servicemix.bundles org.apache.servicemix.bundles.batik - 1.14_1 + 1.16_1 jar @@ -1483,7 +1488,7 @@ Export-Package: *;version="${version}";-noimport:=true 4.5.13 jar - + com.zaxxer HikariCP @@ -1507,5 +1512,5 @@ Import-Package: *;resolution:=optional Export-Package: *;version="${version}";-noimport:=true ]]> - + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 571e95d957..3c4a55cf1c 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,8 +1,7 @@ - - + @@ -25,7 +24,6 @@ - @@ -142,9 +140,6 @@ - - - @@ -236,55 +231,55 @@ Export-Package: *;version="${version}";-noimport:=true com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.datatype jackson-datatype-guava - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.datatype jackson-datatype-joda - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.datatype jackson-datatype-json-org - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.jaxrs jackson-jaxrs-xml-provider - 2.12.4 + 2.15.3 jar com.fasterxml.jackson.module jackson-module-jsonSchema - 2.12.4 + 2.15.3 jar @@ -318,7 +313,7 @@ Export-Package: *;version="${version}";-noimport:=true com.github.librepdf openpdf-fonts-extra - 1.3.26 + 1.3.39 jar @@ -595,7 +590,7 @@ Export-Package: *;-noimport:=true net.sf.jasperreports jasperreports - 6.17.0 + 6.21.0 jar @@ -604,6 +599,12 @@ Export-Package: *;-noimport:=true 2.1 jar + + net.sourceforge.barbecue + barbecue + 1.5-beta1 + jar + net.sf.supercsv @@ -967,38 +968,6 @@ Export-Package: *;version="${version}";-noimport:=true 4.2.1 jar - - - org.apache.cxf - cxf-rt-databinding-xmlbeans - 3.1.18 - jar - - - org.apache.xmlbeans - xmlbeans - 3.1.0 - jar - - - - org.apache.cxf - cxf-rt-bindings-object - 3.1.18 - jar - - - org.apache.cxf - cxf-rt-rs-extension-providers - 3.1.18 - jar - org.codehaus.jettison jettison @@ -1029,7 +998,7 @@ Export-Package: *;version="${version}";-noimport:=true org.apache.poi poi - 4.1.2 + 5.2.2 jar commons-codec commons-codec - 1.14 + 1.16.1 jar @@ -1067,7 +1036,7 @@ Export-Package: *;version="${version}";-noimport:=true org.apache.poi poi-ooxml - 4.1.2 + 5.2.2 jar + org.apache.poi + poi-ooxml-lite + 5.2.2 + jar + + + + org.apache.logging.log4j + log4j-api + 2.17.2 + jar + + + org.apache.logging.log4j + log4j-to-slf4j + 2.17.2 + jar + + + org.apache.xmlbeans + xmlbeans + 5.0.3 + jar + + com.github.virtuald curvesapi 1.06 @@ -1150,7 +1150,7 @@ Export-Package: *;version="${version}";-noimport:=true org.apache.servicemix.bundles org.apache.servicemix.bundles.batik - 1.14_1 + 1.16_1 jar @@ -1630,7 +1630,7 @@ Export-Package: *;version="${version}";-noimport:=true 4.5.13 jar - + com.zaxxer HikariCP @@ -1641,7 +1641,7 @@ Export-Package: *;version="${version}";-noimport:=true postgresql 42.7.1 - + com.oracle.database.jdbc ojdbc10 19.21.0.0 @@ -1654,6 +1654,6 @@ Import-Package: *;resolution:=optional Export-Package: *;version="${version}";-noimport:=true ]]> - + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd index d1d2b027a3..5533125ced 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd @@ -1,4 +1,4 @@ -target "idempiere-230620" +target "idempiere-12" with source configurePhase allEnvironments @@ -17,13 +17,21 @@ location zk "https://idempiere.github.io/binary.file/p2.zk/9.6.4" { } location repackaged "https://idempiere.github.io/binary.file/p2.repackaged/9.0.0" { + // 2.3.3.v2021090100, dependency of com.sun.xml.ws.jaxws-rt_2.3.5, org.idempiere.webservices, + // wrapped.org.apache.cxf.cxf-rt-ws-transfer_3.4.4 jakarta.xml.ws-api + // 2.7.2.v202109010034 org.atmosphere.runtime + // 30.1.1.jre_v202109010034, dependency of com.fasterxml.jackson.datatype.jackson-datatype-guava_2.12.4, + // com.google.http-client.google-http-client, com.google.oauth-client_1.31.5, org.passay_1.16.1 com.google.guava + // 1.39.2.sp_1_v202109010034, dependency of com.google.oauth-client_1.31.5, wrapped.com.google.http-client.google-http-client-gson_1.39.2.sp1 com.google.http-client.google-http-client + // 1.2.18.v202109010034, dependency of com.sun.xml.bind.jaxb-impl_2.3.5, com.sun.xml.messaging.saaj.impl_1.5.3, + // org.apache.cxf.cxf-core_3.4.4 com.sun.xml.fastinfoset.FastInfoset + // 4.6.4, dependency of org.idempiere.felix.webconsole org.apache.felix.webconsole - org.apache.poi.ooxml-schemas } location eclipse-2023-03 "https://download.eclipse.org/eclipse/updates/4.27" { @@ -51,7 +59,7 @@ location eclipse-2023-03 "https://download.eclipse.org/eclipse/updates/4.27" { org.osgi.util.promise org.osgi.util.pushstream org.osgi.util.xml - //<< equinox framework starter kit + // equinox framework starter kit org.apache.felix.gogo.command org.apache.felix.gogo.runtime org.apache.felix.gogo.shell @@ -73,7 +81,6 @@ location eclipse-2023-03 "https://download.eclipse.org/eclipse/updates/4.27" { org.eclipse.equinox.frameworkadmin org.eclipse.equinox.frameworkadmin.equinox org.eclipse.equinox.launcher - //org.eclipse.equinox.launcher.gtk.linux.x86 org.eclipse.equinox.p2.artifact.repository org.eclipse.equinox.p2.console org.eclipse.equinox.p2.core @@ -91,7 +98,6 @@ location eclipse-2023-03 "https://download.eclipse.org/eclipse/updates/4.27" { org.eclipse.equinox.preferences org.eclipse.equinox.registry org.eclipse.equinox.security - //org.eclipse.equinox.security.linux.x86 org.eclipse.equinox.simpleconfigurator org.eclipse.equinox.simpleconfigurator.manipulator org.eclipse.osgi.services @@ -99,8 +105,8 @@ location eclipse-2023-03 "https://download.eclipse.org/eclipse/updates/4.27" { org.sat4j.core org.sat4j.pb org.tukaani.xz - //<< equinox add-on - // feature for launcher all environment + // equinox add-on + // launcher feature for all environment org.eclipse.equinox.executable.feature.group org.eclipse.equinox.http.registry org.eclipse.osgi.compatibility.state @@ -123,7 +129,7 @@ location eclipse-2023-03 "https://download.eclipse.org/eclipse/updates/4.27" { org.eclipse.jdt.core org.eclipse.jdt.core.compiler.batch org.eclipse.text - //<< for test + // junit org.opentest4j org.apiguardian.api org.junit @@ -147,8 +153,5 @@ location orbit-2021-06-R20210602031627 "https://download.eclipse.org/tools/orbit } location jasperstudio "https://idempiere.github.io/binary.file/p2.repackaged/jasperstudio/6.17.0" { - com.jaspersoft.studio.bundles.barbecue - com.jaspersoft.studio.bundles.itext - org.w3c.dom.svg.patch org.krysalis.barcode4j } diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch index b516804052..3f702d6bbe 100644 --- a/org.idempiere.test/idempiere.unit.test.launch +++ b/org.idempiere.test/idempiere.unit.test.launch @@ -97,8 +97,6 @@ - - @@ -169,11 +167,9 @@ - - @@ -191,8 +187,9 @@ + + - @@ -311,7 +308,6 @@ - @@ -369,7 +365,9 @@ + + diff --git a/org.idempiere.test/idempiere.unit.test.parallel.launch b/org.idempiere.test/idempiere.unit.test.parallel.launch index 47b8a2c553..93a21a5bae 100644 --- a/org.idempiere.test/idempiere.unit.test.parallel.launch +++ b/org.idempiere.test/idempiere.unit.test.parallel.launch @@ -97,8 +97,6 @@ - - @@ -169,11 +167,9 @@ - - @@ -191,8 +187,9 @@ + + - @@ -311,7 +308,6 @@ - @@ -369,7 +365,9 @@ + + diff --git a/org.idempiere.ui.sso.oidc/META-INF/MANIFEST.MF b/org.idempiere.ui.sso.oidc/META-INF/MANIFEST.MF index 557f965ffa..f040bbfea8 100644 --- a/org.idempiere.ui.sso.oidc/META-INF/MANIFEST.MF +++ b/org.idempiere.ui.sso.oidc/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Import-Package: javax.servlet;version="4.0.0", Bundle-ActivationPolicy: lazy Require-Bundle: org.adempiere.base;bundle-version="11.0.0", org.eclipse.core.runtime;bundle-version="3.24.100" -Service-Component: OSGI-INF/org.idempiere.ui.sso.oidc.factory.OIDCServiceFactory.xml Bundle-ClassPath: lib/nimbus-jose-jwt.jar, lib/oauth2-oidc-sdk.jar, lib/json-smart.jar, @@ -25,3 +24,4 @@ Bundle-ClassPath: lib/nimbus-jose-jwt.jar, lib/accessors-smart.jar, lib/content-type.jar, . +Service-Component: OSGI-INF/org.idempiere.ui.sso.oidc.factory.OIDCServiceFactory.xml diff --git a/org.idempiere.ui.sso.oidc/OSGI-INF/org.idempiere.ui.sso.oidc.factory.OIDCServiceFactory.xml b/org.idempiere.ui.sso.oidc/OSGI-INF/org.idempiere.ui.sso.oidc.factory.OIDCServiceFactory.xml index 302fcd325b..75ef91f6aa 100644 --- a/org.idempiere.ui.sso.oidc/OSGI-INF/org.idempiere.ui.sso.oidc.factory.OIDCServiceFactory.xml +++ b/org.idempiere.ui.sso.oidc/OSGI-INF/org.idempiere.ui.sso.oidc.factory.OIDCServiceFactory.xml @@ -5,4 +5,4 @@ - + \ No newline at end of file diff --git a/org.idempiere.webservices-feature/feature.xml b/org.idempiere.webservices-feature/feature.xml index 1cce3d78fe..eda1bca4bc 100644 --- a/org.idempiere.webservices-feature/feature.xml +++ b/org.idempiere.webservices-feature/feature.xml @@ -19,331 +19,178 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> - - - - + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="1.0.3"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> - - + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath index d514607e62..0a20f35ad1 100755 --- a/org.idempiere.webservices/.classpath +++ b/org.idempiere.webservices/.classpath @@ -1,12 +1,26 @@ - + - + - + + + + + + + + + + + + + + + diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 57390530e5..df6cb4bc7b 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -87,8 +87,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.xml.resolver;bundle-version="1.2.0", org.apache.cxf.cxf-rt-ws-addr;bundle-version="3.3.1", org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.3.1", - org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17", - org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17", org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1", org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.3.1", org.glassfish.hk2.api;bundle-version="2.5.0", @@ -104,14 +102,17 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", wrapped.org.springframework.spring-context-support;bundle-version="5.2.15", wrapped.org.springframework.spring-core;bundle-version="5.2.15", wrapped.org.springframework.spring-expression;bundle-version="5.2.15", - wrapped.org.apache.xmlbeans.xmlbeans;bundle-version="3.1.0", wrapped.org.springframework.spring-web;bundle-version="5.2.15", org.codehaus.jettison.jettison;bundle-version="1.4.1", org.eclipse.osgi, jakarta.annotation-api;bundle-version="1.3.5", org.idempiere.webservices.resources;bundle-version="11.0.0" Bundle-ClassPath: ., - lib/idempiere-xmlbeans.jar + lib/idempiere-xmlbeans.jar, + lib/xmlbeans-3.1.0.jar, + lib/cxf-rt-databinding-xmlbeans-3.1.18.jar, + lib/cxf-rt-bindings-object-3.1.18.jar, + lib/cxf-rt-rs-extension-providers-3.1.18.jar Export-Package: org.idempiere.webservices.model, org.idempiere.adInterface.x10, org.idempiere.adInterface.x10.impl, diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/xml/rest-context.xml b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/xml/rest-context.xml index e3e14720d0..9406453e72 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/xml/rest-context.xml +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/xml/rest-context.xml @@ -8,7 +8,6 @@ http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"> - diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties index eea091d3fb..21a24313c0 100644 --- a/org.idempiere.webservices/build.properties +++ b/org.idempiere.webservices/build.properties @@ -6,7 +6,11 @@ bin.includes = META-INF/,\ WEB-INF/xsd/,\ plugin.xml,\ OSGI-INF/,\ - lib/idempiere-xmlbeans.jar + lib/idempiere-xmlbeans.jar,\ + lib/xmlbeans-3.1.0.jar,\ + lib/cxf-rt-databinding-xmlbeans-3.1.18.jar,\ + lib/cxf-rt-bindings-object-3.1.18.jar,\ + lib/cxf-rt-rs-extension-providers-3.1.18.jar src.includes = lib/,\ WEB-INF/web.xml,\ WEB-INF/xsd/ diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml index cd1513d540..762ac7c9c4 100644 --- a/org.idempiere.webservices/pom.xml +++ b/org.idempiere.webservices/pom.xml @@ -64,6 +64,46 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + validate + + copy + + + + + org.apache.xmlbeans + xmlbeans + 3.1.0 + + + org.apache.cxf + cxf-rt-databinding-xmlbeans + 3.1.18 + + + org.apache.cxf + cxf-rt-bindings-object + 3.1.18 + + + org.apache.cxf + cxf-rt-rs-extension-providers + 3.1.18 + + + lib + false + true + true + + + + diff --git a/org.idempiere.zk.datatable/META-INF/MANIFEST.MF b/org.idempiere.zk.datatable/META-INF/MANIFEST.MF index 9140f55ba6..bd2c34dae0 100644 --- a/org.idempiere.zk.datatable/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.datatable/META-INF/MANIFEST.MF @@ -22,6 +22,6 @@ Bundle-Vendor: idempiere.org Fragment-Host: org.adempiere.ui.zk;bundle-version="11.0.0" Automatic-Module-Name: org.idempiere.ui.zk.datatable Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.idempiere.zk.datatable.DatatableReportRenderer.xml, OSGI-INF/org.idempiere.zk.datatable.DatatableReportViewerRenderer.xml -Bundle-ActivationPolicy: lazy diff --git a/org.idempiere.zk.datatable/src/org/idempiere/zk/datatable/DatatableReportRenderer.java b/org.idempiere.zk.datatable/src/org/idempiere/zk/datatable/DatatableReportRenderer.java index c6a058f2dd..89e83abc40 100644 --- a/org.idempiere.zk.datatable/src/org/idempiere/zk/datatable/DatatableReportRenderer.java +++ b/org.idempiere.zk.datatable/src/org/idempiere/zk/datatable/DatatableReportRenderer.java @@ -409,9 +409,13 @@ public class DatatableReportRenderer implements IReportRenderer