From 58258ad5062f25a46f283748d79fc1668e1722be Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 31 Oct 2020 05:53:36 +0700 Subject: [PATCH] Idempiere-4492 update library (eclipse-4.17, jasper 6-15, jetty-9.4.33, atmosphere-2.6.4) (#331) * IDEMPIERE-4492 update jetty to 9.4.33.v20201020 update atmosphere to 2.5.15 * IDEMPIERE-4492 update jetty to 9.4.33.v20201020 (update configuration) update to default jetty configuration delete unused configuration (alpn, http2,..) * IDEMPIERE-4492 update orbit eclipse repository to 4.17 * IDEMPIERE-4492 update orbit eclipse repository to 4.17 (on parent pom) * IDEMPIERE-4492 update jasper to 6.15.0 * IDEMPIERE-4492 update jasper to 6.15.0 (IDEMPIERE-4504) get rid of bundle "org.w3c.dom.events version 3.0.0" by use old version of org.w3c.dom.smil note: on target platform a bundle has multi version then tycho can pickup correct version define on feature (tab included plugins, field version) but on eclipse when sync launching from .product it don't respect that value, always set highest version to bundle workaround: on target platform manual un-select bundle org.w3c.dom.smil 1.0.1 * IDEMPIERE-4492 update atmosphere to 2.6.4 * IDEMPIERE-4492 refine target platform use targetplatform-dsl to generate target platform https://github.com/eclipse-cbi/targetplatform-dsl + don't need to care update bundle version when update repository + at moment org.idempiere.eclipse.platform-feature include some feature form eclipse repository so target has to include that feature so target platform will include all bundler request by feature and bundle request by plugins of that feature and so on (ever optional so it make target content has more plugins than what we use on project next step will convert include feature to include plugins to define only what we used * IDEMPIERE-4492 refine target platform (continue) don't include framework feature, use include plugins to void load transitive dependency so minimize target flatform remove some unused feature from idempiere product * IDEMPIERE-4492 update c3p0 and database jdbc (patch from Carlos) --- org.adempiere.base-feature/feature.xml | 2 +- .../model.generator.launch | 168 +-- .../packinfolder.app.launch | 167 +-- .../sign.database.build.launch | 166 +-- .../synchronize-terminology.app.launch | 166 +-- .../translation.app.launch | 166 +-- org.adempiere.install/build.xml | 8 +- org.adempiere.install/install.app.launch | 23 +- .../install.console.app.launch | 22 +- .../feature.xml | 11 +- org.adempiere.server-feature/build.xml | 10 +- org.adempiere.server-feature/feature.xml | 57 +- .../idempiere-server.bat | 2 +- .../idempiere-server.sh | 4 +- .../jettyhome/etc/jetty-alpn.xml | 28 - .../jettyhome/etc/jetty-deployer.xml | 47 +- .../jettyhome/etc/jetty-http-template.xml | 31 +- .../jettyhome/etc/jetty-http2.xml | 39 - .../jettyhome/etc/jetty-https.xml | 15 +- .../jettyhome/etc/jetty-plus.xml | 25 - .../jettyhome/etc/jetty-selector-template.xml | 31 - .../etc/jetty-ssl-context-template.xml | 69 +- .../jettyhome/etc/jetty-ssl-template.xml | 30 +- .../jettyhome/etc/jetty-template.xml | 76 +- .../jettyhome/etc/jetty-threadpool.xml | 28 + org.adempiere.server-feature/server.product | 19 +- .../server.product.functionaltest.launch | 244 +--- .../server.product.launch | 116 +- org.adempiere.server-feature/setup.ini | 2 +- .../setup/configuration/config.ini | 4 +- .../unix/DebianInstaller/etc/init.d/idempiere | 2 +- org.compiere.db.oracle.provider/.classpath | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 2 +- org.compiere.db.oracle.provider/pom.xml | 28 +- org.compiere.db.postgresql.provider/pom.xml | 6 +- .../feature.xml | 444 ++++-- .../director/configuration/config.ini | 2 +- .../update.bat | 10 - .../update.sh | 15 - .../org.idempiere.maven.to.p2/pom.xml | 106 +- .../org.idempiere.p2.targetplatform.target | 1222 +++++------------ .../org.idempiere.p2.targetplatform.tpd | 389 ++++++ org.idempiere.p2/category.xml | 29 +- org.idempiere.p2/server.product | 7 +- org.idempiere.parent/pom.xml | 14 +- org.idempiere.test/idempiere.unit.test.launch | 12 +- org.idempiere.webservices-feature/feature.xml | 56 +- .../META-INF/MANIFEST.MF | 6 +- 49 files changed, 1783 insertions(+), 2349 deletions(-) delete mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-alpn.xml delete mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml delete mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-plus.xml delete mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-selector-template.xml create mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-threadpool.xml create mode 100644 org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index 69926f4c0c..1e806143eb 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -362,7 +362,7 @@ unpack="false"/> - - - - + + + + - - - + + + + + + + + + + + - - - - - - - - - - + - - - - - - + + + - - - - - - - + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch index fb21129ccb..83b0a2227b 100644 --- a/org.adempiere.base-feature/packinfolder.app.launch +++ b/org.adempiere.base-feature/packinfolder.app.launch @@ -29,189 +29,88 @@ - - - - + + + + - - - + + + + + + + + + + + - - - - - - - - - - + - - - - - - + + + - - - - - - - + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index 04999f4ac6..6d1318d431 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -29,188 +29,88 @@ - - - - + + + + - - - + + + + + + + + + + + - - - - - - - - - - + - - - - - - + + + - - - - - - - + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index d5b6b5b813..cb10270fab 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -29,188 +29,88 @@ - - - - + + + + - - - + + + + + + + + + + + - - - - - - - - - - + - - - - - - + + + - - - - - - - + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index 2ada622caf..08c2f349dd 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -29,188 +29,88 @@ - - - - + + + + - - - + + + + + + + + + + + - - - - - - - - - - + - - - - - - + + + - - - - - - - + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/org.adempiere.install/build.xml b/org.adempiere.install/build.xml index 8785dec2f8..44a1d37f66 100644 --- a/org.adempiere.install/build.xml +++ b/org.adempiere.install/build.xml @@ -39,14 +39,10 @@ tofile="../jettyhome/etc/jetty-ssl-context.xml" filtering="yes" overwrite="yes"/> - - - + diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 2264da801e..77ef2af5e4 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -37,27 +37,29 @@ + - - - + + - - + + + + - + @@ -66,19 +68,20 @@ + + - + - - + - + diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index d6260fc571..2cc9d06aef 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -37,19 +37,19 @@ + - - - + + - - + + @@ -57,7 +57,7 @@ - + @@ -71,14 +71,14 @@ + - + - - + - + @@ -91,7 +91,7 @@ - + diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml index a756ae7840..65535c0759 100644 --- a/org.adempiere.report.jasper-feature/feature.xml +++ b/org.adempiere.report.jasper-feature/feature.xml @@ -27,7 +27,7 @@ id="org.adempiere.report.jasper.library" download-size="0" install-size="0" - version="0.0.0" + version="7.1.0.qualifier" fragment="true"/> - - - + tofile="jettyhome/etc/jetty-ssl.xml" filtering="yes" overwrite="yes"/> + tofile="jettyhome/etc/jetty-ssl-context.xml" filtering="yes" overwrite="yes"/> + tofile="jettyhome/etc/jetty-http.xml" filtering="yes" overwrite="yes"/> + tofile="hazelcast.xml" filtering="yes" overwrite="yes"/> diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index f2ce1c22c8..7ab35a27e6 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -397,49 +397,6 @@ version="0.0.0" unpack="false"/> - - - - - - - - - - - - + + + + diff --git a/org.adempiere.server-feature/idempiere-server.bat b/org.adempiere.server-feature/idempiere-server.bat index e9a4c872c2..2df9fc739d 100644 --- a/org.adempiere.server-feature/idempiere-server.bat +++ b/org.adempiere.server-feature/idempiere-server.bat @@ -24,7 +24,7 @@ FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c @Set VMOPTS=%VMOPTS% -Dosgi.compatibility.bootdelegation=true @Set VMOPTS=%VMOPTS% -Djetty.home=jettyhome @Set VMOPTS=%VMOPTS% -Djetty.base=jettyhome -@Set VMOPTS=%VMOPTS% -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml +@Set VMOPTS=%VMOPTS% -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml @Set VMOPTS=%VMOPTS% -Dosgi.console=localhost:12612 @Set VMOPTS=%VMOPTS% -Dmail.mime.encodefilename=true @Set VMOPTS=%VMOPTS% -Dmail.mime.decodefilename=true diff --git a/org.adempiere.server-feature/idempiere-server.sh b/org.adempiere.server-feature/idempiere-server.sh index e86143afe2..e1134d10e6 100644 --- a/org.adempiere.server-feature/idempiere-server.sh +++ b/org.adempiere.server-feature/idempiere-server.sh @@ -25,11 +25,11 @@ echo =================================== TELNET_PORT=${TELNET_PORT:-12612} -VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events +VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=$BASE/jettyhome -Djetty.base=$BASE/jettyhome --Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml +-Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dosgi.console=localhost:$TELNET_PORT -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-alpn.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-alpn.xml deleted file mode 100644 index 60f53d1d72..0000000000 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-alpn.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - alpn - - - - - - - - - - - - - - - - - - - diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml index 158fb45190..f529dbead9 100644 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml +++ b/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml @@ -1,13 +1,6 @@ - - + - - - - - - - + @@ -35,8 +28,40 @@ --> - + + - \ No newline at end of file + diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-http-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-http-template.xml index 476b0f0b86..7f624eb3f8 100644 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-http-template.xml +++ b/org.adempiere.server-feature/jettyhome/etc/jetty-http-template.xml @@ -1,15 +1,10 @@ - - + - - - - - + - + @@ -29,23 +24,25 @@ - - - - - + - + - - + + + + + + + + - \ No newline at end of file + diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml deleted file mode 100644 index 1ce8c2ff3a..0000000000 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - true - - - - - - http/1.1 - - - - - - - - - - - diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml index 43b93ca1f5..99abd18df5 100644 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml +++ b/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml @@ -1,11 +1,6 @@ - - + - - - - - + @@ -16,12 +11,14 @@ - + + - \ No newline at end of file + + diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-plus.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-plus.xml deleted file mode 100644 index 8fb78af58f..0000000000 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-plus.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - org.eclipse.jetty.webapp.FragmentConfiguration - - - org.eclipse.jetty.plus.webapp.EnvConfiguration - org.eclipse.jetty.plus.webapp.PlusConfiguration - - - - - - diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-selector-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-selector-template.xml deleted file mode 100644 index 85e7502cf0..0000000000 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-selector-template.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - 300000 - - - - - diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-context-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-context-template.xml index b75bd45e01..6a2641571a 100644 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-context-template.xml +++ b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-context-template.xml @@ -1,11 +1,14 @@ - - + + + + + - - - - + / @@ -15,12 +18,26 @@ - + + + + + + + FALSE + .*NULL.* + .*RC4.* + .*MD5.* + .*DES.* + .*DSS.* + .*_RSA_.*SHA1$ + .*_RSA_.*SHA$ + .*_RSA_.*MD5$ TLS_NULL_WITH_NULL_NULL TLS_RSA_WITH_NULL_MD5 TLS_RSA_WITH_NULL_SHA @@ -299,13 +316,33 @@ TLS_PSK_WITH_AES_256_CCM_8 - - - SSL - SSLv2 - SSLv2Hello - SSLv3 - - - + + + SSL + SSLv2 + SSLv2Hello + SSLv3 + + + + diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml index dba32bb44d..43eb83709e 100644 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml +++ b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml @@ -1,15 +1,10 @@ - - + - - - - - + - + @@ -26,12 +21,18 @@ - + - - + + + + + + + + @@ -47,10 +48,13 @@ - + + + + - \ No newline at end of file + diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml index 2f4e8bf4e4..8e18c2337a 100644 --- a/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml +++ b/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml @@ -1,9 +1,8 @@ - - + - + @@ -24,40 +23,22 @@ + - - - - - - - - - - - - - - - - - - - - - - - false - + + + - + + + + + @@ -85,15 +66,15 @@ - + - - + + + + + + @@ -126,11 +107,20 @@ - 5000 + - + + + org.eclipse.jetty.server.Request.maxFormContentSize + 1048576 + + + + false + + org.eclipse.jetty.webapp.configuration @@ -146,7 +136,8 @@ - + + java.naming.factory.initial @@ -155,9 +146,4 @@ java.naming.factory.url.pkgs - - org.eclipse.jetty.server.Request.maxFormContentSize - 1048576 - - false diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-threadpool.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-threadpool.xml new file mode 100644 index 0000000000..6f69faa1c7 --- /dev/null +++ b/org.adempiere.server-feature/jettyhome/etc/jetty-threadpool.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index c67228b90b..6871236204 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -9,7 +9,7 @@ -console - --add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml + --add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -49,13 +49,8 @@ - - - - - @@ -65,15 +60,15 @@ - - + - - - - + + + + + diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index b709cdd260..062a013d4c 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -23,101 +23,75 @@ - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - + - - + - - - + + + + - - + + + - - + - - - + + - - - - - - - - - - + + + + + @@ -135,24 +109,17 @@ - - - - - - - + + - - - + @@ -162,116 +129,47 @@ - - - - + - - - - - - - - - - - - - - - - - - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - + + + - - - - - - - - - - - + + + + @@ -280,53 +178,35 @@ + - + - + - - - + - - - - - - - - - - - - - - - - - + + + + + - - + + + + - - - - - - - - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 491773e4f7..d716c6dbf9 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -1,5 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -23,17 +49,34 @@ - + + + + + + + + + + + + + + + + + + - + @@ -45,21 +88,19 @@ - + - + - - @@ -71,14 +112,15 @@ - - - - - - - + + + + + + + + @@ -86,7 +128,6 @@ - @@ -139,7 +180,7 @@ - + @@ -204,9 +245,8 @@ - + - @@ -220,7 +260,6 @@ - @@ -244,33 +283,27 @@ - - - + - - - - - + + - - + - - - + + + - + @@ -280,10 +313,10 @@ - + - + @@ -312,21 +345,22 @@ - - - + + + + + - - + @@ -337,7 +371,7 @@ - + @@ -352,7 +386,7 @@ - + diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini index 98d18128e6..6cfe451761 100644 --- a/org.adempiere.server-feature/setup.ini +++ b/org.adempiere.server-feature/setup.ini @@ -1,5 +1,5 @@ -startup -plugins/org.eclipse.equinox.launcher_1.5.700.v20200207-2156.jar +plugins/org.eclipse.equinox.launcher_1.5.800.v20200727-1323.jar -install setup --launcher.XXMaxPermSize diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index f2aec7cf11..92add516cf 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.15.200.v20200214-1600.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.16.0.v20200828-0759.jar osgi.install.area=setup osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.eclipse.core.variables,\ @@ -45,7 +45,7 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.apache.activemq.kahadb,\ javax.transaction,\ org.eclipse.jetty.osgi-servlet-api,\ - javax.annotation-api,\ + jakarta.annotation-api,\ slf4j.api,\ slf4j.jcl,\ org.apache.commons.codec,\ diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere index d86282e1f2..5d0b9beaf2 100755 --- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere +++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere @@ -244,7 +244,7 @@ configure_perform() ! echo "Done" fi - grep "${ADEMPIERE_WEB_PORT}" ${IDEMPIERE_HOME}/jettyhome/etc/jetty-selector.xml > /dev/null 2>&1 + grep "${ADEMPIERE_WEB_PORT}" ${IDEMPIERE_HOME}/jettyhome/etc/jetty-http.xml > /dev/null 2>&1 if [ $? -ne 0 ] then echo "Error deploying iDempiere, please verify and try again" diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath index 68b6058e5e..587ecd86ce 100644 --- a/org.compiere.db.oracle.provider/.classpath +++ b/org.compiere.db.oracle.provider/.classpath @@ -6,10 +6,10 @@ - + - + diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index a8a37e462d..6af98d889b 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-ClassPath: ., lib/c3p0-oracle-thin-extras.jar, lib/c3p0.jar, lib/mchange-commons-java.jar, - lib/ojdbc7.jar + lib/ojdbc10.jar Import-Package: org.osgi.framework, org.slf4j;version="1.7.2" Bundle-ActivationPolicy: lazy diff --git a/org.compiere.db.oracle.provider/build.properties b/org.compiere.db.oracle.provider/build.properties index 759fea4f72..ecd798beaa 100644 --- a/org.compiere.db.oracle.provider/build.properties +++ b/org.compiere.db.oracle.provider/build.properties @@ -7,5 +7,5 @@ bin.includes = META-INF/,\ lib/c3p0-oracle-thin-extras.jar,\ lib/c3p0.jar,\ lib/mchange-commons-java.jar,\ - lib/ojdbc7.jar + lib/ojdbc10.jar source.. = src/ diff --git a/org.compiere.db.oracle.provider/pom.xml b/org.compiere.db.oracle.provider/pom.xml index 7edbf04d3d..102ce03824 100644 --- a/org.compiere.db.oracle.provider/pom.xml +++ b/org.compiere.db.oracle.provider/pom.xml @@ -26,18 +26,23 @@ com.mchange c3p0 - 0.9.5.2 + 0.9.5.5 com.mchange mchange-commons-java - 0.2.15 + 0.2.20 com.google.code.maven-play-plugin.com.mchange c3p0-oracle-thin-extras 0.9.5 + + com.oracle.database.jdbc + ojdbc10 + 19.8.0.0 + lib true @@ -47,25 +52,6 @@ - - com.googlecode.maven-download-plugin - download-maven-plugin - - - validate - - wget - - - - ${url.file.srv}/extra.jar/ojdbc7.jar - false - lib - 5 - - - - \ No newline at end of file diff --git a/org.compiere.db.postgresql.provider/pom.xml b/org.compiere.db.postgresql.provider/pom.xml index 9636ca3f18..4dbc1cec06 100644 --- a/org.compiere.db.postgresql.provider/pom.xml +++ b/org.compiere.db.postgresql.provider/pom.xml @@ -26,17 +26,17 @@ com.mchange c3p0 - 0.9.5.2 + 0.9.5.5 com.mchange mchange-commons-java - 0.2.15 + 0.2.20 org.postgresql postgresql - 42.2.5 + 42.2.18 lib diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml index 574f804799..582a3344f2 100644 --- a/org.idempiere.eclipse.platform-feature/feature.xml +++ b/org.idempiere.eclipse.platform-feature/feature.xml @@ -17,96 +17,15 @@ [Enter License Description here.] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini index 5d11748e46..06f173c5d0 100644 --- a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini +++ b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.15.200.v20200214-1600.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.16.0.v20200828-0759.jar osgi.install.area=director equinox.use.ds=true osgi.bundles=org.eclipse.core.net@start,\ diff --git a/org.idempiere.equinox.p2.director-feature/update.bat b/org.idempiere.equinox.p2.director-feature/update.bat index afac66ff7c..974d4a3396 100644 --- a/org.idempiere.equinox.p2.director-feature/update.bat +++ b/org.idempiere.equinox.p2.director-feature/update.bat @@ -18,11 +18,6 @@ if exist jettyhome\etc\jetty-ssl.xml ( copy jettyhome\etc\jetty-ssl.xml jetty-ssl.xml.sav ) -if exist jetty-selector.xml.sav del /q jetty-selector.xml.sav -if exist jettyhome\etc\jetty-selector.xml ( - copy jettyhome\etc\jetty-selector.xml jetty-selector.xml.sav -) - @call %DESTINATION%\update-prd %1% "org.adempiere.server.product" copy idempiere.ini.sav idempiere.ini @@ -36,8 +31,3 @@ if exist jetty-ssl.xml.sav ( copy jetty-ssl.xml.sav jettyhome\etc\jetty-ssl.xml del /q jetty-ssl.xml.sav ) - -if exist jetty-selector.xml.sav ( - copy jetty-selector.xml.sav jettyhome\etc\jetty-selector.xml - del /q jetty-selector.xml.sav -) diff --git a/org.idempiere.equinox.p2.director-feature/update.sh b/org.idempiere.equinox.p2.director-feature/update.sh index f1cc94b6b8..010af5ed54 100644 --- a/org.idempiere.equinox.p2.director-feature/update.sh +++ b/org.idempiere.equinox.p2.director-feature/update.sh @@ -24,15 +24,6 @@ then cp jettyhome/etc/jetty-ssl.xml jetty-ssl.xml.sav fi -if [ -f jetty-selector.xml.sav ]; -then - rm -f jetty-selector.xml.sav -fi -if [ -f jettyhome/etc/jetty-selector.xml ] -then - cp jettyhome/etc/jetty-selector.xml jetty-selector.xml.sav -fi - "$DESTINATION"/update-prd.sh "$1" org.adempiere.server.product cp idempiere.ini.sav idempiere.ini @@ -48,9 +39,3 @@ then cp jetty-ssl.xml.sav jettyhome/etc/jetty-ssl.xml rm -f jetty-ssl.xml.sav fi - -if [ -f jetty-selector.xml.sav ] -then - cp jetty-selector.xml.sav jettyhome/etc/jetty-selector.xml - rm -f jetty-selector.xml.sav -fi diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml index 88b56c0ecb..0820c0c996 100644 --- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml @@ -10,12 +10,12 @@ org.idempiere.maven.to.p2 pom - 9.4.28.v20200408 - 8.5.49 + 9.4.33.v20201020 + 8.5.54 3.1.0.M3 1.2.5 2.5.3 - 1.60 + 1.66 2.10.0 4.2 1.1.0.Final @@ -23,21 +23,21 @@ 20180813 1.7.25 2.3.2 - 2.4 3.3.1 3.1.18 - 1.2.1 - 1.3.3 - 7.3.1 - 1.6.3 - 4.1.0 + 1.2.2 + 1.3.5 + 9.0 + 1.6.5 + 4.1.2 1.11 + 1.7.0 - jasperstudio-6.11.0 - https://sourceforge.net/projects/jasperstudio/files/updatesite/6.11.0 + jasperstudio-6.15.0 + https://sourceforge.net/projects/jasperstudio/files/updatesite/6.15.0 p2 @@ -98,14 +98,13 @@ false - org.passay:passay:jar:1.3.1 + org.passay:passay:jar:1.6.0 true false org.mortbay.jasper:apache-jsp:jar:${jetty.jsp.version} - - false + true false @@ -174,7 +173,7 @@ false - org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.2.4 + org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.3.2 true false @@ -224,7 +223,7 @@ false - com.itextpdf:itextpdf:jar:5.5.13 + com.itextpdf:itextpdf:jar:5.5.13.2 true false @@ -264,7 +263,7 @@ false - org.cryptacular:cryptacular:jar:1.2.2 + org.cryptacular:cryptacular:jar:1.2.4 true false @@ -274,7 +273,8 @@ false - org.atmosphere:atmosphere-runtime:jar:2.5.0 + + org.atmosphere:atmosphere-runtime:jar:2.6.4 true false @@ -374,12 +374,12 @@ false - com.ibm.icu:icu4j:jar:63.1 + com.ibm.icu:icu4j:jar:67.1 true false - joda-time:joda-time:jar:2.10 + joda-time:joda-time:jar:2.10.8 true false @@ -593,7 +593,7 @@ false - jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.5 + jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.6 true false @@ -605,21 +605,21 @@ - jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3 + jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.4 true false - jakarta.persistence:jakarta.persistence-api:jar:2.2.2 + jakarta.persistence:jakarta.persistence-api:jar:2.2.3 true false - + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-beans:jar:${springframework.version} false @@ -788,6 +788,23 @@ true false + + + org.glassfish.hk2:osgi-resource-locator:1.0.3 + true + false + + + + org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.1 + true + false + @@ -812,17 +829,17 @@ false - com.google.zxing:core:jar:3.2.1 + com.google.zxing:core:jar:3.4.0 true false - org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxen:jar:1.1.1_2 + org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxen:jar:1.1.6_1 true false - org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino:jar:1.7.6_1 + org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino:jar:1.7.11_1 true false @@ -830,7 +847,7 @@ org.apache.poi:poi:jar:${poi.version} true false - true + true org.apache.poi.poi poi-ooxml @@ -842,7 +859,7 @@ org.apache.poi:poi-ooxml:jar:${poi.version} true false - true + true org.apache.poi.poi-ooxml poi-ooxml @@ -854,7 +871,7 @@ org.apache.poi:poi-ooxml-schemas:jar:${poi.version} true false - true + true org.apache.poi.poi-ooxml-schemas poi-ooxml-schemas @@ -942,6 +959,12 @@ true false + + + org.w3c.dom:org.w3c.dom.smil:1.0.0.v200806040011 + true + false + @@ -1312,7 +1335,7 @@ com.jaspersoft.studio.bundles.barbecue:1.5.0.beta1_b02 - com.jaspersoft.studio.bundles.itext:2.1.7.js7_b01 + com.jaspersoft.studio.bundles.itext:2.1.7.js8_b01 org.w3c.dom.svg.patch:1.1.0.b02 @@ -1350,14 +1373,31 @@ true + + + download-atmosphere-bundle + package + + wget + + + ${url.file.srv}/extra.jar/atmosphere/atmosphere-runtime-2.6.4.jar + false + org.atmosphere.runtime_2.6.4.jar + ${project.build.directory}/repository/plugins + 5 + true + true + + + com.coderplus.maven.plugins copy-rename-maven-plugin - move-file package diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 78d21193e8..4bf4035c1d 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,844 +1,382 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd new file mode 100644 index 0000000000..283dd9afb1 --- /dev/null +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd @@ -0,0 +1,389 @@ + +target "idempiere-201030" + +with source configurePhase allEnvironments + +location "https://idempiere.github.io/binary.file/p2.maven/org.idempiere.webservice.client-p2-R20190412" { + com.sun.istack.commons-runtime + com.sun.org.apache.xml.internal.resolver + com.sun.xml.bind.external.rngom + com.sun.xml.bind.jaxb-jxc + com.sun.xml.bind.jaxb-osgi + com.sun.xml.bind.jaxb-xjc + com.sun.xml.fastinfoset.FastInfoset + com.sun.xml.messaging.saaj.impl + com.sun.xml.stream.buffer.streambuffer + com.sun.xml.ws.policy + jakarta.xml.soap-api + jakarta.xml.ws-api + org.glassfish.external.management-api + org.glassfish.gmbal.gmbal + org.glassfish.ha.ha-api + org.glassfish.jaxb.txw2 + org.glassfish.pfl.pfl-asm + org.glassfish.pfl.pfl-basic + org.glassfish.pfl.pfl-dynamic + org.glassfish.pfl.pfl-tf + org.jvnet.mimepull + org.jvnet.staxex.stax-ex +} + +location "https://idempiere.github.io/binary.file/p2.zk/9.5.0.1" { + zcommon + zel + zhtml + zjavassist + zk + zkbind + zkplus + zkplus-legacy + zkwebfragment + zul + zweb + zweb-dsp +} + +location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201029" { + bcmail + bcpkix + bcprov + bctsp + com.diffplug.osgi.extension.sun.misc + com.fasterxml.jackson.core.jackson-annotations + com.fasterxml.jackson.core.jackson-core + com.fasterxml.jackson.core.jackson-databind + com.fasterxml.jackson.dataformat.jackson-dataformat-xml + com.fasterxml.jackson.datatype.jackson-datatype-guava + com.fasterxml.jackson.datatype.jackson-datatype-joda + com.fasterxml.jackson.datatype.jackson-datatype-json-org + com.fasterxml.jackson.jaxrs.jackson-jaxrs-base + com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider + com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider + com.fasterxml.jackson.module.jackson-module-jaxb-annotations + com.fasterxml.jackson.module.jackson-module-jsonSchema + com.fasterxml.woodstox.woodstox-core + com.github.relaxng.Datatype + com.google.zxing.core + com.ibm.icu + com.itextpdf + com.jaspersoft.studio.bundles.barbecue + com.jaspersoft.studio.bundles.itext + com.sun.activation.jakarta.activation + com.sun.mail.gimap + com.sun.mail.imap + com.sun.mail.jakarta.mail + com.sun.mail.smtp + com.sun.xml.bind.jaxb-impl + com.sun.xml.ws.jaxws-rt + groovy + groovy-ant + groovy-cli-commons + groovy-cli-picocli + groovy-console + groovy-datetime + groovy-docgenerator + groovy-groovydoc + groovy-groovysh + groovy-jmx + groovy-json + groovy-jsr223 + groovy-macro + groovy-nio + groovy-servlet + groovy-sql + groovy-swing + groovy-xml + jakarta.annotation-api + jakarta.jws-api + jakarta.mail.api + jakarta.persistence-api + jakarta.ws.rs-api + jakarta.xml.bind-api + javax.enterprise.cdi-api + javax.interceptor-api + javax.transaction-api + javax.validation.api + javax.websocket-api + javax.xml.rpc-api + joda-time + json + net.sf.jasperreports.engine + net.sf.supercsv.super-csv + org.apache.activemq.activemq-core + org.apache.activemq.kahadb + org.apache.aries.spifly.dynamic.bundle + org.apache.aries.util + org.apache.commons.commons-collections4 + org.apache.commons.commons-configuration2 + org.apache.commons.digester + org.apache.commons.discovery + org.apache.commons.javaflow + org.apache.cxf.cxf-core + org.apache.cxf.cxf-rt-bindings-object + org.apache.cxf.cxf-rt-bindings-soap + org.apache.cxf.cxf-rt-bindings-xml + org.apache.cxf.cxf-rt-databinding-jaxb + org.apache.cxf.cxf-rt-databinding-xmlbeans + org.apache.cxf.cxf-rt-frontend-jaxrs + org.apache.cxf.cxf-rt-frontend-jaxws + org.apache.cxf.cxf-rt-frontend-simple + org.apache.cxf.cxf-rt-management + org.apache.cxf.cxf-rt-rs-extension-providers + org.apache.cxf.cxf-rt-rs-http-sci + org.apache.cxf.cxf-rt-rs-service-description + org.apache.cxf.cxf-rt-security + org.apache.cxf.cxf-rt-transports-http + org.apache.cxf.cxf-rt-transports-http-jetty + org.apache.cxf.cxf-rt-ws-addr + org.apache.cxf.cxf-rt-ws-policy + org.apache.cxf.cxf-rt-wsdl + org.apache.cxf.cxf-spring-boot-autoconfigure + org.apache.cxf.rt-ws-transfer + org.apache.felix.inventory + org.apache.felix.webconsole + org.apache.felix.webconsole.plugins.ds + org.apache.felix.webconsole.plugins.memoryusage + org.apache.felix.webconsole.plugins.packageadmin + org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec + org.apache.neethi + org.apache.poi.poi + org.apache.poi.poi-ooxml + org.apache.poi.poi-ooxml-schemas + org.apache.servicemix.bundles.cglib + org.apache.servicemix.bundles.jaxen + org.apache.servicemix.bundles.rhino + org.apache.servicemix.bundles.spring-aop + org.apache.servicemix.bundles.spring-aop.source.sources + org.apache.servicemix.bundles.spring-beans + org.apache.servicemix.bundles.spring-beans.source.sources + org.apache.servicemix.bundles.spring-context + org.apache.servicemix.bundles.spring-context-support + org.apache.servicemix.bundles.spring-context-support.source.sources + org.apache.servicemix.bundles.spring-context.source.sources + org.apache.servicemix.bundles.spring-core + org.apache.servicemix.bundles.spring-core.source.sources + org.apache.servicemix.bundles.spring-expression + org.apache.servicemix.bundles.spring-expression.source.sources + org.apache.servicemix.bundles.spring-web + org.apache.servicemix.bundles.spring-web.source.sources + org.apache.servicemix.bundles.wsdl4j + org.apache.servicemix.bundles.xerces + org.apache.taglibs.standard-impl + org.apache.taglibs.standard-jstlel + org.apache.taglibs.taglibs-standard-spec + org.apache.velocity + org.apache.ws.xmlschema.core + org.apache.xmlbeans + org.apache.xmlgraphics.batik-anim + org.apache.xmlgraphics.batik-awt-util + org.apache.xmlgraphics.batik-bridge + org.apache.xmlgraphics.batik-codec + org.apache.xmlgraphics.batik-constants + org.apache.xmlgraphics.batik-css + org.apache.xmlgraphics.batik-dom + org.apache.xmlgraphics.batik-ext + org.apache.xmlgraphics.batik-extension + org.apache.xmlgraphics.batik-gvt + org.apache.xmlgraphics.batik-i18n + org.apache.xmlgraphics.batik-parser + org.apache.xmlgraphics.batik-script + org.apache.xmlgraphics.batik-svg-dom + org.apache.xmlgraphics.batik-svggen + org.apache.xmlgraphics.batik-util + org.apache.xmlgraphics.batik-xml + org.atmosphere.runtime + org.cryptacular + org.eclipse.jetty.alpn.api + org.eclipse.jetty.alpn.client + org.eclipse.jetty.alpn.openjdk8.server + org.eclipse.jetty.alpn.server + org.eclipse.jetty.annotations + org.eclipse.jetty.apache-jsp + org.eclipse.jetty.client + org.eclipse.jetty.continuation + org.eclipse.jetty.deploy + org.eclipse.jetty.http + org.eclipse.jetty.http2.client + org.eclipse.jetty.http2.client.http + org.eclipse.jetty.http2.common + org.eclipse.jetty.http2.hpack + org.eclipse.jetty.http2.server + org.eclipse.jetty.io + org.eclipse.jetty.jaas + org.eclipse.jetty.jmx + org.eclipse.jetty.jndi + org.eclipse.jetty.osgi-servlet-api + org.eclipse.jetty.osgi.alpn.fragment + org.eclipse.jetty.osgi.boot + org.eclipse.jetty.osgi.boot.jsp + org.eclipse.jetty.osgi.boot.warurl + org.eclipse.jetty.osgi.httpservice + org.eclipse.jetty.plus + org.eclipse.jetty.proxy + org.eclipse.jetty.rewrite + org.eclipse.jetty.security + org.eclipse.jetty.security.jaspi + org.eclipse.jetty.server + org.eclipse.jetty.servlet + org.eclipse.jetty.servlets + org.eclipse.jetty.util + org.eclipse.jetty.util.ajax + org.eclipse.jetty.webapp + org.eclipse.jetty.websocket.api + org.eclipse.jetty.websocket.client + org.eclipse.jetty.websocket.common + org.eclipse.jetty.websocket.javax.websocket + org.eclipse.jetty.websocket.javax.websocket.server + org.eclipse.jetty.websocket.server + org.eclipse.jetty.websocket.servlet + org.eclipse.jetty.xml + org.glassfish.hk2.osgi-resource-locator + org.glassfish.jersey.bundles.repackaged.jersey-guava + org.jfree.chart + org.jfree.jcommon + org.krysalis.barcode4j + org.mortbay.jasper.apache-el + org.mortbay.jasper.apache-jsp + org.objectweb.asm + org.objectweb.asm.commons + org.objectweb.asm.tree + org.objectweb.asm.tree.analysis + org.objectweb.asm.util + org.passay + org.springframework.spring-jcl + org.w3c.dom.smil + org.w3c.dom.svg.patch + org.zkoss.zsoup + slf4j.api + slf4j.jcl + slf4j.jdk14 + stax2-api +} + +location "https://download.eclipse.org/eclipse/updates/4.17" { + // ### Equinox https://download.eclipse.org/equinox/drops/R-4.17-202009021800/index.php + // equinox core framework + org.eclipse.osgi + //<< equinox framework starter kit + org.apache.commons.codec + org.apache.commons.logging + org.apache.felix.gogo.command + org.apache.felix.gogo.runtime + org.apache.felix.gogo.shell + org.apache.felix.scr + org.apache.httpcomponents.httpclient + org.apache.httpcomponents.httpcore + org.eclipse.core.jobs + org.eclipse.ecf + org.eclipse.ecf.filetransfer + org.eclipse.ecf.identity + org.eclipse.ecf.provider.filetransfer + org.eclipse.ecf.provider.filetransfer.httpclient45 + org.eclipse.ecf.provider.filetransfer.ssl + org.eclipse.ecf.ssl + org.eclipse.equinox.app + org.eclipse.equinox.common + org.eclipse.equinox.concurrent + org.eclipse.equinox.console + org.eclipse.equinox.ds + 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 + org.eclipse.equinox.p2.director + org.eclipse.equinox.p2.engine + org.eclipse.equinox.p2.garbagecollector + org.eclipse.equinox.p2.jarprocessor + org.eclipse.equinox.p2.metadata + org.eclipse.equinox.p2.metadata.repository + org.eclipse.equinox.p2.operations + org.eclipse.equinox.p2.repository + org.eclipse.equinox.p2.touchpoint.eclipse + org.eclipse.equinox.p2.touchpoint.natives + org.eclipse.equinox.p2.transport.ecf + 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 + org.eclipse.osgi.util + org.sat4j.core + org.sat4j.pb + org.tukaani.xz + //<< equinox add-on + // feature for launcher all environment + org.eclipse.equinox.executable.feature.group + org.eclipse.equinox.http.registry + org.eclipse.osgi.compatibility.state + org.eclipse.core.runtime + org.eclipse.equinox.http.servlet + org.eclipse.equinox.servletbridge + org.eclipse.equinox.p2.director.app + org.eclipse.equinox.cm + org.eclipse.equinox.event + org.eclipse.equinox.http.servletbridge + org.eclipse.equinox.metatype + org.eclipse.ant.core + org.eclipse.core.commands + org.eclipse.core.contenttype + org.eclipse.core.expressions + org.eclipse.core.filesystem + org.eclipse.core.net + org.eclipse.core.resources + org.eclipse.core.variables + org.eclipse.jdt.core + org.eclipse.text + + //<< for test + org.junit.jupiter.api + org.junit.jupiter.params + org.junit.jupiter.engine + org.opentest4j + org.junit.platform.engine + org.junit.platform.commons + org.apiguardian + //>> +} + +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository" { + com.google.gson + com.google.guava + javax.inject + javax.jms + org.antlr.runtime + org.aopalliance + org.apache.ant + org.apache.commons.beanutils + org.apache.commons.collections + org.apache.commons.compress + org.apache.commons.fileupload + org.apache.commons.io + org.apache.commons.lang3 + org.apache.commons.lang + org.apache.commons.net + org.apache.lucene.analyzers-common + org.apache.lucene.core + org.apache.xalan + org.apache.xml.resolver + org.apache.xml.serializer + org.apache.xmlgraphics + org.dom4j + org.glassfish.hk2.api + org.glassfish.hk2.locator + org.glassfish.hk2.utils + org.glassfish.jersey.containers.servlet.core + org.glassfish.jersey.core.jersey-client + org.glassfish.jersey.core.jersey-common + org.glassfish.jersey.core.jersey-server + org.glassfish.jersey.ext.entityfiltering + org.glassfish.jersey.media.jersey-media-json-jackson + org.hamcrest.core + org.junit + org.w3c.css.sac + org.w3c.dom.svg +} \ No newline at end of file diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml index cdbe958159..530f1e1f35 100644 --- a/org.idempiere.p2/category.xml +++ b/org.idempiere.p2/category.xml @@ -45,34 +45,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product index c67228b90b..6f183a3e00 100644 --- a/org.idempiere.p2/server.product +++ b/org.idempiere.p2/server.product @@ -9,7 +9,7 @@ -console - --add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml + --add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -49,13 +49,8 @@ - - - - - diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 8e4b114fd1..3e5cf78ab9 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -14,7 +14,7 @@ 2.0.0 ${tycho.version} UTF-8 - 6.11.0 + 6.15.0 9.5.0.1 3.23.1-GA 3.1.1 @@ -27,10 +27,10 @@ 2.5 org.idempiere.p2.targetplatform - https://download.eclipse.org/eclipse/updates/4.15 - eclipse-2020-03 - https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository - orbit-2020-03-R20200224183213 + https://download.eclipse.org/eclipse/updates/4.17 + eclipse-2020-09 + https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository + orbit-2020-09-R20200831200620 https://raw.githubusercontent.com/idempiere/binary.file/master org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group org.adempiere.server.product @@ -579,6 +579,10 @@ ${idempiere-orbit-url} p2 + + wso2 + https://dist.wso2.org/maven2 + diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch index d40adca3d2..77a72edbd9 100644 --- a/org.idempiere.test/idempiere.unit.test.launch +++ b/org.idempiere.test/idempiere.unit.test.launch @@ -133,7 +133,7 @@ - + @@ -389,9 +389,6 @@ - - - @@ -400,18 +397,12 @@ - - - - - - @@ -520,7 +511,6 @@ - diff --git a/org.idempiere.webservices-feature/feature.xml b/org.idempiere.webservices-feature/feature.xml index a72c3f92c3..2eaeaf1629 100644 --- a/org.idempiere.webservices-feature/feature.xml +++ b/org.idempiere.webservices-feature/feature.xml @@ -17,60 +17,6 @@ [Enter License Description here.] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -