From 9c7713fa8d49099a4f54b2d2e9fea6939f7b5111 Mon Sep 17 00:00:00 2001 From: hengsin Date: Wed, 21 Jun 2023 19:44:18 +0800 Subject: [PATCH] IDEMPIERE-5448 2023 June Platform Update (#1531) * IDEMPIERE-5448 Can't launch unit test with Eclipse 2022-09 - upgrade to tycho 3.1.0-SNAPSHOT - set maven compiler source and target level to 11 - upgrade to junit 5.9.1 * IDEMPIERE-5448 Can't launch unit test with Eclipse 2022-09 - Change tycho version to 3.0.3 * IDEMPIERE-5448 2023 June Platform Update * IDEMPIERE-5448 2023 June Platform Update - Explicitly set target, source and release level to JavaSE 11 * IDEMPIERE-5448 2023 June Platform Update - Use 3.0.5-SNAPSHOT to fix stack overflow error. * IDEMPIERE-5448 2023 June Platform Update - Change source, target and release level to JDK 17 - Update target platform name to idempiere-230620 * IDEMPIERE-5448 2023 June Platform Update - Fix LogFactory ClassNotFound exception with Eclipse 2023-06 --- .../model.generator.launch | 28 +- .../packinfolder.app.launch | 27 +- .../sign.database.build.launch | 29 +- .../synchronize-terminology.app.launch | 30 +- .../translation.app.launch | 29 +- org.adempiere.base.callout/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- org.adempiere.base.callout/build.properties | 1 + org.adempiere.base.process/.classpath | 2 +- org.adempiere.base.process/.project | 4 +- .../META-INF/MANIFEST.MF | 4 +- org.adempiere.base.process/build.properties | 1 + org.adempiere.base/.classpath | 2 +- org.adempiere.base/META-INF/MANIFEST.MF | 4 +- org.adempiere.base/build.properties | 1 + .../src/org/compiere/tools/FileUtil.java | 12 - .../src/org/compiere/util/CLogFormatter.java | 4 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 1 + .../equinox/http/servlet/ProxyServlet.java | 7 +- .../equinox/http/servlet/ResourceServlet.java | 164 +- .../http/servlet/ServletContextAdaptor.java | 16 +- org.adempiere.install/.classpath | 2 +- org.adempiere.install/META-INF/MANIFEST.MF | 4 +- org.adempiere.install/build.properties | 1 + org.adempiere.install/install.app.launch | 30 +- .../install.console.app.launch | 30 +- .../install.silent.app.launch | 28 +- org.adempiere.payment.processor/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 3 +- org.adempiere.pipo.handlers/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- org.adempiere.pipo.handlers/build.properties | 1 + org.adempiere.pipo/.classpath | 2 +- org.adempiere.pipo/META-INF/MANIFEST.MF | 4 +- org.adempiere.pipo/build.properties | 1 + org.adempiere.plugin.utils/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- org.adempiere.plugin.utils/build.properties | 1 + org.adempiere.replication.server/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 1 + org.adempiere.replication/.classpath | 2 +- org.adempiere.replication/.project | 4 +- .../META-INF/MANIFEST.MF | 4 +- org.adempiere.replication/build.properties | 1 + .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- org.adempiere.report.jasper/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- org.adempiere.report.jasper/build.properties | 1 + org.adempiere.server-feature/feature.xml | 51 +- org.adempiere.server-feature/server.product | 4 +- .../server.product.functionaltest.launch | 33 +- .../server.product.launch | 34 +- .../setup/configuration/config.ini | 27 +- org.adempiere.server/.classpath | 2 +- org.adempiere.server/META-INF/MANIFEST.MF | 4 +- org.adempiere.server/build.properties | 1 + org.adempiere.server/pom.xml | 19 +- .../compiere/server/AdempiereServerGroup.java | 3 + .../org/compiere/server/SystemInfo.java | 2 +- org.adempiere.ui.zk/.classpath | 2 +- org.adempiere.ui.zk/META-INF/MANIFEST.MF | 4 +- .../webui/LoggedSessionListener.java | 2 +- org.adempiere.ui.zk/build.properties | 1 + org.adempiere.ui/.classpath | 2 +- org.adempiere.ui/META-INF/MANIFEST.MF | 4 +- org.adempiere.ui/build.properties | 1 + org.apache.ecs/.classpath | 2 +- org.apache.ecs/META-INF/MANIFEST.MF | 4 +- org.apache.ecs/build.properties | 1 + org.compiere.db.oracle.provider/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 1 + .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 1 + .../feature.xml | 163 +- .../director/configuration/config.ini | 27 +- org.idempiere.felix.webconsole/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 1 + org.idempiere.hazelcast.service/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 1 + org.idempiere.javadoc/.classpath | 2 +- org.idempiere.javadoc/META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 1 + org.idempiere.keikai/.classpath | 2 +- org.idempiere.keikai/META-INF/MANIFEST.MF | 4 +- org.idempiere.keikai/build.properties | 1 + .../README.md | 4 +- .../feature.xml | 8232 +++++++++-------- org.idempiere.p2.targetplatform/.project | 6 - org.idempiere.p2.targetplatform/README.md | 21 + .../maven.locations.xml | 172 +- .../org.idempiere.p2.repository.target | 57 +- .../org.idempiere.p2.targetplatform.target | 363 +- .../org.idempiere.p2.targetplatform.tpd | 47 +- org.idempiere.p2/category.xml | 6 +- org.idempiere.p2/pom.xml | 21 +- org.idempiere.p2/server.product | 4 +- org.idempiere.parent/pom.xml | 29 +- org.idempiere.printformat.editor/.classpath | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 1 + org.idempiere.test-feature/feature.xml | 43 +- org.idempiere.test/.classpath | 2 +- org.idempiere.test/META-INF/MANIFEST.MF | 33 +- org.idempiere.test/build.properties | 1 + org.idempiere.test/idempiere.unit.test.launch | 60 +- .../idempiere.unit.test.parallel.launch | 60 +- org.idempiere.test/pom.xml | 2 +- org.idempiere.webservices-feature/feature.xml | 7 + org.idempiere.webservices/.classpath | 2 +- .../META-INF/MANIFEST.MF | 9 +- org.idempiere.webservices/build.properties | 1 + org.idempiere.zk.billboard.chart/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 1 + org.idempiere.zk.billboard/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.idempiere.zk.billboard/build.properties | 1 + org.idempiere.zk.extra/.classpath | 2 +- org.idempiere.zk.extra/META-INF/MANIFEST.MF | 4 +- org.idempiere.zk.extra/build.properties | 1 + utils_dev/oomph/idempiere.setup | 8 +- 132 files changed, 5685 insertions(+), 4500 deletions(-) create mode 100644 org.idempiere.p2.targetplatform/README.md diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch index 50a4da76d2..c553c1a640 100644 --- a/org.adempiere.base-feature/model.generator.launch +++ b/org.adempiere.base-feature/model.generator.launch @@ -15,12 +15,14 @@ + + @@ -33,6 +35,7 @@ + @@ -86,9 +89,32 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch index 3d4426f1fa..048a057bcc 100644 --- a/org.adempiere.base-feature/packinfolder.app.launch +++ b/org.adempiere.base-feature/packinfolder.app.launch @@ -15,12 +15,14 @@ + + @@ -105,9 +107,32 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index 3f44c64fb6..da422c1eb7 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -15,12 +15,14 @@ + + @@ -30,7 +32,7 @@ - + @@ -105,9 +107,32 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index 0ce09df240..dc685f1113 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -15,12 +15,14 @@ + + @@ -30,7 +32,7 @@ - + @@ -106,9 +108,32 @@ + + + + + + + + + + + + + + + + + + + + + + + - + @@ -124,7 +149,6 @@ - diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index e44bf93b83..0fed1ddee0 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -15,12 +15,14 @@ + + @@ -30,7 +32,7 @@ - + @@ -105,9 +107,32 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/org.adempiere.base.callout/.classpath b/org.adempiere.base.callout/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.base.callout/.classpath +++ b/org.adempiere.base.callout/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF index 87091852e0..b3920b0c5d 100644 --- a/org.adempiere.base.callout/META-INF/MANIFEST.MF +++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Callout Bundle-SymbolicName: org.adempiere.base.callout Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Eclipse-RegisterBuddy: org.adempiere.base Service-Component: OSGI-INF/*.xml diff --git a/org.adempiere.base.callout/build.properties b/org.adempiere.base.callout/build.properties index 24af2f8751..3b52a2f896 100644 --- a/org.adempiere.base.callout/build.properties +++ b/org.adempiere.base.callout/build.properties @@ -3,3 +3,4 @@ bin.includes = META-INF/,\ . output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.base.process/.classpath b/org.adempiere.base.process/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.base.process/.classpath +++ b/org.adempiere.base.process/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.base.process/.project b/org.adempiere.base.process/.project index 44a1aaaa35..2ed1e2c1ae 100644 --- a/org.adempiere.base.process/.project +++ b/org.adempiere.base.process/.project @@ -21,12 +21,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.pde.ds.core.builder - org.eclipse.pde.ds.core.builder + org.eclipse.m2e.core.maven2Builder diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF index 9decfb2c10..715721914c 100644 --- a/org.adempiere.base.process/META-INF/MANIFEST.MF +++ b/org.adempiere.base.process/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Processes Bundle-SymbolicName: org.adempiere.base.process Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Export-Package: org.adempiere.process, org.compiere.process, diff --git a/org.adempiere.base.process/build.properties b/org.adempiere.base.process/build.properties index e6f46cd8f9..bc5d01ab12 100644 --- a/org.adempiere.base.process/build.properties +++ b/org.adempiere.base.process/build.properties @@ -3,3 +3,4 @@ bin.includes = META-INF/,\ OSGI-INF/ output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath index 35fb25d01a..45217db393 100755 --- a/org.adempiere.base/.classpath +++ b/org.adempiere.base/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index efab70c5e8..8441262644 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -65,8 +65,8 @@ Export-Package: bsh, org.idempiere.model, org.idempiere.print, org.idempiere.process -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Import-Package: com.google.zxing, com.google.zxing.qrcode.decoder, com.google.zxing.qrcode.encoder, diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties index 64a18fa1a6..2b13b2c3df 100644 --- a/org.adempiere.base/build.properties +++ b/org.adempiere.base/build.properties @@ -12,3 +12,4 @@ bin.includes = plugin.xml,\ src.includes = schema/ source.. = src/ output.. = target/classes/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.base/src/org/compiere/tools/FileUtil.java b/org.adempiere.base/src/org/compiere/tools/FileUtil.java index 06813b56e3..280cae1da7 100644 --- a/org.adempiere.base/src/org/compiere/tools/FileUtil.java +++ b/org.adempiere.base/src/org/compiere/tools/FileUtil.java @@ -488,20 +488,8 @@ public class FileUtil String fileName = prefix + suffix; - SecurityManager sm = System.getSecurityManager(); File f = new File(tmpdirname, fileName); - if (sm != null) { - try { - sm.checkWrite(f.getPath()); - } catch (SecurityException se) { - // don't reveal temporary directory location - if (directory == null) - throw new SecurityException("Unable to create temporary file"); - throw se; - } - } - return f; } diff --git a/org.adempiere.base/src/org/compiere/util/CLogFormatter.java b/org.adempiere.base/src/org/compiere/util/CLogFormatter.java index 378e91ef45..e3a660412d 100644 --- a/org.adempiere.base/src/org/compiere/util/CLogFormatter.java +++ b/org.adempiere.base/src/org/compiere/util/CLogFormatter.java @@ -136,8 +136,8 @@ public class CLogFormatter extends Formatter sb.append(" ") .append(record.getLevel().getLocalizedName()); /** Thread **/ - if (record.getThreadID() != 10) - sb.append(" [").append(record.getThreadID()).append("]"); + if (record.getLongThreadID() != 10) + sb.append(" [").append(record.getLongThreadID()).append("]"); // sb.append(NL); diff --git a/org.adempiere.eclipse.equinox.http.servlet/.classpath b/org.adempiere.eclipse.equinox.http.servlet/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.eclipse.equinox.http.servlet/.classpath +++ b/org.adempiere.eclipse.equinox.http.servlet/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF index bccf862832..0dbbd8584a 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servlet Eclipse-LazyStart: true Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt: diff --git a/org.adempiere.eclipse.equinox.http.servlet/build.properties b/org.adempiere.eclipse.equinox.http.servlet/build.properties index 140c228807..100b2261bb 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/build.properties +++ b/org.adempiere.eclipse.equinox.http.servlet/build.properties @@ -4,3 +4,4 @@ bin.includes = META-INF/,\ javacErrors.. = -assertIdentifier,-enumIdentifier output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ProxyServlet.java b/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ProxyServlet.java index 0e52f9c64d..c43eb63e5d 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ProxyServlet.java +++ b/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ProxyServlet.java @@ -14,7 +14,6 @@ package org.adempiere.eclipse.equinox.http.servlet; import java.io.IOException; -import java.security.AccessController; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; @@ -187,7 +186,7 @@ public class ProxyServlet extends HttpServlet implements Filter { throw new ServletException("This servlet has already been registered."); //$NON-NLS-1$ ServletRegistration registration = new ServletRegistration(servlet, httpContext); - ServletContext wrappedServletContext = new ServletContextAdaptor(proxyContext, getServletContext(), httpContext, AccessController.getContext()); + ServletContext wrappedServletContext = new ServletContextAdaptor(proxyContext, getServletContext(), httpContext); ServletConfig servletConfig = new ServletConfigImpl(servlet, initparams, wrappedServletContext); boolean initialized = false; @@ -206,7 +205,7 @@ public class ProxyServlet extends HttpServlet implements Filter { //Effective registration of the resources as defined HttpService#registerResources() synchronized void registerResources(String alias, String name, HttpContext httpContext) throws NamespaceException { checkName(name); - Servlet resourceServlet = new ResourceServlet(name, httpContext, AccessController.getContext()); + Servlet resourceServlet = new ResourceServlet(name, httpContext); try { registerServlet(alias, resourceServlet, null, httpContext); } catch (ServletException e) { @@ -252,7 +251,7 @@ public class ProxyServlet extends HttpServlet implements Filter { int filterPriority = findFilterPriority(initparams); FilterRegistration registration = new FilterRegistration(filter, httpContext, alias, filterPriority); - ServletContext wrappedServletContext = new ServletContextAdaptor(proxyContext, getServletContext(), httpContext, AccessController.getContext()); + ServletContext wrappedServletContext = new ServletContextAdaptor(proxyContext, getServletContext(), httpContext); FilterConfig filterConfig = new FilterConfigImpl(filter, initparams, wrappedServletContext); boolean initialized = false; diff --git a/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ResourceServlet.java b/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ResourceServlet.java index eb6bc494aa..78256a6d6d 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ResourceServlet.java +++ b/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ResourceServlet.java @@ -16,7 +16,6 @@ package org.adempiere.eclipse.equinox.http.servlet; import java.io.*; import java.net.URL; import java.net.URLConnection; -import java.security.*; import javax.servlet.http.*; import org.osgi.service.http.HttpContext; @@ -29,15 +28,13 @@ public class ResourceServlet extends HttpServlet { private String internalName; HttpContext httpContext; - private AccessControlContext acc; - public ResourceServlet(String internalName, HttpContext context, AccessControlContext acc) { + public ResourceServlet(String internalName, HttpContext context) { this.internalName = internalName; if (internalName.equals("/")) { //$NON-NLS-1$ this.internalName = ""; //$NON-NLS-1$ } this.httpContext = context; - this.acc = acc; } public void service(HttpServletRequest req, final HttpServletResponse resp) throws IOException { @@ -58,93 +55,84 @@ public class ResourceServlet extends HttpServlet { } private void writeResource(final HttpServletRequest req, final HttpServletResponse resp, final String resourcePath, final URL resourceURL) throws IOException { - try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { + URLConnection connection = resourceURL.openConnection(); + long lastModified = connection.getLastModified(); + int contentLength = connection.getContentLength(); - public Object run() throws Exception { - URLConnection connection = resourceURL.openConnection(); - long lastModified = connection.getLastModified(); - int contentLength = connection.getContentLength(); + String etag = null; + if (lastModified != -1 && contentLength != -1) + etag = "W/\"" + contentLength + "-" + lastModified + "\""; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ - String etag = null; - if (lastModified != -1 && contentLength != -1) - etag = "W/\"" + contentLength + "-" + lastModified + "\""; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ - - // Check for cache revalidation. - // We should prefer ETag validation as the guarantees are stronger and all HTTP 1.1 clients should be using it - String ifNoneMatch = req.getHeader(IF_NONE_MATCH); - if (ifNoneMatch != null && etag != null && ifNoneMatch.indexOf(etag) != -1) { - resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED); - return Boolean.TRUE; - } - - long ifModifiedSince = req.getDateHeader(IF_MODIFIED_SINCE); - // for purposes of comparison we add 999 to ifModifiedSince since the fidelity - // of the IMS header generally doesn't include milli-seconds - if (ifModifiedSince > -1 && lastModified > 0 && lastModified <= (ifModifiedSince + 999)) { - resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED); - return Boolean.TRUE; - } - - // return the full contents regularly - if (contentLength != -1) - resp.setContentLength(contentLength); - - String contentType = httpContext.getMimeType(resourcePath); - if (contentType == null) - contentType = getServletConfig().getServletContext().getMimeType(resourcePath); - - if (contentType != null) - resp.setContentType(contentType); - - if (lastModified > 0) - resp.setDateHeader(LAST_MODIFIED, lastModified); - - if (etag != null) - resp.setHeader(ETAG, etag); - - if (contentLength != 0) { - // open the input stream - InputStream is = null; - try { - is = connection.getInputStream(); - // write the resource - try { - OutputStream os = resp.getOutputStream(); - int writtenContentLength = writeResourceToOutputStream(is, os); - if (contentLength == -1 || contentLength != writtenContentLength) - resp.setContentLength(writtenContentLength); - } catch (IllegalStateException e) { // can occur if the response output is already open as a Writer - Writer writer = resp.getWriter(); - writeResourceToWriter(is, writer); - // Since ContentLength is a measure of the number of bytes contained in the body - // of a message when we use a Writer we lose control of the exact byte count and - // defer the problem to the Servlet Engine's Writer implementation. - } - } catch (FileNotFoundException e) { - // FileNotFoundException may indicate the following scenarios - // - url is a directory - // - url is not accessible - sendError(resp, HttpServletResponse.SC_FORBIDDEN); - } catch (SecurityException e) { - // SecurityException may indicate the following scenarios - // - url is not accessible - sendError(resp, HttpServletResponse.SC_FORBIDDEN); - } finally { - if (is != null) - try { - is.close(); - } catch (IOException e) { - // ignore - } - } - } - return Boolean.TRUE; - } - }, acc); - } catch (PrivilegedActionException e) { - throw (IOException) e.getException(); + // Check for cache revalidation. + // We should prefer ETag validation as the guarantees are stronger and all HTTP 1.1 clients should be using it + String ifNoneMatch = req.getHeader(IF_NONE_MATCH); + if (ifNoneMatch != null && etag != null && ifNoneMatch.indexOf(etag) != -1) { + resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED); + return; } + + long ifModifiedSince = req.getDateHeader(IF_MODIFIED_SINCE); + // for purposes of comparison we add 999 to ifModifiedSince since the fidelity + // of the IMS header generally doesn't include milli-seconds + if (ifModifiedSince > -1 && lastModified > 0 && lastModified <= (ifModifiedSince + 999)) { + resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED); + return; + } + + // return the full contents regularly + if (contentLength != -1) + resp.setContentLength(contentLength); + + String contentType = httpContext.getMimeType(resourcePath); + if (contentType == null) + contentType = getServletConfig().getServletContext().getMimeType(resourcePath); + + if (contentType != null) + resp.setContentType(contentType); + + if (lastModified > 0) + resp.setDateHeader(LAST_MODIFIED, lastModified); + + if (etag != null) + resp.setHeader(ETAG, etag); + + if (contentLength != 0) { + // open the input stream + InputStream is = null; + try { + is = connection.getInputStream(); + // write the resource + try { + OutputStream os = resp.getOutputStream(); + int writtenContentLength = writeResourceToOutputStream(is, os); + if (contentLength == -1 || contentLength != writtenContentLength) + resp.setContentLength(writtenContentLength); + } catch (IllegalStateException e) { // can occur if the response output is already open as a Writer + Writer writer = resp.getWriter(); + writeResourceToWriter(is, writer); + // Since ContentLength is a measure of the number of bytes contained in the body + // of a message when we use a Writer we lose control of the exact byte count and + // defer the problem to the Servlet Engine's Writer implementation. + } + } catch (FileNotFoundException e) { + // FileNotFoundException may indicate the following scenarios + // - url is a directory + // - url is not accessible + sendError(resp, HttpServletResponse.SC_FORBIDDEN); + } catch (SecurityException e) { + // SecurityException may indicate the following scenarios + // - url is not accessible + sendError(resp, HttpServletResponse.SC_FORBIDDEN); + } finally { + if (is != null) + try { + is.close(); + } catch (IOException e) { + // ignore + } + } + } + return; } void sendError(final HttpServletResponse resp, int sc) throws IOException { diff --git a/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ServletContextAdaptor.java b/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ServletContextAdaptor.java index 12a4a08e58..99e7fa9ba9 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ServletContextAdaptor.java +++ b/org.adempiere.eclipse.equinox.http.servlet/src/org/adempiere/eclipse/equinox/http/servlet/ServletContextAdaptor.java @@ -14,7 +14,6 @@ package org.adempiere.eclipse.equinox.http.servlet; import java.io.*; import java.lang.reflect.Method; import java.net.URL; -import java.security.*; import java.util.*; import javax.servlet.*; @@ -29,13 +28,11 @@ public class ServletContextAdaptor implements ServletContext { private ServletContext servletContext; HttpContext httpContext; - private AccessControlContext acc; private ProxyContext proxyContext; - public ServletContextAdaptor(ProxyContext proxyContext, ServletContext servletContext, HttpContext httpContext, AccessControlContext acc) { + public ServletContextAdaptor(ProxyContext proxyContext, ServletContext servletContext, HttpContext httpContext) { this.servletContext = servletContext; this.httpContext = httpContext; - this.acc = acc; this.proxyContext = proxyContext; } @@ -88,16 +85,7 @@ public class ServletContextAdaptor implements ServletContext { } public URL getResource(final String name) { - try { - return (URL) AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws Exception { - return httpContext.getResource(name); - } - }, acc); - } catch (PrivilegedActionException e) { - log(e.getException().getMessage(), e.getException()); - } - return null; + return httpContext.getResource(name); } public InputStream getResourceAsStream(String name) { diff --git a/org.adempiere.install/.classpath b/org.adempiere.install/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.install/.classpath +++ b/org.adempiere.install/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF index 88438aea9d..a92c1259b7 100644 --- a/org.adempiere.install/META-INF/MANIFEST.MF +++ b/org.adempiere.install/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Export-Package: org.adempiere.install, org.compiere.install Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.eclipse.jetty.util -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Import-Package: javax.mail;version="1.5", javax.mail.internet;version="1.5", org.apache.tools.ant, diff --git a/org.adempiere.install/build.properties b/org.adempiere.install/build.properties index 38d5357384..264bd9c581 100644 --- a/org.adempiere.install/build.properties +++ b/org.adempiere.install/build.properties @@ -3,3 +3,4 @@ bin.includes = META-INF/,\ . output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 9a586fcacb..05a8e8e415 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -15,11 +15,13 @@ + - + + @@ -30,6 +32,7 @@ + @@ -88,9 +91,32 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index ee66a1d626..8ba5564f22 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -15,11 +15,13 @@ + - + + @@ -30,6 +32,7 @@ + @@ -85,9 +88,32 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/org.adempiere.install/install.silent.app.launch b/org.adempiere.install/install.silent.app.launch index f1c580935d..d8867b92ad 100644 --- a/org.adempiere.install/install.silent.app.launch +++ b/org.adempiere.install/install.silent.app.launch @@ -15,10 +15,12 @@ + + @@ -30,6 +32,7 @@ + @@ -85,9 +88,32 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/org.adempiere.payment.processor/.classpath b/org.adempiere.payment.processor/.classpath index ca9e3ba1c1..ef8cb85c43 100755 --- a/org.adempiere.payment.processor/.classpath +++ b/org.adempiere.payment.processor/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF index 4e5f4036f5..fb34774a71 100644 --- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF +++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Payment Processor Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Bundle-ClassPath: ., lib/jpayment.jar, diff --git a/org.adempiere.payment.processor/build.properties b/org.adempiere.payment.processor/build.properties index ec47ce4b40..93e96af55e 100644 --- a/org.adempiere.payment.processor/build.properties +++ b/org.adempiere.payment.processor/build.properties @@ -5,4 +5,5 @@ bin.includes = META-INF/,\ lib/payflow.jar,\ lib/Verisign.jar source.. = src/ -output.. = target/classes/ \ No newline at end of file +output.. = target/classes/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.pipo.handlers/.classpath b/org.adempiere.pipo.handlers/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.pipo.handlers/.classpath +++ b/org.adempiere.pipo.handlers/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF index 85bda1bafe..af1b2d062a 100644 --- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere 2Pack Handlers Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0", org.adempiere.base;bundle-version="0.0.0" Bundle-ClassPath: . diff --git a/org.adempiere.pipo.handlers/build.properties b/org.adempiere.pipo.handlers/build.properties index 38d5357384..264bd9c581 100644 --- a/org.adempiere.pipo.handlers/build.properties +++ b/org.adempiere.pipo.handlers/build.properties @@ -3,3 +3,4 @@ bin.includes = META-INF/,\ . output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.pipo/.classpath b/org.adempiere.pipo/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.pipo/.classpath +++ b/org.adempiere.pipo/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF index 2bbea3bc0d..483e20c9e6 100644 --- a/org.adempiere.pipo/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere 2Pack Core Bundle-SymbolicName: org.adempiere.pipo;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Import-Package: org.apache.commons.codec, org.apache.commons.codec.binary, org.apache.tools.ant, diff --git a/org.adempiere.pipo/build.properties b/org.adempiere.pipo/build.properties index 3b199ce2de..c7f6b3aef7 100644 --- a/org.adempiere.pipo/build.properties +++ b/org.adempiere.pipo/build.properties @@ -5,3 +5,4 @@ bin.includes = META-INF/,\ . output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.plugin.utils/.classpath b/org.adempiere.plugin.utils/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.plugin.utils/.classpath +++ b/org.adempiere.plugin.utils/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF index 0f117de678..f3faa96f5a 100644 --- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF +++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Plugin Utils Bundle-SymbolicName: org.adempiere.plugin.utils Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Import-Package: org.apache.xerces.dom;version="2.9.0", org.apache.xerces.dom.events;version="2.9.0", org.apache.xerces.dom3.as;version="2.9.0", diff --git a/org.adempiere.plugin.utils/build.properties b/org.adempiere.plugin.utils/build.properties index ba31debd0e..e30e4c7bb7 100644 --- a/org.adempiere.plugin.utils/build.properties +++ b/org.adempiere.plugin.utils/build.properties @@ -2,3 +2,4 @@ bin.includes = META-INF/,\ . output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.replication.server/.classpath b/org.adempiere.replication.server/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.replication.server/.classpath +++ b/org.adempiere.replication.server/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF index f5666df553..a039a23e60 100644 --- a/org.adempiere.replication.server/META-INF/MANIFEST.MF +++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Replication Server Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.adempiere.server;bundle-version="0.0.0", org.adempiere.replication;bundle-version="0.0.0", org.adempiere.base;bundle-version="0.0.0" diff --git a/org.adempiere.replication.server/build.properties b/org.adempiere.replication.server/build.properties index b46306360d..37e1937fcd 100644 --- a/org.adempiere.replication.server/build.properties +++ b/org.adempiere.replication.server/build.properties @@ -4,3 +4,4 @@ bin.includes = META-INF/,\ . output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.replication/.classpath b/org.adempiere.replication/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.replication/.classpath +++ b/org.adempiere.replication/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.replication/.project b/org.adempiere.replication/.project index 837ee77b98..64eb0a51a8 100644 --- a/org.adempiere.replication/.project +++ b/org.adempiere.replication/.project @@ -21,12 +21,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.pde.ds.core.builder - org.eclipse.pde.ds.core.builder + org.eclipse.m2e.core.maven2Builder diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF index f0a7f874d9..7d6163d055 100644 --- a/org.adempiere.replication/META-INF/MANIFEST.MF +++ b/org.adempiere.replication/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Replication Bundle-SymbolicName: org.adempiere.replication;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Export-Package: org.adempiere.process.rpl, org.adempiere.process.rpl.exp, diff --git a/org.adempiere.replication/build.properties b/org.adempiere.replication/build.properties index f6b7ba248b..9300737e19 100644 --- a/org.adempiere.replication/build.properties +++ b/org.adempiere.replication/build.properties @@ -4,3 +4,4 @@ bin.includes = META-INF/,\ OSGI-INF/ output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath index 6ca4348ac8..6951510c0d 100755 --- a/org.adempiere.report.jasper.library/.classpath +++ b/org.adempiere.report.jasper.library/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF index f0bc8b40a8..989f844219 100644 --- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: Library Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.11.0" Bundle-ClassPath: ., lib/castor-core.jar, diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath index bc57d2383d..5508535a40 100755 --- a/org.adempiere.report.jasper/.classpath +++ b/org.adempiere.report.jasper/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF index d33e6da721..328d2846e2 100644 --- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere JasperReport integration Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Import-Package: com.zaxxer.sparsebits;version="1.2.0", net.sourceforge.barbecue, org.apache.commons.codec, diff --git a/org.adempiere.report.jasper/build.properties b/org.adempiere.report.jasper/build.properties index 24af2f8751..3b52a2f896 100644 --- a/org.adempiere.report.jasper/build.properties +++ b/org.adempiere.report.jasper/build.properties @@ -3,3 +3,4 @@ bin.includes = META-INF/,\ . output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index 5d481b5513..ffe74c08c4 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -369,14 +369,6 @@ version="1.7.30" unpack="false"/> - - + + + + + + + + + + + + diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index 031b71de90..399d63e535 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17 diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index a37df902c7..169cac2afd 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -42,12 +42,14 @@ + + @@ -75,10 +77,9 @@ - + - @@ -252,6 +253,7 @@ + @@ -324,6 +326,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -334,10 +359,11 @@ - + + @@ -355,6 +381,7 @@ + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 9a446cf9ca..17c348b45e 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -42,13 +42,15 @@ + - + + @@ -75,10 +77,9 @@ - + - @@ -257,6 +258,7 @@ + @@ -332,6 +334,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -342,7 +367,7 @@ - + @@ -374,6 +399,7 @@ + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 1519cdeb3c..c47926f1d1 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.17.200.v20220215-2237.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.18.300.v20230220-1352.jar osgi.install.area=setup osgi.bundles=org.apache.felix.scr@1:start,\ org.eclipse.core.variables,\ @@ -43,7 +43,7 @@ osgi.bundles=org.apache.felix.scr@1:start,\ org.eclipse.jetty.util,\ jakarta.annotation-api,\ slf4j.api,\ - slf4j.jcl,\ + slf4j.jdk14,\ org.apache.commons.commons-codec,\ org.eclipse.osgi.compatibility.state,\ org.cryptacular,\ @@ -81,7 +81,28 @@ osgi.bundles=org.apache.felix.scr@1:start,\ org.antlr.antlr4-runtime,\ xstream,\ org.fusesource.hawtbuf.hawtbuf,\ - io.github.classgraph.classgraph + io.github.classgraph.classgraph,\ + org.osgi.service.cm,\ + org.osgi.service.component,\ + org.osgi.service.component.annotations,\ + org.osgi.service.coordinator,\ + org.osgi.service.device,\ + org.osgi.service.event,\ + org.osgi.service.log.stream,\ + org.osgi.service.metatype,\ + org.osgi.service.metatype.annotations,\ + org.osgi.service.prefs,\ + org.osgi.service.provisioning,\ + org.osgi.service.upnp,\ + org.osgi.service.useradmin,\ + org.osgi.service.wireadmin,\ + org.osgi.util.function,\ + org.osgi.util.measurement,\ + org.osgi.util.position,\ + org.osgi.util.promise,\ + org.osgi.util.pushstream,\ + org.osgi.util.tracker,\ + org.osgi.util.xml osgi.framework.extensions= osgi.bundles.defaultStartLevel=4 osgi.compatibility.bootdelegation=true diff --git a/org.adempiere.server/.classpath b/org.adempiere.server/.classpath index 3c4afa8def..be91c8380c 100755 --- a/org.adempiere.server/.classpath +++ b/org.adempiere.server/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF index 60f3a41315..bf531696ce 100644 --- a/org.adempiere.server/META-INF/MANIFEST.MF +++ b/org.adempiere.server/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Version: 11.0.0.qualifier Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.eclipse.equinox.app;bundle-version="0.0.0", org.eclipse.jetty.apache-jsp;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Web-ContextPath: / Bundle-ClassPath: . Import-Package: javax.jms;version="1.1.0", diff --git a/org.adempiere.server/build.properties b/org.adempiere.server/build.properties index d4349181a4..10ee4c5eb4 100644 --- a/org.adempiere.server/build.properties +++ b/org.adempiere.server/build.properties @@ -35,3 +35,4 @@ bin.excludes = src/**,\ .classpath,\ .project,\ build.properties +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.server/pom.xml b/org.adempiere.server/pom.xml index ab1bfa97d7..1d569ff970 100644 --- a/org.adempiere.server/pom.xml +++ b/org.adempiere.server/pom.xml @@ -9,21 +9,4 @@ org.adempiere.server eclipse-plugin - - - - - org.eclipse.tycho - tycho-compiler-plugin - - - - -warn:+forbidden - --add-exports - java.naming/com.sun.jndi.ldap=ALL-UNNAMED - - - - - - \ No newline at end of file + diff --git a/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerGroup.java b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerGroup.java index 9393de0eb2..e6a43b0bf8 100644 --- a/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerGroup.java +++ b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerGroup.java @@ -32,6 +32,7 @@ public class AdempiereServerGroup extends ThreadGroup * Get Adempiere Server Group * @return Server Group */ + @SuppressWarnings("removal") public static AdempiereServerGroup get() { if (s_group == null || s_group.isDestroyed()) @@ -45,6 +46,7 @@ public class AdempiereServerGroup extends ThreadGroup /** * AdempiereServerGroup */ + @SuppressWarnings("removal") private AdempiereServerGroup () { super ("AdempiereServers"); @@ -79,6 +81,7 @@ public class AdempiereServerGroup extends ThreadGroup /** * Dump Info */ + @SuppressWarnings("removal") public void dump () { if (log.isLoggable(Level.FINE)) log.fine(getName() + (isDestroyed() ? " (destroyed)" : "")); diff --git a/org.adempiere.server/src/main/server/org/compiere/server/SystemInfo.java b/org.adempiere.server/src/main/server/org/compiere/server/SystemInfo.java index e8a779ee23..a81524aa82 100644 --- a/org.adempiere.server/src/main/server/org/compiere/server/SystemInfo.java +++ b/org.adempiere.server/src/main/server/org/compiere/server/SystemInfo.java @@ -247,7 +247,7 @@ public class SystemInfo implements Serializable { si.availableProcessors = os.getAvailableProcessors(); if (os instanceof com.sun.management.OperatingSystemMXBean) { com.sun.management.OperatingSystemMXBean extInfo = (com.sun.management.OperatingSystemMXBean) os; - si.averageSystemLoad = extInfo.getSystemCpuLoad() * 100; + si.averageSystemLoad = extInfo.getCpuLoad() * 100; } else { si.averageSystemLoad = (os.getSystemLoadAverage() / si.availableProcessors) * 100; } diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath index a7547a5959..3e466c52b1 100755 --- a/org.adempiere.ui.zk/.classpath +++ b/org.adempiere.ui.zk/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index cfab22d183..ce3ee03f9a 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Web Client Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Import-Package: com.google.common.annotations;version="30.1.1", com.google.common.base;version="30.1.1", com.google.common.cache;version="30.1.1", diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LoggedSessionListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LoggedSessionListener.java index e197c63746..35a798b20b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LoggedSessionListener.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LoggedSessionListener.java @@ -102,7 +102,7 @@ public class LoggedSessionListener implements HttpSessionListener, ServletContex } } - logger.log(Level.OFF, "context initialized"); + logger.log(Level.OFF, "context initialized for " + org.zkoss.zk.Version.RELEASE); /** * End iDempiere Start */ diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties index 2bbc486525..eb4f4c4638 100644 --- a/org.adempiere.ui.zk/build.properties +++ b/org.adempiere.ui.zk/build.properties @@ -49,3 +49,4 @@ src.includes = WEB-INF/tld/,\ WEB-INF/src/web/theme/default/zul/calendar/divtab.zul bin.excludes = WEB-INF/src/ source.. = WEB-INF/src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.adempiere.ui/.classpath b/org.adempiere.ui/.classpath index 1d08901d83..48b71eaba3 100755 --- a/org.adempiere.ui/.classpath +++ b/org.adempiere.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF index b9f56a67eb..e4cba13afa 100644 --- a/org.adempiere.ui/META-INF/MANIFEST.MF +++ b/org.adempiere.ui/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere UI base Bundle-SymbolicName: org.adempiere.ui;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.servicemix.bundles.xerces;bundle-version="0.0.0", org.eclipse.equinox.app;bundle-version="0.0.0" diff --git a/org.adempiere.ui/build.properties b/org.adempiere.ui/build.properties index 47a81e85e6..9897bd054f 100644 --- a/org.adempiere.ui/build.properties +++ b/org.adempiere.ui/build.properties @@ -5,3 +5,4 @@ bin.includes = META-INF/,\ lib/org-openide-util-lookup.jar source.. = src/ output.. = target/classes/ +jre.compilation.profile = JavaSE-17 diff --git a/org.apache.ecs/.classpath b/org.apache.ecs/.classpath index bc57d2383d..5508535a40 100755 --- a/org.apache.ecs/.classpath +++ b/org.apache.ecs/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF index 4f5b4f1e65..893872a2c5 100644 --- a/org.apache.ecs/META-INF/MANIFEST.MF +++ b/org.apache.ecs/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.apache.ecs Bundle-Version: 11.0.0.qualifier Bundle-Activator: org.apache.ecs.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Import-Package: org.osgi.framework;version="1.3.0" Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml", org.apache.ecs.filter;uses:="org.apache.ecs", diff --git a/org.apache.ecs/build.properties b/org.apache.ecs/build.properties index ba31debd0e..e30e4c7bb7 100644 --- a/org.apache.ecs/build.properties +++ b/org.apache.ecs/build.properties @@ -2,3 +2,4 @@ bin.includes = META-INF/,\ . output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath index af3e17895b..0dd01a1ded 100755 --- a/org.compiere.db.oracle.provider/.classpath +++ b/org.compiere.db.oracle.provider/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index 575c0f107a..a75fd9f17c 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Oracle Provider Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.install;bundle-version="0.0.0";resolution:=optional Bundle-ClassPath: ., diff --git a/org.compiere.db.oracle.provider/build.properties b/org.compiere.db.oracle.provider/build.properties index a86ad9b0fa..05fc296998 100644 --- a/org.compiere.db.oracle.provider/build.properties +++ b/org.compiere.db.oracle.provider/build.properties @@ -7,3 +7,4 @@ bin.includes = META-INF/,\ lib/ojdbc10.jar,\ lib/HikariCP.jar source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath index 57d505dcde..9c48c5fa92 100755 --- a/org.compiere.db.postgresql.provider/.classpath +++ b/org.compiere.db.postgresql.provider/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index 070525b117..b98902f8f5 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Postgresql Provider Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Bundle-ClassPath: ., lib/postgresql.jar, lib/HikariCP.jar diff --git a/org.compiere.db.postgresql.provider/build.properties b/org.compiere.db.postgresql.provider/build.properties index 8177eb638f..823649b6a2 100644 --- a/org.compiere.db.postgresql.provider/build.properties +++ b/org.compiere.db.postgresql.provider/build.properties @@ -7,3 +7,4 @@ bin.includes = META-INF/,\ lib/postgresql.jar,\ lib/HikariCP.jar source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml index a2d80fe0c6..3703ff0264 100644 --- a/org.idempiere.eclipse.platform-feature/feature.xml +++ b/org.idempiere.eclipse.platform-feature/feature.xml @@ -79,7 +79,7 @@ install-size="0" version="0.0.0" unpack="false"/> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 055d516707..efb48657ae 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.17.200.v20220215-2237.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.18.300.v20230220-1352.jar osgi.install.area=director equinox.use.ds=true osgi.bundles=org.eclipse.core.net@start,\ @@ -60,10 +60,31 @@ osgi.bundles=org.eclipse.core.net@start,\ org.eclipse.osgi.util,\ org.tukaani.xz,\ slf4j.api,\ - slf4j.jcl,\ + slf4j.jdk14,\ bcpg,\ bcutil,\ - bcprov + bcprov,\ + org.osgi.service.cm,\ + org.osgi.service.component,\ + org.osgi.service.component.annotations,\ + org.osgi.service.coordinator,\ + org.osgi.service.device,\ + org.osgi.service.event,\ + org.osgi.service.log.stream,\ + org.osgi.service.metatype,\ + org.osgi.service.metatype.annotations,\ + org.osgi.service.prefs,\ + org.osgi.service.provisioning,\ + org.osgi.service.upnp,\ + org.osgi.service.useradmin,\ + org.osgi.service.wireadmin,\ + org.osgi.util.function,\ + org.osgi.util.measurement,\ + org.osgi.util.position,\ + org.osgi.util.promise,\ + org.osgi.util.pushstream,\ + org.osgi.util.tracker,\ + org.osgi.util.xml osgi.framework.extensions= osgi.bundles.defaultStartLevel=4 eclipse.p2.profile=DefaultProfile diff --git a/org.idempiere.felix.webconsole/.classpath b/org.idempiere.felix.webconsole/.classpath index bc57d2383d..5508535a40 100755 --- a/org.idempiere.felix.webconsole/.classpath +++ b/org.idempiere.felix.webconsole/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF index 4a93a39586..5acb1f60d2 100644 --- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF +++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.idempiere.felix.webconsole Bundle-Version: 11.0.0.qualifier Bundle-Activator: org.idempiere.felix.webconsole.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Import-Package: javax.servlet;version="2.5.0", javax.servlet.descriptor;version="3.1.0", javax.servlet.http;version="2.5.0", diff --git a/org.idempiere.felix.webconsole/build.properties b/org.idempiere.felix.webconsole/build.properties index b1d02522fc..2188e8d266 100644 --- a/org.idempiere.felix.webconsole/build.properties +++ b/org.idempiere.felix.webconsole/build.properties @@ -5,3 +5,4 @@ bin.includes = META-INF/,\ src.includes = WEB-INF/ output.. = target/classes/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.hazelcast.service/.classpath b/org.idempiere.hazelcast.service/.classpath index c82cefc219..f6bd626b15 100755 --- a/org.idempiere.hazelcast.service/.classpath +++ b/org.idempiere.hazelcast.service/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF index d623b1cb46..bcb46d0bda 100644 --- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF @@ -25,8 +25,8 @@ Bundle-ClassPath: ., lib/hazelcast-aws.jar, lib/hazelcast.jar Service-Component: OSGI-INF/*.xml -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.eclipse.osgi, org.adempiere.base;bundle-version="0.0.0" Automatic-Module-Name: org.idempiere.hazelcast.service diff --git a/org.idempiere.hazelcast.service/build.properties b/org.idempiere.hazelcast.service/build.properties index 3bbc29fdc8..71616e54f4 100644 --- a/org.idempiere.hazelcast.service/build.properties +++ b/org.idempiere.hazelcast.service/build.properties @@ -8,3 +8,4 @@ bin.includes = META-INF/,\ lib/hazelcast-aws.jar,\ lib/hazelcast.jar source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.javadoc/.classpath b/org.idempiere.javadoc/.classpath index cbd391fd55..c362d17e13 100755 --- a/org.idempiere.javadoc/.classpath +++ b/org.idempiere.javadoc/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.javadoc/META-INF/MANIFEST.MF b/org.idempiere.javadoc/META-INF/MANIFEST.MF index 56ef810a16..e43befb09b 100644 --- a/org.idempiere.javadoc/META-INF/MANIFEST.MF +++ b/org.idempiere.javadoc/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-SymbolicName: org.idempiere.javadoc;singleton:=true Bundle-Version: 11.0.0.qualifier Bundle-Vendor: iDempiere Community Automatic-Module-Name: org.idempiere.javadoc -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.idempiere.jetty.osgi.boot.fragment/.classpath b/org.idempiere.jetty.osgi.boot.fragment/.classpath index 685a6999c9..fe1a205326 100755 --- a/org.idempiere.jetty.osgi.boot.fragment/.classpath +++ b/org.idempiere.jetty.osgi.boot.fragment/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF b/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF index e653c90fa8..b639140e0c 100644 --- a/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF +++ b/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: org.idempiere.jetty.osgi.boot.fragment Bundle-Version: 11.0.0.qualifier Fragment-Host: org.eclipse.jetty.osgi.boot;bundle-version="10.0.7" Automatic-Module-Name: org.idempiere.jetty.logging.fragment -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.adempiere.base;bundle-version="11.0.0" Bundle-Vendor: iDempiere.org diff --git a/org.idempiere.jetty.osgi.boot.fragment/build.properties b/org.idempiere.jetty.osgi.boot.fragment/build.properties index 56d7765555..ba49d0f006 100644 --- a/org.idempiere.jetty.osgi.boot.fragment/build.properties +++ b/org.idempiere.jetty.osgi.boot.fragment/build.properties @@ -2,3 +2,4 @@ source.. = src/ output.. = target/classes/ bin.includes = META-INF/,\ . +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.keikai/.classpath b/org.idempiere.keikai/.classpath index e63f6aaca9..6e08334f9d 100755 --- a/org.idempiere.keikai/.classpath +++ b/org.idempiere.keikai/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.keikai/META-INF/MANIFEST.MF b/org.idempiere.keikai/META-INF/MANIFEST.MF index d32b02e1a4..18a2b7d2d9 100644 --- a/org.idempiere.keikai/META-INF/MANIFEST.MF +++ b/org.idempiere.keikai/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: zk keikai Bundle-SymbolicName: org.idempiere.keikai Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Bundle-ClassPath: ., lib/keikai-oss.jar, lib/keikai-model-oss.jar, diff --git a/org.idempiere.keikai/build.properties b/org.idempiere.keikai/build.properties index 8cf540b308..c94adbade6 100644 --- a/org.idempiere.keikai/build.properties +++ b/org.idempiere.keikai/build.properties @@ -8,3 +8,4 @@ bin.includes = META-INF/,\ OSGI-INF/,\ lib/ooxml-schemas.jar,\ lib/xmlbeans.jar +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.p2.targetplatform.mirror.feature/README.md b/org.idempiere.p2.targetplatform.mirror.feature/README.md index 8c8c379115..c2b80c0502 100644 --- a/org.idempiere.p2.targetplatform.mirror.feature/README.md +++ b/org.idempiere.p2.targetplatform.mirror.feature/README.md @@ -3,8 +3,8 @@ * Using the feature project wizard, create a new feature for the target platform. You will remove this project at the end so just give it an arbitrary name. * In the plugin selection page, the plugins listed are the ones in your target platform together with your workspace plugin projects. * Select Initialize from the plugin list and Select all plugins. - * De-select your workspace plugins(org.idempiere.*, org.adempiere.*, org.compiere.*, org.apache.ecs, etc). - * De-select platform launcher plugins (macos, linux and win32). + * De-select your workspace plugins(org.idempiere.*, org.adempiere.*, org.compiere.* and org.apache.ecs). + * De-select platform launcher plugins (org.eclipse.equinox.launcher.* for macos, linux and win32). * At feature.xml editor, switch to Included Features tab and add org.eclipse.equinox.executable feature. * Replace includes and plugin entries in feature.xml with include and plugin entries from the newly created feature.xml. * Remove the newly created feature project. diff --git a/org.idempiere.p2.targetplatform.mirror.feature/feature.xml b/org.idempiere.p2.targetplatform.mirror.feature/feature.xml index aa9cca06bc..c4bac22869 100644 --- a/org.idempiere.p2.targetplatform.mirror.feature/feature.xml +++ b/org.idempiere.p2.targetplatform.mirror.feature/feature.xml @@ -22,211 +22,168 @@ version="0.0.0"/> - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.m2e.core.maven2Builder @@ -18,6 +13,5 @@ org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature diff --git a/org.idempiere.p2.targetplatform/README.md b/org.idempiere.p2.targetplatform/README.md new file mode 100644 index 0000000000..025e5b5a8c --- /dev/null +++ b/org.idempiere.p2.targetplatform/README.md @@ -0,0 +1,21 @@ +#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. +* 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 +* 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" +* 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 +* If necessary, update server.product (in org.idempiere.p2 and org.adempiere.server.feature), org.idempiere.eclipse.platform.feature/feature.xml and org.adempiere.server.feature/feature.xml +* If necessary, update org.idempiere.server.feature/setup/configuration/config.ini and org.idempiere.equinox.p2.feature/director/configuration/config.ini +* Validate all Eclipse application launch configuration is working. +* Validate unit test launch configuration is working. +* Validate application created by mvn verify is working as expected. +* Update org.idempiere.p2.repository.target - open in target editor, switch to Content tab and update the list of selected bundle. +* Update org.idempiere.p2.targetplatform.mirror.feature/feature.xml (Follow instructions in org.idempiere.p2.targetplatform.mirror.feature). +* Update name and "idempiere.target.platform" setup task in utils_dev/oomph/idempiere.setup + diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml index 70ead9efd4..e74a88fe87 100644 --- a/org.idempiere.p2.targetplatform/maven.locations.xml +++ b/org.idempiere.p2.targetplatform/maven.locations.xml @@ -359,25 +359,19 @@ Export-Package: *;-noimport:=true org.bouncycastle - bcpg-jdk15on - 1.69 + bcpg-jdk18on + 1.72.2 jar org.bouncycastle - bcmail-jdk15on - 1.69 + bcmail-jdk18on + 1.72 jar org.bouncycastle bctsp-jdk15on - 1.46 - jar - - - org.bouncycastle - bcpg-jdk15on 1.46 jar @@ -1016,7 +1010,7 @@ Export-Package: *;version="${version}";-noimport:=true org.springframework spring-web - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-context - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-aop - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-beans - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-core - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-expression - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-context-support - 5.2.22.RELEASE + 5.3.27 + jar + + + + org.springframework + spring-jcl + 5.3.27 jar org.eclipse.jetty jetty-servlets - 10.0.9 + 10.0.15 jar org.eclipse.jetty apache-jsp - 10.0.9 + 10.0.15 jar org.eclipse.jetty apache-jstl - 10.0.9 + 10.0.15 jar @@ -1197,121 +1204,133 @@ Export-Package: *;version="${version}";-noimport:=true org.eclipse.jetty jetty-client - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-jmx - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-plus - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-deploy - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-jndi - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-util-ajax - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-jaas - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-rewrite - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-slf4j-impl - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-osgi-boot - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-httpservice - 10.0.9 + 10.0.15 jar org.eclipse.jetty.websocket websocket-jetty-server - 10.0.9 + 10.0.15 jar org.eclipse.jetty.websocket websocket-javax-server - 10.0.9 + 10.0.15 jar org.eclipse.jetty.websocket websocket-javax-common - 10.0.9 + 10.0.15 + jar + + + org.osgi + org.osgi.util.tracker + 1.5.4 jar org.eclipse.jetty.websocket websocket-core-server - 10.0.9 + 10.0.15 jar org.ow2.asm asm-util - 9.2 + 9.5 + jar + + + org.ow2.asm + asm-analysis + 9.5 jar org.slf4j - slf4j-jcl + slf4j-jdk14 1.7.30 jar @@ -1362,4 +1381,77 @@ Export-Package: *;version="${version}";-noimport:=true 3.22.0 jar + + + org.junit.jupiter + junit-jupiter-api + 5.9.1 + jar + + + org.junit.jupiter + junit-jupiter-params + 5.9.1 + jar + + + org.junit.jupiter + junit-jupiter-engine + 5.9.1 + jar + + + org.junit.jupiter + junit-jupiter-migrationsupport + 5.9.1 + jar + + + org.junit.vintage + junit-vintage-engine + 5.9.1 + jar + + + org.junit.platform + junit-platform-engine + 1.9.1 + jar + + + org.junit.platform + junit-platform-commons + 1.9.1 + jar + + + org.junit.platform + junit-platform-launcher + 1.9.1 + jar + + + org.junit.platform + junit-platform-runner + 1.9.1 + jar + + + org.junit.platform + junit-platform-suite-api + 1.9.1 + jar + + + org.junit.platform + junit-platform-suite-commons + 1.9.1 + jar + + + org.junit.platform + junit-platform-suite-engine + 1.9.1 + jar + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target index d0abf9d52c..dbbf48fb2c 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target @@ -43,8 +43,8 @@ - + @@ -133,7 +133,7 @@ - + @@ -255,17 +255,18 @@ - - - - - - - - - - - + + + + + + + + + + + + @@ -287,7 +288,7 @@ - + @@ -320,6 +321,7 @@ + @@ -337,5 +339,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 03ee9d9339..8a02351cd6 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,21 +1,21 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -33,92 +33,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + @@ -499,25 +510,19 @@ Export-Package: *;-noimport:=true org.bouncycastle - bcpg-jdk15on - 1.69 + bcpg-jdk18on + 1.72.2 jar org.bouncycastle - bcmail-jdk15on - 1.69 + bcmail-jdk18on + 1.72 jar org.bouncycastle bctsp-jdk15on - 1.46 - jar - - - org.bouncycastle - bcpg-jdk15on 1.46 jar @@ -1156,7 +1161,7 @@ Export-Package: *;version="${version}";-noimport:=true org.springframework spring-web - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-context - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-aop - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-beans - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-core - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-expression - 5.2.22.RELEASE + 5.3.27 jar org.springframework spring-context-support - 5.2.22.RELEASE + 5.3.27 + jar + + + + org.springframework + spring-jcl + 5.3.27 jar org.eclipse.jetty jetty-servlets - 10.0.9 + 10.0.15 jar org.eclipse.jetty apache-jsp - 10.0.9 + 10.0.15 jar org.eclipse.jetty apache-jstl - 10.0.9 + 10.0.15 jar @@ -1337,121 +1355,133 @@ Export-Package: *;version="${version}";-noimport:=true org.eclipse.jetty jetty-client - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-jmx - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-plus - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-deploy - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-jndi - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-util-ajax - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-jaas - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-rewrite - 10.0.9 + 10.0.15 jar org.eclipse.jetty jetty-slf4j-impl - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-osgi-boot - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 10.0.9 + 10.0.15 jar org.eclipse.jetty.osgi jetty-httpservice - 10.0.9 + 10.0.15 jar org.eclipse.jetty.websocket websocket-jetty-server - 10.0.9 + 10.0.15 jar org.eclipse.jetty.websocket websocket-javax-server - 10.0.9 + 10.0.15 jar org.eclipse.jetty.websocket websocket-javax-common - 10.0.9 + 10.0.15 + jar + + + org.osgi + org.osgi.util.tracker + 1.5.4 jar org.eclipse.jetty.websocket websocket-core-server - 10.0.9 + 10.0.15 jar org.ow2.asm asm-util - 9.2 + 9.5 + jar + + + org.ow2.asm + asm-analysis + 9.5 jar org.slf4j - slf4j-jcl + slf4j-jdk14 1.7.30 jar @@ -1502,5 +1532,78 @@ Export-Package: *;version="${version}";-noimport:=true 3.22.0 jar + + + org.junit.jupiter + junit-jupiter-api + 5.9.1 + jar + + + org.junit.jupiter + junit-jupiter-params + 5.9.1 + jar + + + org.junit.jupiter + junit-jupiter-engine + 5.9.1 + jar + + + org.junit.jupiter + junit-jupiter-migrationsupport + 5.9.1 + jar + + + org.junit.vintage + junit-vintage-engine + 5.9.1 + jar + + + org.junit.platform + junit-platform-engine + 1.9.1 + jar + + + org.junit.platform + junit-platform-commons + 1.9.1 + jar + + + org.junit.platform + junit-platform-launcher + 1.9.1 + jar + + + org.junit.platform + junit-platform-runner + 1.9.1 + jar + + + org.junit.platform + junit-platform-suite-api + 1.9.1 + jar + + + org.junit.platform + junit-platform-suite-commons + 1.9.1 + jar + + + org.junit.platform + junit-platform-suite-engine + 1.9.1 + jar + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd index 99a999a3cd..adb874e65a 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd @@ -1,9 +1,8 @@ - -target "idempiere-221205" +target "idempiere-230620" with source configurePhase allEnvironments -location zk "https://idempiere.github.io/binary.file/p2.zk/9.6.3" { +location zk "https://idempiere.github.io/binary.file/p2.zk/9.6.4" { zcommon zel zhtml @@ -33,9 +32,31 @@ location eclipse "https://download.eclipse.org/eclipse/updates/4.20" { org.apache.httpcomponents.httpcore } -location eclipse-2022-03 "https://download.eclipse.org/eclipse/updates/4.23" { +location eclipse-2023-03 "https://download.eclipse.org/eclipse/updates/4.27" { // equinox core framework org.eclipse.osgi + org.osgi.annotation.bundle + org.osgi.annotation.versioning + org.osgi.service.cm + org.osgi.service.component + org.osgi.service.component.annotations + org.osgi.service.coordinator + org.osgi.service.device + org.osgi.service.event + org.osgi.service.log.stream + org.osgi.service.metatype + org.osgi.service.metatype.annotations + org.osgi.service.prefs + org.osgi.service.provisioning + org.osgi.service.upnp + org.osgi.service.useradmin + org.osgi.service.wireadmin + org.osgi.util.function + org.osgi.util.measurement + org.osgi.util.position + org.osgi.util.promise + org.osgi.util.pushstream + org.osgi.util.xml //<< equinox framework starter kit org.apache.felix.gogo.command org.apache.felix.gogo.runtime @@ -106,26 +127,12 @@ location eclipse-2022-03 "https://download.eclipse.org/eclipse/updates/4.23" { org.eclipse.core.resources org.eclipse.core.variables org.eclipse.jdt.core + org.eclipse.jdt.core.compiler.batch org.eclipse.text -} - -location eclipse-2022-03 "https://download.eclipse.org/eclipse/updates/4.23" { //<< for test org.opentest4j - org.apiguardian + org.apiguardian.api org.junit - org.junit.jupiter.api - org.junit.jupiter.params - org.junit.jupiter.engine - org.junit.jupiter.migrationsupport - org.junit.vintage.engine - org.junit.platform.engine - org.junit.platform.commons - org.junit.platform.launcher - org.junit.platform.runner - org.junit.platform.suite.api - org.junit.platform.suite.commons - org.junit.platform.suite.engine org.eclipse.pde.junit.runtime org.eclipse.jdt.junit.runtime org.eclipse.jdt.junit5.runtime diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml index 62385b609c..c9c0311030 100644 --- a/org.idempiere.p2/category.xml +++ b/org.idempiere.p2/category.xml @@ -45,12 +45,12 @@ - - - + + + diff --git a/org.idempiere.p2/pom.xml b/org.idempiere.p2/pom.xml index 301961bdca..2ef5c5b636 100644 --- a/org.idempiere.p2/pom.xml +++ b/org.idempiere.p2/pom.xml @@ -124,7 +124,26 @@ org.eclipse.tycho.extras tycho-eclipserun-plugin - -application org.eclipse.equinox.p2.director -repository file:${project.build.directory}/repository -destination ${project.build.directory}/products/${idempiere.product.id}/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch} -installIU "${extra.ui.install}" -profileProperties org.eclipse.update.install.features=true -p2.os ${tycho.env.osgi.os} -p2.ws ${tycho.env.osgi.ws} -p2.arch ${tycho.env.osgi.arch} -consoleLog -roaming + + -application + org.eclipse.equinox.p2.director + -repository + file:${project.build.directory}/repository + -destination + ${project.build.directory}/products/${idempiere.product.id}/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch} + -installIU + ${extra.ui.install} + -profileProperties + org.eclipse.update.install.features=true + -p2.os + ${tycho.env.osgi.os} + -p2.ws + ${tycho.env.osgi.ws} + -p2.arch + ${tycho.env.osgi.arch} + -consoleLog + -roaming + diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product index 031b71de90..399d63e535 100644 --- a/org.idempiere.p2/server.product +++ b/org.idempiere.p2/server.product @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17 diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 9a6d8f5588..23c4589992 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -11,12 +11,12 @@ 11.0.0-SNAPSHOT - 11 - 2.7.5 + 17 + 3.0.5-SNAPSHOT ${tycho.version} UTF-8 6.17.0 - 9.6.3 + 9.6.4 3.1.1 1.4.1 1.0.0 @@ -29,11 +29,19 @@ https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository orbit-2021-06-R20210602031627 https://raw.githubusercontent.com/idempiere/binary.file/master - org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.test.feature.feature.group + org.eclipse.equinox.p2.director,org.idempiere.equinox.p2.director.feature.feature.group,org.idempiere.test.feature.feature.group org.adempiere.server.product false + 17 + + + tycho-snapshots + https://repo.eclipse.org/content/repositories/tycho-snapshots/ + + + @@ -130,7 +138,7 @@ target-platform-configuration - [2.7.0,) + [3.0.0,) target-platform @@ -149,7 +157,7 @@ tycho-compiler-plugin - [2.7.3,) + [3.0.0,) @@ -170,7 +178,7 @@ tycho-ds-plugin - [2.7.3,) + [3.0.0,) @@ -455,8 +463,9 @@ tycho-compiler-plugin ${tycho.version} - ${jdk.version} - ${jdk.version} + ${target.version} + ${target.version} + ${target.version} true @@ -681,7 +690,7 @@ JavaSE-${jdk.version} JavaSE-${jdk.version} - + diff --git a/org.idempiere.printformat.editor/.classpath b/org.idempiere.printformat.editor/.classpath index 685a6999c9..fe1a205326 100755 --- a/org.idempiere.printformat.editor/.classpath +++ b/org.idempiere.printformat.editor/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.printformat.editor/META-INF/MANIFEST.MF b/org.idempiere.printformat.editor/META-INF/MANIFEST.MF index 2ee5acc647..bc300f5c3e 100644 --- a/org.idempiere.printformat.editor/META-INF/MANIFEST.MF +++ b/org.idempiere.printformat.editor/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Import-Package: org.osgi.framework, org.osgi.service.component;version="1.4.0", org.osgi.service.component.annotations;version="1.3.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Require-Bundle: org.adempiere.base;bundle-version="11.0.0", org.adempiere.ui.zk;bundle-version="11.0.0", org.adempiere.plugin.utils;bundle-version="11.0.0", diff --git a/org.idempiere.printformat.editor/build.properties b/org.idempiere.printformat.editor/build.properties index b3fe17d1f5..44fab48c90 100644 --- a/org.idempiere.printformat.editor/build.properties +++ b/org.idempiere.printformat.editor/build.properties @@ -3,3 +3,4 @@ bin.includes = META-INF/,\ .,\ OSGI-INF/ source.. = src/ +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.test-feature/feature.xml b/org.idempiere.test-feature/feature.xml index 85086ab38b..ff6ddc1a85 100644 --- a/org.idempiere.test-feature/feature.xml +++ b/org.idempiere.test-feature/feature.xml @@ -18,35 +18,35 @@ + + + + + + - + diff --git a/org.idempiere.test/META-INF/MANIFEST.MF b/org.idempiere.test/META-INF/MANIFEST.MF index afac50cb9e..b076e9dc5b 100644 --- a/org.idempiere.test/META-INF/MANIFEST.MF +++ b/org.idempiere.test/META-INF/MANIFEST.MF @@ -7,18 +7,23 @@ Bundle-Vendor: iDempiere Automatic-Module-Name: org.idempiere.test Import-Package: org.assertj.core.api;version="3.22.0", org.assertj.core.api.junit.jupiter;version="3.22.0", - org.junit.jupiter.api;version="5.6.0", - org.junit.jupiter.api.condition;version="5.6.0", - org.junit.jupiter.api.extension;version="5.6.0", - org.junit.jupiter.api.extension.support;version="5.6.0", - org.junit.jupiter.api.function;version="5.6.0", - org.junit.jupiter.api.io;version="5.6.0", - org.junit.jupiter.api.parallel;version="5.6.0", - org.junit.jupiter.params;version="5.6.0", - org.junit.jupiter.params.aggregator;version="5.6.0", - org.junit.jupiter.params.converter;version="5.6.0", - org.junit.jupiter.params.provider;version="5.6.0", - org.junit.jupiter.params.support;version="5.6.0", + org.junit.jupiter.api;version="5.9.0", + org.junit.jupiter.api.condition;version="5.9.0", + org.junit.jupiter.api.extension;version="5.9.0", + org.junit.jupiter.api.extension.support;version="5.9.0", + org.junit.jupiter.api.function;version="5.9.0", + org.junit.jupiter.api.io;version="5.9.0", + org.junit.jupiter.api.parallel;version="5.9.0", + org.junit.jupiter.params;version="5.9.0", + org.junit.jupiter.params.aggregator;version="5.9.0", + org.junit.jupiter.params.converter;version="5.9.0", + org.junit.jupiter.params.provider;version="5.9.0", + org.junit.jupiter.params.support;version="5.9.0", + org.junit.platform.commons;version="1.9.0", + org.junit.platform.commons.annotation;version="1.9.0", + org.junit.platform.commons.function;version="1.9.0", + org.junit.platform.commons.support;version="1.9.0", + org.junit.platform.commons.util;version="1.9.0", org.osgi.framework;version="1.9.0", org.osgi.service.component.annotations;version="1.3.0", org.osgi.service.event;version="1.4.0", @@ -35,7 +40,7 @@ Require-Bundle: org.adempiere.base;bundle-version="11.0.0", org.adempiere.ui;bundle-version="11.0.0" Bundle-ActivationPolicy: lazy Bundle-Activator: org.idempiere.test.TestActivator -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.idempiere.test -Service-Component: OSGI-INF/org.idempiere.test.event.MyComponent.xml Bundle-ClassPath: . +Service-Component: OSGI-INF/org.idempiere.test.event.MyComponent.xml diff --git a/org.idempiere.test/build.properties b/org.idempiere.test/build.properties index 67e6565494..1c732b078c 100644 --- a/org.idempiere.test/build.properties +++ b/org.idempiere.test/build.properties @@ -3,3 +3,4 @@ output.. = target/classes/ bin.includes = META-INF/,\ .,\ OSGI-INF/ +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch index 2a0a9ef5fa..3763ddab85 100644 --- a/org.idempiere.test/idempiere.unit.test.launch +++ b/org.idempiere.test/idempiere.unit.test.launch @@ -15,6 +15,7 @@ + @@ -54,8 +55,9 @@ + - + @@ -68,10 +70,9 @@ - + - @@ -129,6 +130,18 @@ + + + + + + + + + + + + @@ -190,7 +203,7 @@ - + @@ -242,6 +255,7 @@ + @@ -297,18 +311,6 @@ - - - - - - - - - - - - @@ -321,6 +323,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -331,7 +356,7 @@ - + @@ -356,6 +381,7 @@ + diff --git a/org.idempiere.test/idempiere.unit.test.parallel.launch b/org.idempiere.test/idempiere.unit.test.parallel.launch index b985faaeee..1b06f3fce0 100644 --- a/org.idempiere.test/idempiere.unit.test.parallel.launch +++ b/org.idempiere.test/idempiere.unit.test.parallel.launch @@ -15,6 +15,7 @@ + @@ -54,8 +55,9 @@ + - + @@ -68,10 +70,9 @@ - + - @@ -129,6 +130,18 @@ + + + + + + + + + + + + @@ -190,7 +203,7 @@ - + @@ -242,6 +255,7 @@ + @@ -297,18 +311,6 @@ - - - - - - - - - - - - @@ -321,6 +323,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -331,7 +356,7 @@ - + @@ -356,6 +381,7 @@ + diff --git a/org.idempiere.test/pom.xml b/org.idempiere.test/pom.xml index 25e7a9b468..c9cbf29eae 100644 --- a/org.idempiere.test/pom.xml +++ b/org.idempiere.test/pom.xml @@ -56,7 +56,7 @@ default ${skipTests} - junit58 + junit59 diff --git a/org.idempiere.webservices-feature/feature.xml b/org.idempiere.webservices-feature/feature.xml index a0a6bcf18e..2cad2700e0 100644 --- a/org.idempiere.webservices-feature/feature.xml +++ b/org.idempiere.webservices-feature/feature.xml @@ -339,4 +339,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath index df7d6898ac..d514607e62 100755 --- a/org.idempiere.webservices/.classpath +++ b/org.idempiere.webservices/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index da54771ff8..b1ef93743d 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -4,8 +4,8 @@ Bundle-Name: iDempiere Webservices Bundle-SymbolicName: org.idempiere.webservices;singleton:=true Bundle-Version: 11.0.0.qualifier Bundle-Activator: org.idempiere.webservices.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Service-Component: OSGI-INF/*.xml Import-Package: javax.activation, javax.jws;version="1.1.0", @@ -89,7 +89,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", 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", - jakarta.annotation-api;bundle-version="1.3.2", 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", @@ -107,7 +106,9 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", 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.codehaus.jettison.jettison;bundle-version="1.4.1", + org.eclipse.osgi, + jakarta.annotation-api;bundle-version="1.3.5" Bundle-ClassPath: ., lib/idempiere-xmlbeans.jar Export-Package: org.idempiere.webservices.model, diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties index 9b24693d0e..eea091d3fb 100644 --- a/org.idempiere.webservices/build.properties +++ b/org.idempiere.webservices/build.properties @@ -10,3 +10,4 @@ bin.includes = META-INF/,\ src.includes = lib/,\ WEB-INF/web.xml,\ WEB-INF/xsd/ +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.zk.billboard.chart/.classpath b/org.idempiere.zk.billboard.chart/.classpath index 1db08c6b4c..8d8612144f 100755 --- a/org.idempiere.zk.billboard.chart/.classpath +++ b/org.idempiere.zk.billboard.chart/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.zk.billboard.chart/META-INF/MANIFEST.MF b/org.idempiere.zk.billboard.chart/META-INF/MANIFEST.MF index d969b3a71e..9f461ca175 100644 --- a/org.idempiere.zk.billboard.chart/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.billboard.chart/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.zk.billboard.chart Bundle-Version: 11.0.0.qualifier Bundle-Activator: org.idempiere.zk.billboard.chart.Activator Bundle-Vendor: iDempiere -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.idempiere.zk.billboard.chart Import-Package: org.osgi.framework, org.osgi.service.component, diff --git a/org.idempiere.zk.billboard.chart/build.properties b/org.idempiere.zk.billboard.chart/build.properties index 67e6565494..1c732b078c 100644 --- a/org.idempiere.zk.billboard.chart/build.properties +++ b/org.idempiere.zk.billboard.chart/build.properties @@ -3,3 +3,4 @@ output.. = target/classes/ bin.includes = META-INF/,\ .,\ OSGI-INF/ +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.zk.billboard/.classpath b/org.idempiere.zk.billboard/.classpath index 1db08c6b4c..8d8612144f 100755 --- a/org.idempiere.zk.billboard/.classpath +++ b/org.idempiere.zk.billboard/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.zk.billboard/META-INF/MANIFEST.MF b/org.idempiere.zk.billboard/META-INF/MANIFEST.MF index 9a844cf313..bc062e6a57 100644 --- a/org.idempiere.zk.billboard/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.billboard/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.zk.billboard Bundle-Version: 11.0.0.qualifier Bundle-Vendor: iDempiere Automatic-Module-Name: org.idempiere.zk.billboard -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: metainfo.zk, org.idempiere.zk.billboard, web.js.zul.billboard, diff --git a/org.idempiere.zk.billboard/build.properties b/org.idempiere.zk.billboard/build.properties index 56d7765555..ba49d0f006 100644 --- a/org.idempiere.zk.billboard/build.properties +++ b/org.idempiere.zk.billboard/build.properties @@ -2,3 +2,4 @@ source.. = src/ output.. = target/classes/ bin.includes = META-INF/,\ . +jre.compilation.profile = JavaSE-17 diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath index 8447e26c4b..9ad1f1292d 100755 --- a/org.idempiere.zk.extra/.classpath +++ b/org.idempiere.zk.extra/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF index d4823cd6db..9b69539836 100644 --- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: extra zk library Bundle-SymbolicName: org.idempiere.zk.extra Bundle-Version: 11.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" Bundle-ClassPath: ., lib/breeze.jar, lib/calendar.jar, diff --git a/org.idempiere.zk.extra/build.properties b/org.idempiere.zk.extra/build.properties index fdcd8cceab..443c2676f0 100644 --- a/org.idempiere.zk.extra/build.properties +++ b/org.idempiere.zk.extra/build.properties @@ -9,3 +9,4 @@ bin.includes = META-INF/,\ lib/timelinez.jar,\ lib/timeplotz.jar,\ lib/iceblue_c.jar +jre.compilation.profile = JavaSE-17 diff --git a/utils_dev/oomph/idempiere.setup b/utils_dev/oomph/idempiere.setup index dbf63dc894..a29d9455fa 100755 --- a/utils_dev/oomph/idempiere.setup +++ b/utils_dev/oomph/idempiere.setup @@ -10,7 +10,7 @@ xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore" - name="idempiere.11.221205" + name="idempiere.11.230620" label="iDempiere 11"> Define the JRE needed to compile and run the Java projects of ${scope.project.label}