- Welcome to the iDempiere (OSGi+ADempiere) 8.2z Phong Page!
+ | Welcome to the iDempiere 9.0.0 Development Build Page!
|
diff --git a/org.adempiere.server/pom.xml b/org.adempiere.server/pom.xml
index f549f625c0..ab1bfa97d7 100644
--- a/org.adempiere.server/pom.xml
+++ b/org.adempiere.server/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.adempiere.server
diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
index 48e3542f80..eec28d9542 100644
--- a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
+++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
@@ -90,7 +90,7 @@ public final class Prop implements Serializable {
public static final String SOC_7 = "Social7";
/**Defaults*/
- private static final String CREDITS = "Welcome to the iDempiere (OSGi+ADempiere) 8.2z Phong Page!";
+ private static final String CREDITS = "Welcome to the iDempiere 9.0.0 Development Build Page!";
private static String LOGO_URL = null;
diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties
index 068353fa2d..03067dbb1f 100644
--- a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties
+++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties
@@ -52,5 +52,5 @@ CustomImagePath = NONE
ClientName = iDempiere Application Home
#Custom Credits & Copyright tail
-Credits = Welcome to iDempiere 8.2z Phong
+Credits = Welcome to iDempiere 9.0.0 Development Build
Copyriright = || by iDempiere Community
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index 302585c2c8..95b38f21d2 100644
--- a/org.adempiere.ui.zk-feature/feature.xml
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -2,7 +2,7 @@
@@ -25,7 +25,7 @@
id="org.adempiere.ui.zk"
download-size="0"
install-size="0"
- version="8.2.0.qualifier"/>
+ version="0.0.0"/>
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.adempiere.ui.zk.feature
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index ba82f2bfe1..0af84aea1b 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Web Client
Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: com.google.common.annotations;version="30.1.1",
@@ -43,13 +43,18 @@ Import-Package: com.google.common.annotations;version="30.1.1",
org.apache.commons.fileupload.servlet;version="1.2.2",
org.apache.commons.fileupload.util;version="1.2.2",
org.apache.commons.lang3;version="3.1.0",
+ org.apache.commons.text;version="1.9.0",
+ org.apache.commons.text.diff;version="1.9.0",
+ org.apache.commons.text.io;version="1.9.0",
+ org.apache.commons.text.lookup;version="1.9.0",
+ org.apache.commons.text.matcher;version="1.9.0",
+ org.apache.commons.text.similarity;version="1.9.0",
+ org.apache.commons.text.translate;version="1.9.0",
org.apache.ecs,
org.apache.ecs.xhtml,
org.apache.tools.ant,
org.apache.tools.ant.taskdefs,
org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.jetty.websocket.jsr356;version="9.4.12",
- org.eclipse.jetty.websocket.jsr356.server;version="9.4.12",
org.jfree.chart,
org.jfree.chart.encoders,
org.jfree.chart.entity,
@@ -176,7 +181,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
zkplus;bundle-version="0.0.0",
zul;bundle-version="0.0.0",
zweb;bundle-version="0.0.0",
- org.apache.commons.io;bundle-version="0.0.0",
+ org.apache.commons.commons-io;bundle-version="0.0.0",
org.atmosphere.runtime;bundle-version="0.0.0",
zkwebfragment,
com.sun.activation.jakarta.activation;bundle-version="1.2.1",
diff --git a/org.adempiere.ui.zk/WEB-INF/jetty-web.xml b/org.adempiere.ui.zk/WEB-INF/jetty-web.xml
index 5c82bcacd7..4d0ad25f06 100644
--- a/org.adempiere.ui.zk/WEB-INF/jetty-web.xml
+++ b/org.adempiere.ui.zk/WEB-INF/jetty-web.xml
@@ -1,8 +1,8 @@
-
+
1048576
2000
-
\ No newline at end of file
+
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
index afd09028d3..0730ad6e51 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
@@ -28,7 +28,6 @@ import org.adempiere.webui.util.ZKUpdateUtil;
import org.compiere.model.MSysConfig;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
-import org.zkoss.zk.ui.Page;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
@@ -132,11 +131,13 @@ public class NumberBox extends Div
else
btn.setImage(ThemeManager.getThemeResource("images/Calculator16.png"));
btn.setTabindex(-1);
- ZKUpdateUtil.setHflex(btn, "0");
+ ZKUpdateUtil.setHflex(btn, "0");
+
btn.addEventListener(Events.ON_CLICK, new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
- if (btn.getPopup() != null) {
+ if (popup != null) {
+ popup.open(NumberBox.this, "after_start");
// Fill the calculator with the actual value of the field
// TODO: this could be made a user preference
String curValue = "";
@@ -153,7 +154,7 @@ public class NumberBox extends Div
}
}
String txtCalcId = txtCalc.getId();
- Clients.evalJavaScript("calc.append('" + txtCalcId + "', '" + curValue + "')");
+ Clients.evalJavaScript("calc.append('" + txtCalcId + "', '" + curValue + "')");
}
}
});
@@ -162,7 +163,6 @@ public class NumberBox extends Div
popup = getCalculatorPopup();
appendChild(popup);
- btn.setPopup(popup);
btn.setStyle("text-align: center;");
LayoutUtils.addSclass("number-box", this);
@@ -248,22 +248,7 @@ public class NumberBox extends Div
private Popup getCalculatorPopup()
{
- Popup popup = new Popup() {
- /**
- *
- */
- private static final long serialVersionUID = -5991248152956632527L;
-
- @Override
- public void onPageAttached(Page newpage, Page oldpage) {
- super.onPageAttached(newpage, oldpage);
- if (newpage != null) {
- if (btn.getPopup() != null) {
- btn.setPopup(this);
- }
- }
- }
- };
+ Popup popup = new Popup();
Vbox vbox = new Vbox();
@@ -482,12 +467,9 @@ public class NumberBox extends Div
{
if (btn.getParent() != decimalBox.getParent())
btn.setParent(decimalBox.getParent());
- btn.setPopup(popup);
}
else
{
- Popup p = null;
- btn.setPopup(p);
if (btn.getParent() != null)
btn.detach();
}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
index 79c64da72f..b26b0deb76 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
@@ -46,7 +46,7 @@ import org.jfree.chart.ChartFactory;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.encoders.EncoderUtil;
import org.jfree.chart.encoders.ImageFormat;
-import org.jfree.chart.plot.PiePlot3D;
+import org.jfree.chart.plot.PiePlot;
import org.jfree.data.general.DefaultPieDataset;
import org.zkoss.calendar.Calendars;
import org.zkoss.calendar.api.CalendarEvent;
@@ -329,6 +329,7 @@ public class CalendarWindow extends Window implements EventListener, ITab
}
}
+ @SuppressWarnings({ "rawtypes", "unchecked" })
private void syncModel() {
Hashtable ht = new Hashtable();
@@ -362,8 +363,8 @@ public class CalendarWindow extends Window implements EventListener, ITab
pieDataset.setValue(name == null ? "" : name, Double.valueOf(size > 0 ? value.doubleValue()/size*100 : 0));
}
- JFreeChart chart = ChartFactory.createPieChart3D(Msg.getMsg(Env.getCtx(),"EventsAnalysis"), pieDataset, true, true, true);
- PiePlot3D plot = (PiePlot3D) chart.getPlot();
+ JFreeChart chart = ChartFactory.createPieChart(Msg.getMsg(Env.getCtx(),"EventsAnalysis"), pieDataset, true, true, true);
+ PiePlot plot = (PiePlot) chart.getPlot();
plot.setForegroundAlpha(0.5f);
BufferedImage bi = chart.createBufferedImage(600, 250);
try {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
index 74113d2843..93dcdb323e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
@@ -596,6 +596,8 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
{
pnlHead.invalidate();
}
+
+ homeTab.invalidate();
}
protected void setSidePopupWidth(Popup popup) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/addon/chosenbox/Chosenbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/addon/chosenbox/Chosenbox.java
index 70f0272f0d..dc928e988d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/addon/chosenbox/Chosenbox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/addon/chosenbox/Chosenbox.java
@@ -29,7 +29,7 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.zkoss.lang.Objects;
import org.zkoss.xel.VariableResolver;
import org.zkoss.zk.au.out.AuSetAttribute;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/vendor-logo.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/vendor-logo.zul
index 702fdef575..f03485005d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/vendor-logo.zul
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/vendor-logo.zul
@@ -9,7 +9,7 @@ Copyright (C) 2009 Idalica Corporation
if="${desktop.execution.serverName.equals("127.0.0.1") or desktop.execution.serverName.startsWith("demo") or desktop.execution.serverName.startsWith("test") or desktop.execution.serverName.startsWith("triage")}">
-
diff --git a/org.adempiere.ui.zk/WEB-INF/web.xml b/org.adempiere.ui.zk/WEB-INF/web.xml
index b6e3c8d654..7fbe6475d6 100644
--- a/org.adempiere.ui.zk/WEB-INF/web.xml
+++ b/org.adempiere.ui.zk/WEB-INF/web.xml
@@ -1,8 +1,8 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0">
iDempiere Web Client
org.eclipse.jetty.servlet.SessionCookie
@@ -29,7 +29,7 @@
org.atmosphere.websocket.suppressJSR356
- true
+ false
0
@@ -178,10 +178,4 @@
-
-
diff --git a/org.adempiere.ui.zk/pom.xml b/org.adempiere.ui.zk/pom.xml
index 316af2e8f7..b2a4f1a5ea 100644
--- a/org.adempiere.ui.zk/pom.xml
+++ b/org.adempiere.ui.zk/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.adempiere.ui.zk
@@ -53,12 +53,12 @@
org.zkoss.zkforge
ckez
- 4.7.0.0
+ 4.16.1.1
com.googlecode.owasp-java-html-sanitizer
owasp-java-html-sanitizer
- 20190503.1
+ 20200713.1
lib
diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index 82d92a0563..46d0dd1ae8 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere UI base
Bundle-SymbolicName: org.adempiere.ui;singleton:=true
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
diff --git a/org.adempiere.ui/pom.xml b/org.adempiere.ui/pom.xml
index b45b19c572..cea154e53d 100644
--- a/org.adempiere.ui/pom.xml
+++ b/org.adempiere.ui/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.adempiere.ui
diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF
index ed0121242f..0285137aa4 100644
--- a/org.apache.ecs/META-INF/MANIFEST.MF
+++ b/org.apache.ecs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Apache ECS Library
Bundle-SymbolicName: org.apache.ecs
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-Activator: org.apache.ecs.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.apache.ecs/pom.xml b/org.apache.ecs/pom.xml
index 63d2b7084f..655033fba8 100644
--- a/org.apache.ecs/pom.xml
+++ b/org.apache.ecs/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.apache.ecs
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 8f556283c7..047f0dc5a9 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Oracle Provider
Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
@@ -19,3 +19,4 @@ Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator
Service-Component: OSGI-INF/*.xml
Automatic-Module-Name: org.compiere.db.oracle.provider
Bundle-Vendor: iDempiere Community
+Export-Package: org.adempiere.db.oracle.config
diff --git a/org.compiere.db.oracle.provider/pom.xml b/org.compiere.db.oracle.provider/pom.xml
index 1862959c0e..a33f43af8f 100644
--- a/org.compiere.db.oracle.provider/pom.xml
+++ b/org.compiere.db.oracle.provider/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.compiere.db.oracle.provider
@@ -41,7 +41,7 @@
com.oracle.database.jdbc
ojdbc10
- 19.8.0.0
+ 19.12.0.0
lib
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index 53e8257ef6..1b4f8e3fe8 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Postgresql Provider
Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Bundle-ClassPath: .,
@@ -18,3 +18,4 @@ Bundle-Activator: org.adempiere.db.postgresql.PostgreSQLBundleActivator
Service-Component: OSGI-INF/*.xml
Automatic-Module-Name: org.compiere.db.postgresql.provider
Bundle-Vendor: iDempiere Community
+Export-Package: org.adempiere.db.postgresql.config
diff --git a/org.compiere.db.postgresql.provider/pom.xml b/org.compiere.db.postgresql.provider/pom.xml
index 0f6160ffd7..8e970cabb0 100644
--- a/org.compiere.db.postgresql.provider/pom.xml
+++ b/org.compiere.db.postgresql.provider/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.compiere.db.postgresql.provider
@@ -36,7 +36,7 @@
org.postgresql
postgresql
- 42.2.18
+ 42.2.23
lib
diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml
index a4babf3efa..7b9a788d46 100644
--- a/org.compiere.db.provider-feature/feature.xml
+++ b/org.compiere.db.provider-feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/org.compiere.db.provider-feature/pom.xml b/org.compiere.db.provider-feature/pom.xml
index 743263ba76..c65e865f21 100644
--- a/org.compiere.db.provider-feature/pom.xml
+++ b/org.compiere.db.provider-feature/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.compiere.db.provider.feature
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index 24030ebaf0..68b0b1d4e5 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -2,7 +2,7 @@
@@ -18,7 +18,7 @@
-
-
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.eclipse.platform.feature
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 06f173c5d0..9defa02be9 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.16.0.v20200828-0759.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.16.300.v20210525-1715.jar
osgi.install.area=director
equinox.use.ds=true
osgi.bundles=org.eclipse.core.net@start,\
@@ -12,7 +12,7 @@ osgi.bundles=org.eclipse.core.net@start,\
org.eclipse.equinox.registry,\
org.eclipse.equinox.common@2:start,\
org.eclipse.equinox.preferences,\
- org.eclipse.equinox.ds@start,\
+ org.apache.felix.scr@start,\
org.eclipse.equinox.event,\
org.eclipse.equinox.frameworkadmin@start,\
org.eclipse.equinox.frameworkadmin.equinox,\
@@ -45,8 +45,8 @@ osgi.bundles=org.eclipse.core.net@start,\
org.sat4j.core,\
org.sat4j.pb,\
org.apache.commons.collections,\
- org.apache.commons.net,\
- org.apache.commons.codec,\
+ org.apache.commons.commons-net,\
+ org.apache.commons.commons-codec,\
org.apache.commons.logging,\
org.apache.httpcomponents.httpclient,\
org.apache.httpcomponents.httpcore,\
@@ -57,9 +57,10 @@ osgi.bundles=org.eclipse.core.net@start,\
org.eclipse.osgi@start,\
org.eclipse.osgi.services,\
org.eclipse.osgi.util,\
- org.apache.felix.scr,\
- org.eclipse.equinox.ds,\
- org.tukaani.xz
+ org.tukaani.xz,\
+ bcpg,\
+ bcutil,\
+ bcprov
osgi.framework.extensions=
osgi.bundles.defaultStartLevel=4
eclipse.p2.profile=DefaultProfile
diff --git a/org.idempiere.equinox.p2.director-feature/feature.xml b/org.idempiere.equinox.p2.director-feature/feature.xml
index cd8bc701b8..0585d503b2 100644
--- a/org.idempiere.equinox.p2.director-feature/feature.xml
+++ b/org.idempiere.equinox.p2.director-feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/org.idempiere.equinox.p2.director-feature/pom.xml b/org.idempiere.equinox.p2.director-feature/pom.xml
index 8d7295176d..71d027edf4 100644
--- a/org.idempiere.equinox.p2.director-feature/pom.xml
+++ b/org.idempiere.equinox.p2.director-feature/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.equinox.p2.director.feature
diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml
index d4096b2930..e6ac8b583a 100644
--- a/org.idempiere.felix.webconsole-feature/feature.xml
+++ b/org.idempiere.felix.webconsole-feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/org.idempiere.felix.webconsole-feature/pom.xml b/org.idempiere.felix.webconsole-feature/pom.xml
index 3eb8721dc6..f37cc5da32 100644
--- a/org.idempiere.felix.webconsole-feature/pom.xml
+++ b/org.idempiere.felix.webconsole-feature/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.felix.webconsole.feature
diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
index 5a08750a81..58b2c02bcc 100644
--- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
+++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Felix Web Console
Bundle-SymbolicName: org.idempiere.felix.webconsole
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-Activator: org.idempiere.felix.webconsole.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.idempiere.felix.webconsole/WEB-INF/web.xml b/org.idempiere.felix.webconsole/WEB-INF/web.xml
index 3441f9d0ab..14f10b7b7d 100644
--- a/org.idempiere.felix.webconsole/WEB-INF/web.xml
+++ b/org.idempiere.felix.webconsole/WEB-INF/web.xml
@@ -1,8 +1,8 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0">
Web Console
diff --git a/org.idempiere.felix.webconsole/pom.xml b/org.idempiere.felix.webconsole/pom.xml
index 714750f7b3..dfb5531f12 100644
--- a/org.idempiere.felix.webconsole/pom.xml
+++ b/org.idempiere.felix.webconsole/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.felix.webconsole
diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml
index 1eb27638d4..f8f83b8781 100644
--- a/org.idempiere.hazelcast.service-feature/feature.xml
+++ b/org.idempiere.hazelcast.service-feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/org.idempiere.hazelcast.service-feature/pom.xml b/org.idempiere.hazelcast.service-feature/pom.xml
index d509ca57bd..eb6182e50d 100644
--- a/org.idempiere.hazelcast.service-feature/pom.xml
+++ b/org.idempiere.hazelcast.service-feature/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.hazelcast.service.feature
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index f6542e4547..79aa1fdab9 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Hazelcast Service
Bundle-SymbolicName: org.idempiere.hazelcast.service
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-Activator: org.idempiere.hazelcast.service.Activator
Bundle-ActivationPolicy: lazy
Import-Package: javax.crypto,
diff --git a/org.idempiere.hazelcast.service/pom.xml b/org.idempiere.hazelcast.service/pom.xml
index c5967e1b93..42d78bdae4 100644
--- a/org.idempiere.hazelcast.service/pom.xml
+++ b/org.idempiere.hazelcast.service/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.hazelcast.service
@@ -26,12 +26,12 @@
com.hazelcast
hazelcast
- 3.11
+ 3.12.12
com.hazelcast
hazelcast-aws
- 2.3
+ 2.4
lib
diff --git a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/CacheConsoleProvider.java b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/CacheConsoleProvider.java
index e97d662678..4419aa3eef 100644
--- a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/CacheConsoleProvider.java
+++ b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/CacheConsoleProvider.java
@@ -53,7 +53,7 @@ public class CacheConsoleProvider implements CommandProvider {
sb.append("hazelcast ");
sb.append(member.getUuid());
sb.append(" Node Server: ");
- sb.append(member.getSocketAddress());
+ sb.append(member.getAddress());
sb.append("\n");
}
}
diff --git a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/ClusterMember.java b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/ClusterMember.java
index edd71d2f69..5aa13effad 100644
--- a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/ClusterMember.java
+++ b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/ClusterMember.java
@@ -39,6 +39,7 @@ public class ClusterMember implements IClusterMember {
this.port = port;
}
+ @SuppressWarnings("deprecation")
public ClusterMember(Member member) {
this.id = member.getUuid();
this.address = member.getSocketAddress().getAddress();
diff --git a/org.idempiere.javadoc/META-INF/MANIFEST.MF b/org.idempiere.javadoc/META-INF/MANIFEST.MF
index a8944a5aad..34bd75c1b3 100644
--- a/org.idempiere.javadoc/META-INF/MANIFEST.MF
+++ b/org.idempiere.javadoc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Javadoc Generator
Bundle-SymbolicName: org.idempiere.javadoc;singleton:=true
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-Vendor: iDempiere Community
Automatic-Module-Name: org.idempiere.javadoc
Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.idempiere.javadoc/build.properties b/org.idempiere.javadoc/build.properties
index 0174f77d06..bef6692cd6 100644
--- a/org.idempiere.javadoc/build.properties
+++ b/org.idempiere.javadoc/build.properties
@@ -24,4 +24,7 @@ jars.extra.classpath = platform:/plugin/org.adempiere.base/,\
platform:/plugin/org.idempiere.felix.webconsole/,\
platform:/plugin/org.idempiere.hazelcast.service/,\
platform:/plugin/org.idempiere.webservices/,\
- platform:/plugin/org.idempiere.zk.extra/
+ platform:/plugin/org.idempiere.zk.extra/,\
+ platform:/plugin/org.idempiere.keikai,\
+ platform:/plugin/org.idempiere.printformat.editor,\
+ platform:/plugin/org.idempiere.test
diff --git a/org.idempiere.javadoc/pom.xml b/org.idempiere.javadoc/pom.xml
index 37fa4151da..7985fa9dc6 100644
--- a/org.idempiere.javadoc/pom.xml
+++ b/org.idempiere.javadoc/pom.xml
@@ -8,7 +8,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
@@ -19,18 +19,18 @@
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.0.0
-
-
- parse-version
-
- parse-version
-
-
-
-
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.0.0
+
+
+ parse-version
+
+ parse-version
+
+
+
+
org.eclipse.tycho.extras
tycho-document-bundle-plugin
@@ -123,4 +123,4 @@
-
\ No newline at end of file
+
diff --git a/org.idempiere.jetty.osgi.boot.fragment/.project b/org.idempiere.jetty.osgi.boot.fragment/.project
new file mode 100644
index 0000000000..799f8e0153
--- /dev/null
+++ b/org.idempiere.jetty.osgi.boot.fragment/.project
@@ -0,0 +1,34 @@
+
+
+ org.idempiere.jetty.osgi.boot.fragment
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.m2e.core.maven2Nature
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/org.idempiere.jetty.osgi.boot.fragment/.settings/org.eclipse.core.resources.prefs b/org.idempiere.jetty.osgi.boot.fragment/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/org.idempiere.jetty.osgi.boot.fragment/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/=UTF-8
diff --git a/org.idempiere.jetty.osgi.boot.fragment/.settings/org.eclipse.m2e.core.prefs b/org.idempiere.jetty.osgi.boot.fragment/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/org.idempiere.jetty.osgi.boot.fragment/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.idempiere.jetty.osgi.boot.fragment/.settings/org.eclipse.pde.core.prefs b/org.idempiere.jetty.osgi.boot.fragment/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/org.idempiere.jetty.osgi.boot.fragment/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF b/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..88051d4983
--- /dev/null
+++ b/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jetty OSGI Boot Fragment
+Bundle-SymbolicName: org.idempiere.jetty.osgi.boot.fragment
+Bundle-Version: 9.0.0.qualifier
+Fragment-Host: org.eclipse.jetty.osgi.boot;bundle-version="10.0.6"
+Automatic-Module-Name: org.idempiere.jetty.logging.fragment
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.adempiere.base;bundle-version="9.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
new file mode 100644
index 0000000000..56d7765555
--- /dev/null
+++ b/org.idempiere.jetty.osgi.boot.fragment/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+ .
diff --git a/org.idempiere.jetty.osgi.boot.fragment/pom.xml b/org.idempiere.jetty.osgi.boot.fragment/pom.xml
new file mode 100644
index 0000000000..8ccb02cba5
--- /dev/null
+++ b/org.idempiere.jetty.osgi.boot.fragment/pom.xml
@@ -0,0 +1,13 @@
+
+ 4.0.0
+
+ org.idempiere
+ org.idempiere.parent
+ ${revision}
+ ../org.idempiere.parent/pom.xml
+
+ org.idempiere.jetty.osgi.boot.fragment
+ eclipse-plugin
+
\ No newline at end of file
diff --git a/org.idempiere.jetty.osgi.boot.fragment/src/org/idempiere/jetty/osgi/boot/fragment/FragmentActivator.java b/org.idempiere.jetty.osgi.boot.fragment/src/org/idempiere/jetty/osgi/boot/fragment/FragmentActivator.java
new file mode 100644
index 0000000000..ba2005dfac
--- /dev/null
+++ b/org.idempiere.jetty.osgi.boot.fragment/src/org/idempiere/jetty/osgi/boot/fragment/FragmentActivator.java
@@ -0,0 +1,50 @@
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source *
+ * http://www.idempiere.org *
+ * *
+ * Copyright (C) Contributors *
+ * *
+ * This program is free software; you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License *
+ * as published by the Free Software Foundation; either version 2 *
+ * of the License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the Free Software *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
+ * MA 02110-1301, USA. *
+ * *
+ * Contributors: *
+ * - hengsin *
+ **********************************************************************/
+package org.idempiere.jetty.osgi.boot.fragment;
+
+import org.compiere.Adempiere;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * Auto invoke by jetty.osgi.boot
+ * @author hengsin
+ *
+ */
+public class FragmentActivator implements BundleActivator {
+
+ public FragmentActivator() {
+ }
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ Adempiere.startup(false);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
diff --git a/org.idempiere.keikai/META-INF/MANIFEST.MF b/org.idempiere.keikai/META-INF/MANIFEST.MF
index 93b55988c5..ba4e588c4a 100644
--- a/org.idempiere.keikai/META-INF/MANIFEST.MF
+++ b/org.idempiere.keikai/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: zk keikai
Bundle-SymbolicName: org.idempiere.keikai
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Bundle-ClassPath: .,
lib/keikai-oss.jar,
lib/keikai-model-oss.jar,
lib/zpoi.jar,
- lib/ooxml-schemas.jar
+ lib/ooxml-schemas.jar,
+ lib/xmlbeans.jar
Export-Package: io.keikai.api,
io.keikai.api.impl,
io.keikai.api.model,
@@ -186,8 +187,8 @@ Require-Bundle: zcommon,
zul,
zweb,
zjavassist,
- org.apache.commons.fileupload;bundle-version="1.2.2",
- org.adempiere.base;bundle-version="8.2.0"
+ org.apache.commons.commons-fileupload;bundle-version="1.4.0",
+ org.adempiere.base;bundle-version="9.0.0"
Import-Package: javax.imageio,
javax.servlet;version="3.1.0",
javax.servlet.annotation;version="3.1.0",
@@ -195,9 +196,6 @@ Import-Package: javax.imageio,
javax.servlet.http;version="3.1.0",
org.apache.commons.codec.binary;version="1.13.0",
org.apache.commons.codec.digest;version="1.13.0",
- org.apache.xmlbeans,
- org.apache.xmlbeans.impl.schema,
- org.apache.xmlbeans.impl.values,
org.dom4j;version="2.1.1",
org.dom4j.io;version="2.1.1",
org.osgi.service.component;version="1.4.0",
@@ -208,7 +206,7 @@ Import-Package: javax.imageio,
org.w3c.dom
Automatic-Module-Name: org.idempiere.keikai
Bundle-Vendor: iDempiere Community
-Service-Component: OSGI-INF/org.idempiere.keikai.view.KeikaiMediaViewProvider.xml
Bundle-ActivationPolicy: lazy
-Fragment-Host: org.adempiere.ui.zk;bundle-version="8.2.0"
+Fragment-Host: org.adempiere.ui.zk;bundle-version="9.0.0"
Jetty-WarPatchFragmentFolderPath: /
+Service-Component: OSGI-INF/org.idempiere.keikai.view.KeikaiMediaViewProvider.xml
diff --git a/org.idempiere.keikai/build.properties b/org.idempiere.keikai/build.properties
index f0f18240ed..8cf540b308 100644
--- a/org.idempiere.keikai/build.properties
+++ b/org.idempiere.keikai/build.properties
@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
lib/keikai-model-oss.jar,\
lib/zpoi.jar,\
OSGI-INF/,\
- lib/ooxml-schemas.jar
+ lib/ooxml-schemas.jar,\
+ lib/xmlbeans.jar
diff --git a/org.idempiere.keikai/pom.xml b/org.idempiere.keikai/pom.xml
index b03c8ee991..7e51e84a76 100644
--- a/org.idempiere.keikai/pom.xml
+++ b/org.idempiere.keikai/pom.xml
@@ -5,7 +5,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.keikai
@@ -44,6 +44,11 @@
ooxml-schemas
1.4
+
+ org.apache.xmlbeans
+ xmlbeans
+ 2.6.0
+
lib
true
diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
index 40df245832..a86982c772 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
@@ -3,7 +3,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../../org.idempiere.parent/pom.xml
4.0.0
diff --git a/org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml
index ba72739c15..587c15cf14 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml
@@ -3,7 +3,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../../org.idempiere.parent/pom.xml
4.0.0
diff --git a/org.idempiere.p2.repackaged/README.md b/org.idempiere.p2.repackaged/README.md
new file mode 100644
index 0000000000..7cd193ea84
--- /dev/null
+++ b/org.idempiere.p2.repackaged/README.md
@@ -0,0 +1,24 @@
+# repackage osgi bundles
+Repackage osgi bundles to fix MANIFEST.MF issues
+
+##Usage:
+* mvn verify
+* Create a new version folder at binary.file/p2.repackaged, for e.g 9.0.0. Copy all files at target/repository to the newly created folder.
+* Add, commit and push the files added to binary.file/p2.repackaged.
+* To update, just remove everything at binary.file/p2.repackaged (for e.g, binary.file/p2.repackaged/9.0.0) and copy latest output contents from target repository.
+
+##Bundles:
+* org.atmosphere:atmosphere-runtime:2.7.2
+ * Make all Import-Package optional. This remove dependency that iDempiere doesn't use.
+* jakarta.xml.ws:jakarta.xml.ws-api:2.3.3
+ * Remove Private-Package header and do not re-import exported packages. Fix access restriction issue.
+* com.sun.xml.fastinfoset:FastInfoset:1.2.18
+ * Do not re-import exported packages. Fix version conflict with FastInfoset 2.
+* org.apache.felix:org.apache.felix.webconsole:4.6.4
+ * Remove version constraint from Import-Package of javax.servlet.*. This make it run under Servlet 4.
+* com.google.guava:guava:30.1.1-jre
+ * Remove version constraint from Import-Package of javax.annotation. This remove depency to org.jsr305 that iDempeire doesn't use and causes conflict with jakarta.annotation bundle.
+* com.google.http-client:google-http-client:1.39.2-sp.1
+ * Remove version constraint from Import-Package of javax.annotation. This remove depency to org.jsr305 that iDempeire doesn't use and causes conflict with jakarta.annotation bundle.
+* org.apache.poi:poi-ooxml-schemas:4.1.2
+ * Add missing org.apache.xmlbeans.impl.schema Import-Package.
diff --git a/org.idempiere.p2.repackaged/pom.xml b/org.idempiere.p2.repackaged/pom.xml
new file mode 100644
index 0000000000..89c061d41f
--- /dev/null
+++ b/org.idempiere.p2.repackaged/pom.xml
@@ -0,0 +1,256 @@
+
+ 4.0.0
+ org.idempiere
+ repackaged
+ pom
+ 9.0.0
+
+
+
+ Central
+ https://repo1.maven.org/maven2
+
+
+
+
+ ${maven.build.timestamp}
+ yyyyMMddHHmm
+ 2.7.2
+ 2.3.3
+ 1.2.18
+ 4.6.4
+ 30.1.1-jre
+ 1.39.2-sp.1
+ 4.1.2
+
+
+
+
+ org.reficio
+ p2-maven-plugin
+ 1.7.0
+
+
+ default-cli
+ package
+
+ site
+
+
+ false
+ false
+
+
+ org.idempiere.repackaged.feature
+ ${project.version}
+
+ iDempiere
+ maven artifact repackaged as osgi bundle
+ Idempiere
+ GPL v2.1
+ true
+
+
+ org.atmosphere:atmosphere-runtime:${atmosphere-runtime.version}
+
+ false
+ true
+
+ *;resolution:=optional
+ *;version="${atmosphere-runtime.version}";-noimport:=true
+ ${atmosphere-runtime.version}.v${maven.build.timestamp}
+ osgi.serviceloader;osgi.serviceloader="javax.servl
+ et.ServletContainerInitializer",osgi.serviceloader;osgi.serviceloader
+ ="org.atmosphere.inject.CDIProducer",osgi.serviceloader;osgi.servicel
+ oader="org.atmosphere.inject.Injectable"
+
+
+
+
+
+
+ jakarta.xml.ws:jakarta.xml.ws-api:${xml.ws-api.version}
+
+ false
+ true
+
+ org.glassfish.hk2.osgiresourcelocator
+ *;resolution:=optional
+ *;version="${xml.ws-api.version}";-noimport:=true
+ <_removeheaders>Private-Package
+ ${xml.ws-api.version}.v${maven.build.timestamp}
+
+
+
+ com.sun.xml.fastinfoset:FastInfoset:${fastinfoset.version}
+
+ false
+ true
+
+ *;resolution:=optional
+ *;version="${fastinfoset.version}";-noimport:=true
+ ${fastinfoset.version}.v${maven.build.timestamp}
+
+
+
+ org.apache.felix:org.apache.felix.webconsole:${webconsole.version}
+
+ false
+ true
+
+
+
+
+ <_removeheaders>Private-Package
+ ${webconsole.version}.v${maven.build.timestamp}
+
+ org.apache.felix.webconsole.internal.OsgiManagerActivator
+
+
+
+
+ com.google.guava:guava:${guava.version}
+
+ false
+ true
+
+
+
+ ${guava.version}.v${maven.build.timestamp}
+
+
+
+ com.google.http-client:google-http-client:${google-http-client.version}
+
+ false
+ true
+
+
+
+ ${google-http-client.version}.v${maven.build.timestamp}
+
+
+
+ org.apache.poi:poi-ooxml-schemas:${poi.version}
+
+ false
+ true
+
+ com.microsoft.schemas.office.powerpoint;resolution:=op
+ tional,com.microsoft.schemas.office.word;resolution:=optional,javax.x
+ ml.namespace;resolution:=optional,javax.xml.stream;resolution:=option
+ al,org.apache.xmlbeans;resolution:=optional,org.apache.xmlbeans.impl.
+ values;resolution:=optional,org.apache.xmlbeans.impl.xb.xmlschema;res
+ olution:=optional,org.apache.xmlbeans.xml.stream;resolution:=optional
+ ,org.openxmlformats.schemas.officeDocument.x2006.math;resolution:=opt
+ ional,org.openxmlformats.schemas.schemaLibrary.x2006.main;resolution:
+ =optional,org.w3c.dom;resolution:=optional
+ ,org.apache.xmlbeans.impl.schema;resolution:=optional
+
+ *;version="${poi.version}";-noimport:=true
+ ${poi.version}.v${maven.build.timestamp}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index 97f6a01f28..0c53948298 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -1,48 +1,13 @@
-
- com.google.http-client
- google-http-client-gson
- 1.38.1
+
+
+ com.google.code.gson
+ gson
+ 2.8.6
jar
-
-
- com.google.http-client
- google-http-client
- 1.38.1
- jar
-
-
- com.google.oauth-client
- google-oauth-client
- 1.31.4
- jar
-
-
- io.grpc
- grpc-context
- 1.35.0
- jar
-
-
- io.opencensus
- opencensus-contrib-http-util
- 0.28.3
- jar
-
-
- io.opencensus
- opencensus-api
- 0.28.3
- jar
-
-
- com.google.guava
- guava
- 30.1.1-jre
- jar
-
+
com.google.guava
failureaccess
@@ -50,123 +15,1249 @@
jar
- com.google.code.findbugs
- jsr305
- 3.0.2
+ com.google.http-client
+ google-http-client-gson
+ 1.39.2-sp.1
jar
+
- com.fasterxml.jackson.core
- jackson-annotations
- 2.12.3
+ com.google.j2objc
+ j2objc-annotations
+ 1.3
+ jar
+
+
+
+ io.opencensus
+ opencensus-api
+ 0.28.0
jar
+
- com.fasterxml.jackson.core
- jackson-core
- 2.12.3
+ io.opencensus
+ opencensus-contrib-http-util
+ 0.28.0
jar
+
- com.fasterxml.jackson.core
- jackson-databind
- 2.12.3
+ com.google.oauth-client
+ google-oauth-client
+ 1.31.5
jar
+
+ com.google.zxing
+ javase
+ 3.4.1
+ jar
+
+
+
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
- 2.12.3
+ 2.12.4
jar
com.fasterxml.jackson.datatype
jackson-datatype-guava
- 2.12.3
+ 2.12.4
jar
-
+
com.fasterxml.jackson.datatype
jackson-datatype-joda
- 2.12.3
+ 2.12.4
jar
-
+
com.fasterxml.jackson.datatype
jackson-datatype-json-org
- 2.12.3
- jar
-
-
- com.fasterxml.jackson.jaxrs
- jackson-jaxrs-base
- 2.12.3
+ 2.12.4
jar
com.fasterxml.jackson.jaxrs
jackson-jaxrs-json-provider
- 2.12.3
+ 2.12.4
jar
com.fasterxml.jackson.jaxrs
- jackson-jaxrs-xml-provider
- 2.12.3
+ jackson-jaxrs-base
+ 2.12.4
jar
com.fasterxml.jackson.module
jackson-module-jaxb-annotations
- 2.12.3
+ 2.12.4
+ jar
+
+
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-xml-provider
+ 2.12.4
jar
com.fasterxml.jackson.module
jackson-module-jsonSchema
- 2.12.3
+ 2.12.4
jar
- org.json
- json
- 20190722
+ com.fasterxml.woodstox
+ woodstox-core
+ 6.2.6
jar
-
-
- javax.validation
- validation-api
- 1.1.0.Final
- jar
-
+
+
dev.samstevens.totp
totp
1.7.1
jar
-
-
- com.google.zxing
- javase
- 3.4.1
- jar
-
+
+
+
org.antlr
antlr4-runtime
4.9.2
jar
-
- com.github.librepdf
- openpdf
- 1.3.26
- jar
-
-
+
+
com.github.librepdf
openpdf-fonts-extra
1.3.26
jar
+
+
+ com.sun.xml.fastinfoset
+ FastInfoset
+ 2.0.0
+ jar
+
+
+ com.sun.org.apache.xml.internal
+ resolver
+ 20050927
+ jar
+
+
+
+
+ com.sun.istack
+ istack-commons-runtime
+ 3.0.12
+ jar
+
+
+ com.sun.xml.ws
+ policy
+ 2.7.10
+ jar
+
+
+ com.sun.xml.ws
+ jaxws-rt
+ 2.3.5
+ jar
+
+
+ com.sun.net.httpserver
+ http
+ 20070405
+ jar
+
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.3.5
+ jar
+
+
+ com.sun.xml.stream.buffer
+ streambuffer
+ 1.5.10
+ jar
+
+
+ org.glassfish.external
+ management-api
+ 3.2.3
+ jar
+
+
+ org.glassfish.ha
+ ha-api
+ 3.1.13
+ jar
+
+
+ com.sun.xml.bind.external
+ rngom
+ 2.3.5
+ jar
+
+
+
+ com.sun.mail
+ gimap
+ 1.6.7
+ jar
+
+
+ com.sun.mail
+ jakarta.mail
+ 1.6.7
+ jar
+
+
+
+ org.glassfish.jaxb
+ txw2
+ 2.3.5
+ jar
+
+
+ org.glassfish.gmbal
+ gmbal
+ 4.0.3
+ jar
+
+
+ org.glassfish.pfl
+ pfl-tf
+ 4.1.2
+ jar
+
+
+ org.glassfish.pfl
+ pfl-asm
+ 4.1.0
+ jar
+
+
+
+ javax.validation
+ validation-api
+ 1.1.0.Final
+ jar
+
+
+ javax.enterprise
+ cdi-api
+ 2.0.SP1
+ jar
+
+
+ javax.interceptor
+ javax.interceptor-api
+ 1.2.2
+ jar
+
+
+ javax.websocket
+ javax.websocket-api
+ 1.1
+ jar
+
+
+
+ jakarta.jws
+ jakarta.jws-api
+ 2.1.0
+ jar
+
+
+ jakarta.persistence
+ jakarta.persistence-api
+ 2.2.3
+ jar
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ 2.3.3
+ jar
+
+
+
+ org.bouncycastle
+ bcpg-jdk15on
+ 1.69
+ jar
+
+
+ org.bouncycastle
+ bcmail-jdk15on
+ 1.69
+ jar
+
+
+ org.bouncycastle
+ bctsp-jdk15on
+ 1.46
+ jar
+
+
+ org.bouncycastle
+ bcpg-jdk15on
+ 1.46
+ jar
+
+
+ org.passay
+ passay
+ 1.6.1
+ jar
+
+
+ org.cryptacular
+ cryptacular
+ 1.2.4
+ jar
+
+
+
+ com.diffplug.osgi
+ com.diffplug.osgi.extension.sun.misc
+ 0.0.0
+ jar
+
+
+
+ com.ibm.icu
+ icu4j
+ 69.1
+ jar
+
+
+
+ org.codehaus.groovy
+ groovy-console
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-datetime
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-json
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-jsr223
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-nio
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-sql
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-xml
+ 3.0.8
+ jar
+
+
+
+ net.sf.jasperreports
+ jasperreports
+ 6.17.0
+ jar
+
+
+
+ net.sf.supercsv
+ super-csv
+ 2.4.0
+ jar
+
+
+
+ org.apache.activemq
+ activemq-broker
+ 5.16.3
+ jar
+
+
+
+ org.apache.activemq
+ activemq-client
+ 5.16.3
+ jar
+
+
+
+ org.apache.geronimo.specs
+ geronimo-j2ee-management_1.1_spec
+ 1.0.1
+ jar
+
+
+ org.apache.geronimo.specs
+ geronimo-jms_1.1_spec
+ 1.1.1
+ jar
+
+
+ org.fusesource.hawtbuf
+ hawtbuf
+ 1.11
+ jar
+
+
+ com.thoughtworks.xstream
+ xstream
+ 1.4.17
+ jar
+
+
+ org.apache.activemq
+ activemq-jaas
+ 5.16.3
+ jar
+
+
+
+ org.apache.activemq
+ activemq-openwire-legacy
+ 5.16.3
+ jar
+
+
+
+ org.apache.activemq
+ activemq-kahadb-store
+ 5.16.3
+ jar
+
+
+
+ org.apache.activemq.protobuf
+ activemq-protobuf
+ 1.1
+ jar
+
+
+
+
+ org.apache.aries.spifly
+ org.apache.aries.spifly.dynamic.bundle
+ 1.3.3
+ jar
+
+
+ org.apache.aries
+ org.apache.aries.util
+ 1.1.3
+ jar
+
+
+ biz.aQute.bnd
+ biz.aQute.bndlib
+ 5.3.0
+ jar
+
+
+
+ commons-beanutils
+ commons-beanutils
+ 1.9.4
+ jar
+
+
+ commons-collections
+ commons-collections
+ 3.2.2
+ jar
+
+
+ org.apache.commons
+ commons-collections4
+ 4.4
+ jar
+
+
+ org.apache.commons
+ commons-compress
+ 1.21
+ jar
+
+
+ org.apache.commons
+ commons-configuration2
+ 2.7
+ jar
+
+
+ commons-fileupload
+ commons-fileupload
+ 1.4
+ jar
+
+
+ commons-io
+ commons-io
+ 2.11.0
+ jar
+
+
+ commons-lang
+ commons-lang
+ 2.6
+ jar
+
+
+ org.apache.commons
+ commons-lang3
+ 3.12.0
+ jar
+
+
+ commons-logging
+ commons-logging
+ 1.2
+ jar
+
+
+ commons-net
+ commons-net
+ 3.8.0
+ jar
+
+
+ org.apache.commons
+ commons-text
+ 1.9
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-frontend-jaxrs
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-security
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-transports-http
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-frontend-jaxws
+ 3.4.4
+ jar
+
+
+ com.sun.activation
+ jakarta.activation
+ 1.2.2
+ jar
+
+
+ com.sun.xml.messaging.saaj
+ saaj-impl
+ 1.5.3
+ jar
+
+
+ org.apache.cxf
+ cxf-core
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-bindings-soap
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-bindings-xml
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-frontend-simple
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-ws-addr
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-wsdl
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-ws-policy
+ 3.4.4
+ jar
+
+
+ org.apache.neethi
+ neethi
+ 3.1.1
+ jar
+
+
+ wsdl4j
+ wsdl4j
+ 1.6.3
+ jar
+
+
+
+ org.jboss.spec.javax.rmi
+ jboss-rmi-api_1.0_spec
+ 1.0.6.Final
+ jar
+
+
+ xml-resolver
+ xml-resolver
+ 1.2
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-rs-service-description
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-ws-transfer
+ 3.4.4
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-transports-local
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-databinding-jaxb
+ 3.4.4
+ jar
+
+
+ org.apache.ws.xmlschema
+ xmlschema-core
+ 2.2.5
+ jar
+
+
+ org.codehaus.woodstox
+ stax2-api
+ 4.2.1
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-databinding-xmlbeans
+ 3.1.18
+ jar
+
+
+ org.apache.xmlbeans
+ xmlbeans
+ 3.1.0
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-bindings-object
+ 3.1.18
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-rs-extension-providers
+ 3.1.18
+ jar
+
+
+ org.dom4j
+ dom4j
+ 2.1.3
+ jar
+
+
+
+
+ org.apache.felix
+ org.osgi.service.obr
+ 1.0.2
+ jar
+
+
+
+ org.apache.poi
+ poi
+ 4.1.2
+ jar
+
+
+
+ com.zaxxer
+ SparseBitSet
+ 1.2
+ jar
+
+
+
+ commons-codec
+ commons-codec
+ 1.14
+ jar
+
+
+ org.apache.commons
+ commons-math3
+ 3.6.1
+ jar
+
+
+ org.apache.poi
+ poi-ooxml
+ 4.1.2
+ jar
+
+
+
+ com.github.virtuald
+ curvesapi
+ 1.06
+ jar
+
+
+
+ de.rototor.pdfbox
+ graphics2d
+ 0.30
+ jar
+
+
+
+ org.apache.santuario
+ xmlsec
+ 2.2.1
+ jar
+
+
+ org.apache.xmlgraphics
+ xmlgraphics-commons
+ 2.6
+ jar
+
+
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.cglib
+ 3.3.0_1
+ jar
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.jaxen
+ 1.1.6_1
+ jar
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.rhino
+ 1.7.13_1
+ jar
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.xerces
+ 2.12.1_1
+ jar
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.batik
+ 1.14_1
+ jar
+
+
+
+ org.springframework
+ spring-web
+ 5.2.15.RELEASE
+ jar
+
+
+
+ org.springframework
+ spring-context
+ 5.2.15.RELEASE
+ jar
+
+
+
+ org.springframework
+ spring-context-support
+ 5.2.15.RELEASE
+ jar
+
+
+
+
+ org.glassfish.jersey.core
+ jersey-server
+ 2.34
+ jar
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ 2.34
+ jar
+
+
+ org.glassfish.jersey.ext
+ jersey-entity-filtering
+ 2.34
+ jar
+
+
+ org.glassfish.jersey.media
+ jersey-media-json-jackson
+ 2.34
+ jar
+
+
+ org.glassfish.jersey.containers
+ jersey-container-servlet-core
+ 2.34
+ jar
+
+
+
+ org.jfree
+ jfreechart
+ 1.5.3
+ jar
+
+
+
+ org.jfree
+ jcommon
+ 1.0.24
+ jar
+
+
+
+
+ org.zkoss
+ zsoup
+ 1.8.2.5
+ jar
+
+
+
+ org.eclipse.jetty
+ jetty-servlets
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ apache-jsp
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ apache-jstl
+ 10.0.6
+ jar
+
+
+ org.mortbay.jasper
+ apache-el
+ 9.0.29
+ jar
+
+
+ org.eclipse.jetty
+ jetty-client
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-jmx
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-plus
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-deploy
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-jndi
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-util-ajax
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-jaas
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-rewrite
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-slf4j-impl
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-osgi-boot
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-osgi-boot-jsp
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-osgi-boot-warurl
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-osgi-boot-warurl
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-httpservice
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.websocket
+ websocket-jetty-server
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.websocket
+ websocket-javax-server
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.websocket
+ websocket-javax-common
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.websocket
+ websocket-core-server
+ 10.0.6
+ jar
+
+
+
+ org.slf4j
+ slf4j-jcl
+ 1.7.30
+ jar
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.30
+ jar
+
+
+
+ org.apache.lucene
+ lucene-core
+ 8.4.1
+ jar
+
+
+
+ org.apache.lucene
+ lucene-analyzers-common
+ 8.4.1
+ jar
+
+
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 795d12d4e4..f27d9cd1b9 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,374 +1,146 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
-
- com.google.http-client
- google-http-client-gson
- 1.38.1
+
+
+
+
+
+
+
+
+
+
+ com.google.code.gson
+ gson
+ 2.8.6
jar
-
-
- com.google.http-client
- google-http-client
- 1.38.1
- jar
-
-
- com.google.oauth-client
- google-oauth-client
- 1.31.4
- jar
-
-
- io.grpc
- grpc-context
- 1.35.0
- jar
-
-
- io.opencensus
- opencensus-contrib-http-util
- 0.28.3
- jar
-
-
- io.opencensus
- opencensus-api
- 0.28.3
- jar
-
-
- com.google.guava
- guava
- 30.1.1-jre
- jar
-
+
com.google.guava
failureaccess
@@ -376,124 +148,1250 @@
jar
- com.google.code.findbugs
- jsr305
- 3.0.2
+ com.google.http-client
+ google-http-client-gson
+ 1.39.2-sp.1
jar
+
- com.fasterxml.jackson.core
- jackson-annotations
- 2.12.3
+ com.google.j2objc
+ j2objc-annotations
+ 1.3
+ jar
+
+
+
+ io.opencensus
+ opencensus-api
+ 0.28.0
jar
+
- com.fasterxml.jackson.core
- jackson-core
- 2.12.3
+ io.opencensus
+ opencensus-contrib-http-util
+ 0.28.0
jar
+
- com.fasterxml.jackson.core
- jackson-databind
- 2.12.3
+ com.google.oauth-client
+ google-oauth-client
+ 1.31.5
jar
+
+ com.google.zxing
+ javase
+ 3.4.1
+ jar
+
+
+
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
- 2.12.3
+ 2.12.4
jar
com.fasterxml.jackson.datatype
jackson-datatype-guava
- 2.12.3
+ 2.12.4
jar
-
+
com.fasterxml.jackson.datatype
jackson-datatype-joda
- 2.12.3
+ 2.12.4
jar
-
+
com.fasterxml.jackson.datatype
jackson-datatype-json-org
- 2.12.3
- jar
-
-
- com.fasterxml.jackson.jaxrs
- jackson-jaxrs-base
- 2.12.3
+ 2.12.4
jar
com.fasterxml.jackson.jaxrs
jackson-jaxrs-json-provider
- 2.12.3
+ 2.12.4
jar
com.fasterxml.jackson.jaxrs
- jackson-jaxrs-xml-provider
- 2.12.3
+ jackson-jaxrs-base
+ 2.12.4
jar
com.fasterxml.jackson.module
jackson-module-jaxb-annotations
- 2.12.3
+ 2.12.4
+ jar
+
+
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-xml-provider
+ 2.12.4
jar
com.fasterxml.jackson.module
jackson-module-jsonSchema
- 2.12.3
+ 2.12.4
jar
- org.json
- json
- 20190722
+ com.fasterxml.woodstox
+ woodstox-core
+ 6.2.6
jar
-
-
- javax.validation
- validation-api
- 1.1.0.Final
- jar
-
+
+
dev.samstevens.totp
totp
1.7.1
jar
-
-
- com.google.zxing
- javase
- 3.4.1
- jar
-
+
+
+
org.antlr
antlr4-runtime
4.9.2
jar
-
- com.github.librepdf
- openpdf
- 1.3.26
- jar
-
-
+
+
com.github.librepdf
openpdf-fonts-extra
1.3.26
jar
+
+
+ com.sun.xml.fastinfoset
+ FastInfoset
+ 2.0.0
+ jar
+
+
+ com.sun.org.apache.xml.internal
+ resolver
+ 20050927
+ jar
+
+
+
+
+ com.sun.istack
+ istack-commons-runtime
+ 3.0.12
+ jar
+
+
+ com.sun.xml.ws
+ policy
+ 2.7.10
+ jar
+
+
+ com.sun.xml.ws
+ jaxws-rt
+ 2.3.5
+ jar
+
+
+ com.sun.net.httpserver
+ http
+ 20070405
+ jar
+
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.3.5
+ jar
+
+
+ com.sun.xml.stream.buffer
+ streambuffer
+ 1.5.10
+ jar
+
+
+ org.glassfish.external
+ management-api
+ 3.2.3
+ jar
+
+
+ org.glassfish.ha
+ ha-api
+ 3.1.13
+ jar
+
+
+ com.sun.xml.bind.external
+ rngom
+ 2.3.5
+ jar
+
+
+
+ com.sun.mail
+ gimap
+ 1.6.7
+ jar
+
+
+ com.sun.mail
+ jakarta.mail
+ 1.6.7
+ jar
+
+
+
+ org.glassfish.jaxb
+ txw2
+ 2.3.5
+ jar
+
+
+ org.glassfish.gmbal
+ gmbal
+ 4.0.3
+ jar
+
+
+ org.glassfish.pfl
+ pfl-tf
+ 4.1.2
+ jar
+
+
+ org.glassfish.pfl
+ pfl-asm
+ 4.1.0
+ jar
+
+
+
+ javax.validation
+ validation-api
+ 1.1.0.Final
+ jar
+
+
+ javax.enterprise
+ cdi-api
+ 2.0.SP1
+ jar
+
+
+ javax.interceptor
+ javax.interceptor-api
+ 1.2.2
+ jar
+
+
+ javax.websocket
+ javax.websocket-api
+ 1.1
+ jar
+
+
+
+ jakarta.jws
+ jakarta.jws-api
+ 2.1.0
+ jar
+
+
+ jakarta.persistence
+ jakarta.persistence-api
+ 2.2.3
+ jar
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ 2.3.3
+ jar
+
+
+
+ org.bouncycastle
+ bcpg-jdk15on
+ 1.69
+ jar
+
+
+ org.bouncycastle
+ bcmail-jdk15on
+ 1.69
+ jar
+
+
+ org.bouncycastle
+ bctsp-jdk15on
+ 1.46
+ jar
+
+
+ org.bouncycastle
+ bcpg-jdk15on
+ 1.46
+ jar
+
+
+ org.passay
+ passay
+ 1.6.1
+ jar
+
+
+ org.cryptacular
+ cryptacular
+ 1.2.4
+ jar
+
+
+
+ com.diffplug.osgi
+ com.diffplug.osgi.extension.sun.misc
+ 0.0.0
+ jar
+
+
+
+ com.ibm.icu
+ icu4j
+ 69.1
+ jar
+
+
+
+ org.codehaus.groovy
+ groovy-console
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-datetime
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-json
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-jsr223
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-nio
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-sql
+ 3.0.8
+ jar
+
+
+ org.codehaus.groovy
+ groovy-xml
+ 3.0.8
+ jar
+
+
+
+ net.sf.jasperreports
+ jasperreports
+ 6.17.0
+ jar
+
+
+
+ net.sf.supercsv
+ super-csv
+ 2.4.0
+ jar
+
+
+
+ org.apache.activemq
+ activemq-broker
+ 5.16.3
+ jar
+
+
+
+ org.apache.activemq
+ activemq-client
+ 5.16.3
+ jar
+
+
+
+ org.apache.geronimo.specs
+ geronimo-j2ee-management_1.1_spec
+ 1.0.1
+ jar
+
+
+ org.apache.geronimo.specs
+ geronimo-jms_1.1_spec
+ 1.1.1
+ jar
+
+
+ org.fusesource.hawtbuf
+ hawtbuf
+ 1.11
+ jar
+
+
+ com.thoughtworks.xstream
+ xstream
+ 1.4.17
+ jar
+
+
+ org.apache.activemq
+ activemq-jaas
+ 5.16.3
+ jar
+
+
+
+ org.apache.activemq
+ activemq-openwire-legacy
+ 5.16.3
+ jar
+
+
+
+ org.apache.activemq
+ activemq-kahadb-store
+ 5.16.3
+ jar
+
+
+
+ org.apache.activemq.protobuf
+ activemq-protobuf
+ 1.1
+ jar
+
+
+
+
+ org.apache.aries.spifly
+ org.apache.aries.spifly.dynamic.bundle
+ 1.3.3
+ jar
+
+
+ org.apache.aries
+ org.apache.aries.util
+ 1.1.3
+ jar
+
+
+ biz.aQute.bnd
+ biz.aQute.bndlib
+ 5.3.0
+ jar
+
+
+
+ commons-beanutils
+ commons-beanutils
+ 1.9.4
+ jar
+
+
+ commons-collections
+ commons-collections
+ 3.2.2
+ jar
+
+
+ org.apache.commons
+ commons-collections4
+ 4.4
+ jar
+
+
+ org.apache.commons
+ commons-compress
+ 1.21
+ jar
+
+
+ org.apache.commons
+ commons-configuration2
+ 2.7
+ jar
+
+
+ commons-fileupload
+ commons-fileupload
+ 1.4
+ jar
+
+
+ commons-io
+ commons-io
+ 2.11.0
+ jar
+
+
+ commons-lang
+ commons-lang
+ 2.6
+ jar
+
+
+ org.apache.commons
+ commons-lang3
+ 3.12.0
+ jar
+
+
+ commons-logging
+ commons-logging
+ 1.2
+ jar
+
+
+ commons-net
+ commons-net
+ 3.8.0
+ jar
+
+
+ org.apache.commons
+ commons-text
+ 1.9
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-frontend-jaxrs
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-security
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-transports-http
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-frontend-jaxws
+ 3.4.4
+ jar
+
+
+ com.sun.activation
+ jakarta.activation
+ 1.2.2
+ jar
+
+
+ com.sun.xml.messaging.saaj
+ saaj-impl
+ 1.5.3
+ jar
+
+
+ org.apache.cxf
+ cxf-core
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-bindings-soap
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-bindings-xml
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-frontend-simple
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-ws-addr
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-wsdl
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-ws-policy
+ 3.4.4
+ jar
+
+
+ org.apache.neethi
+ neethi
+ 3.1.1
+ jar
+
+
+ wsdl4j
+ wsdl4j
+ 1.6.3
+ jar
+
+
+
+ org.jboss.spec.javax.rmi
+ jboss-rmi-api_1.0_spec
+ 1.0.6.Final
+ jar
+
+
+ xml-resolver
+ xml-resolver
+ 1.2
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-rs-service-description
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-ws-transfer
+ 3.4.4
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-transports-local
+ 3.4.4
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-databinding-jaxb
+ 3.4.4
+ jar
+
+
+ org.apache.ws.xmlschema
+ xmlschema-core
+ 2.2.5
+ jar
+
+
+ org.codehaus.woodstox
+ stax2-api
+ 4.2.1
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-databinding-xmlbeans
+ 3.1.18
+ jar
+
+
+ org.apache.xmlbeans
+ xmlbeans
+ 3.1.0
+ jar
+
+
+
+ org.apache.cxf
+ cxf-rt-bindings-object
+ 3.1.18
+ jar
+
+
+ org.apache.cxf
+ cxf-rt-rs-extension-providers
+ 3.1.18
+ jar
+
+
+ org.dom4j
+ dom4j
+ 2.1.3
+ jar
+
+
+
+
+ org.apache.felix
+ org.osgi.service.obr
+ 1.0.2
+ jar
+
+
+
+ org.apache.poi
+ poi
+ 4.1.2
+ jar
+
+
+
+ com.zaxxer
+ SparseBitSet
+ 1.2
+ jar
+
+
+
+ commons-codec
+ commons-codec
+ 1.14
+ jar
+
+
+ org.apache.commons
+ commons-math3
+ 3.6.1
+ jar
+
+
+ org.apache.poi
+ poi-ooxml
+ 4.1.2
+ jar
+
+
+
+ com.github.virtuald
+ curvesapi
+ 1.06
+ jar
+
+
+
+ de.rototor.pdfbox
+ graphics2d
+ 0.30
+ jar
+
+
+
+ org.apache.santuario
+ xmlsec
+ 2.2.1
+ jar
+
+
+ org.apache.xmlgraphics
+ xmlgraphics-commons
+ 2.6
+ jar
+
+
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.cglib
+ 3.3.0_1
+ jar
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.jaxen
+ 1.1.6_1
+ jar
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.rhino
+ 1.7.13_1
+ jar
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.xerces
+ 2.12.1_1
+ jar
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.batik
+ 1.14_1
+ jar
+
+
+
+ org.springframework
+ spring-web
+ 5.2.15.RELEASE
+ jar
+
+
+
+ org.springframework
+ spring-context
+ 5.2.15.RELEASE
+ jar
+
+
+
+ org.springframework
+ spring-context-support
+ 5.2.15.RELEASE
+ jar
+
+
+
+
+ org.glassfish.jersey.core
+ jersey-server
+ 2.34
+ jar
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ 2.34
+ jar
+
+
+ org.glassfish.jersey.ext
+ jersey-entity-filtering
+ 2.34
+ jar
+
+
+ org.glassfish.jersey.media
+ jersey-media-json-jackson
+ 2.34
+ jar
+
+
+ org.glassfish.jersey.containers
+ jersey-container-servlet-core
+ 2.34
+ jar
+
+
+
+ org.jfree
+ jfreechart
+ 1.5.3
+ jar
+
+
+
+ org.jfree
+ jcommon
+ 1.0.24
+ jar
+
+
+
+
+ org.zkoss
+ zsoup
+ 1.8.2.5
+ jar
+
+
+
+ org.eclipse.jetty
+ jetty-servlets
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ apache-jsp
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ apache-jstl
+ 10.0.6
+ jar
+
+
+ org.mortbay.jasper
+ apache-el
+ 9.0.29
+ jar
+
+
+ org.eclipse.jetty
+ jetty-client
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-jmx
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-plus
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-deploy
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-jndi
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-util-ajax
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-jaas
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-rewrite
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty
+ jetty-slf4j-impl
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-osgi-boot
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-osgi-boot-jsp
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-osgi-boot-warurl
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-osgi-boot-warurl
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.osgi
+ jetty-httpservice
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.websocket
+ websocket-jetty-server
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.websocket
+ websocket-javax-server
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.websocket
+ websocket-javax-common
+ 10.0.6
+ jar
+
+
+ org.eclipse.jetty.websocket
+ websocket-core-server
+ 10.0.6
+ jar
+
+
+
+ org.slf4j
+ slf4j-jcl
+ 1.7.30
+ jar
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.30
+ jar
+
+
+
+ org.apache.lucene
+ lucene-core
+ 8.4.1
+ jar
+
+
+
+ org.apache.lucene
+ lucene-analyzers-common
+ 8.4.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 664b13daed..e0b7a10b06 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
@@ -1,29 +1,9 @@
-target "idempiere-210816"
+target "idempiere-210901"
with source configurePhase allEnvironments
-location "https://idempiere.github.io/binary.file/p2.maven/org.idempiere.webservice.client-p2-R20190412" {
- com.sun.istack.commons-runtime
- com.sun.org.apache.xml.internal.resolver
- com.sun.xml.fastinfoset.FastInfoset
- com.sun.xml.messaging.saaj.impl
- com.sun.xml.stream.buffer.streambuffer
- com.sun.xml.ws.policy
- jakarta.xml.soap-api
- jakarta.xml.ws-api
- org.glassfish.external.management-api
- org.glassfish.gmbal.gmbal
- org.glassfish.jaxb.txw2
- org.glassfish.pfl.pfl-asm
- org.glassfish.pfl.pfl-basic
- org.glassfish.pfl.pfl-dynamic
- org.glassfish.pfl.pfl-tf
- org.jvnet.mimepull
- org.jvnet.staxex.stax-ex
-}
-
-location "https://idempiere.github.io/binary.file/p2.zk/9.5.0.1" {
+location "https://idempiere.github.io/binary.file/p2.zk/9.6.0.1" {
zcommon
zel
zhtml
@@ -37,178 +17,20 @@ location "https://idempiere.github.io/binary.file/p2.zk/9.5.0.1" {
zweb-dsp
}
-location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201101" {
- bcmail
- bcpkix
- bcprov
- bctsp
- com.diffplug.osgi.extension.sun.misc
- com.fasterxml.woodstox.woodstox-core
- com.github.relaxng.Datatype
- com.google.zxing.core
- com.ibm.icu
- com.jaspersoft.studio.bundles.barbecue
- com.jaspersoft.studio.bundles.itext
- com.sun.activation.jakarta.activation
- com.sun.mail.gimap
- com.sun.mail.imap
- com.sun.mail.jakarta.mail
- com.sun.mail.smtp
- com.sun.xml.bind.jaxb-impl
- com.sun.xml.ws.jaxws-rt
- groovy
- groovy-console
- groovy-datetime
- groovy-json
- groovy-jsr223
- groovy-nio
- groovy-sql
- groovy-xml
- jakarta.annotation-api
- jakarta.jws-api
- jakarta.mail.api
- jakarta.persistence-api
- jakarta.ws.rs-api
- jakarta.xml.bind-api
- javax.enterprise.cdi-api
- javax.interceptor-api
- javax.transaction-api
- javax.websocket-api
- joda-time
- json
- net.sf.jasperreports.engine
- net.sf.supercsv.super-csv
- org.apache.activemq.activemq-core
- org.apache.activemq.kahadb
- org.apache.aries.spifly.dynamic.bundle
- org.apache.aries.util
- org.apache.commons.commons-collections4
- org.apache.commons.commons-configuration2
- org.apache.commons.digester
- org.apache.commons.discovery
- org.apache.cxf.cxf-core
- org.apache.cxf.cxf-rt-bindings-soap
- org.apache.cxf.cxf-rt-bindings-xml
- org.apache.cxf.cxf-rt-databinding-jaxb
- org.apache.cxf.cxf-rt-databinding-xmlbeans
- org.apache.cxf.cxf-rt-frontend-jaxrs
- org.apache.cxf.cxf-rt-frontend-jaxws
- org.apache.cxf.cxf-rt-frontend-simple
- org.apache.cxf.cxf-rt-rs-extension-providers
- org.apache.cxf.cxf-rt-rs-service-description
- org.apache.cxf.cxf-rt-security
- org.apache.cxf.cxf-rt-transports-http
- org.apache.cxf.cxf-rt-transports-http-jetty
- org.apache.cxf.cxf-rt-ws-addr
- org.apache.cxf.cxf-rt-ws-policy
- org.apache.cxf.cxf-rt-wsdl
- org.apache.cxf.rt-ws-transfer
- org.apache.felix.webconsole
- org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec
- org.apache.neethi
- org.apache.poi.poi
- org.apache.poi.poi-ooxml
- org.apache.poi.poi-ooxml-schemas
- org.apache.servicemix.bundles.cglib
- org.apache.servicemix.bundles.jaxen
- org.apache.servicemix.bundles.rhino
- org.apache.servicemix.bundles.spring-aop
- org.apache.servicemix.bundles.spring-aop.source.sources
- org.apache.servicemix.bundles.spring-beans
- org.apache.servicemix.bundles.spring-beans.source.sources
- org.apache.servicemix.bundles.spring-context
- org.apache.servicemix.bundles.spring-context-support
- org.apache.servicemix.bundles.spring-context-support.source.sources
- org.apache.servicemix.bundles.spring-context.source.sources
- org.apache.servicemix.bundles.spring-core
- org.apache.servicemix.bundles.spring-core.source.sources
- org.apache.servicemix.bundles.spring-expression
- org.apache.servicemix.bundles.spring-expression.source.sources
- org.apache.servicemix.bundles.spring-web
- org.apache.servicemix.bundles.spring-web.source.sources
- org.apache.servicemix.bundles.wsdl4j
- org.apache.servicemix.bundles.xerces
- org.apache.taglibs.standard-impl
- org.apache.taglibs.standard-jstlel
- org.apache.taglibs.taglibs-standard-spec
- org.apache.ws.xmlschema.core
- org.apache.xmlbeans
- org.apache.xmlgraphics.batik-anim
- org.apache.xmlgraphics.batik-awt-util
- org.apache.xmlgraphics.batik-bridge
- org.apache.xmlgraphics.batik-codec
- org.apache.xmlgraphics.batik-constants
- org.apache.xmlgraphics.batik-css
- org.apache.xmlgraphics.batik-dom
- org.apache.xmlgraphics.batik-ext
- org.apache.xmlgraphics.batik-extension
- org.apache.xmlgraphics.batik-gvt
- org.apache.xmlgraphics.batik-i18n
- org.apache.xmlgraphics.batik-parser
- org.apache.xmlgraphics.batik-script
- org.apache.xmlgraphics.batik-svg-dom
- org.apache.xmlgraphics.batik-svggen
- org.apache.xmlgraphics.batik-util
- org.apache.xmlgraphics.batik-xml
+location "https://idempiere.github.io/binary.file/p2.repackaged/9.0.0" {
+ jakarta.xml.ws-api
org.atmosphere.runtime
- org.cryptacular
- org.eclipse.jetty.annotations
- org.eclipse.jetty.apache-jsp
- org.eclipse.jetty.client
- org.eclipse.jetty.continuation
- org.eclipse.jetty.deploy
- org.eclipse.jetty.http
- org.eclipse.jetty.io
- org.eclipse.jetty.jaas
- org.eclipse.jetty.jmx
- org.eclipse.jetty.jndi
- org.eclipse.jetty.osgi-servlet-api
- org.eclipse.jetty.osgi.boot
- org.eclipse.jetty.osgi.boot.jsp
- org.eclipse.jetty.osgi.httpservice
- org.eclipse.jetty.plus
- org.eclipse.jetty.security
- org.eclipse.jetty.server
- org.eclipse.jetty.servlet
- org.eclipse.jetty.servlets
- org.eclipse.jetty.util
- org.eclipse.jetty.util.ajax
- org.eclipse.jetty.webapp
- org.eclipse.jetty.websocket.api
- org.eclipse.jetty.websocket.client
- org.eclipse.jetty.websocket.common
- org.eclipse.jetty.websocket.javax.websocket
- org.eclipse.jetty.websocket.javax.websocket.server
- org.eclipse.jetty.websocket.server
- org.eclipse.jetty.websocket.servlet
- org.eclipse.jetty.xml
- org.glassfish.hk2.osgi-resource-locator
- org.jfree.chart
- org.jfree.jcommon
- org.krysalis.barcode4j
- org.mortbay.jasper.apache-el
- org.mortbay.jasper.apache-jsp
- org.objectweb.asm
- org.objectweb.asm.commons
- org.objectweb.asm.tree
- org.objectweb.asm.tree.analysis
- org.objectweb.asm.util
- org.passay
- org.springframework.spring-jcl
- org.w3c.dom.smil
- org.zkoss.zsoup
- slf4j.api
- slf4j.jcl
- stax2-api
+ com.google.guava
+ com.google.http-client.google-http-client
+ com.sun.xml.fastinfoset.FastInfoset
+ org.apache.felix.webconsole
+ org.apache.poi.ooxml-schemas
}
-location "https://download.eclipse.org/eclipse/updates/4.17" {
- // ### Equinox https://download.eclipse.org/equinox/drops/R-4.17-202009021800/index.php
+location "https://download.eclipse.org/eclipse/updates/4.20" {
// equinox core framework
org.eclipse.osgi
//<< equinox framework starter kit
- org.apache.commons.codec
- org.apache.commons.logging
org.apache.felix.gogo.command
org.apache.felix.gogo.runtime
org.apache.felix.gogo.shell
@@ -226,7 +48,6 @@ location "https://download.eclipse.org/eclipse/updates/4.17" {
org.eclipse.equinox.common
org.eclipse.equinox.concurrent
org.eclipse.equinox.console
- org.eclipse.equinox.ds
org.eclipse.equinox.frameworkadmin
org.eclipse.equinox.frameworkadmin.equinox
org.eclipse.equinox.launcher
@@ -240,6 +61,7 @@ location "https://download.eclipse.org/eclipse/updates/4.17" {
org.eclipse.equinox.p2.jarprocessor
org.eclipse.equinox.p2.metadata
org.eclipse.equinox.p2.metadata.repository
+ org.eclipse.equinox.p2.operations
org.eclipse.equinox.p2.repository
org.eclipse.equinox.p2.touchpoint.eclipse
org.eclipse.equinox.p2.touchpoint.natives
@@ -299,40 +121,24 @@ location "https://download.eclipse.org/eclipse/updates/4.17" {
//>>
}
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository" {
- com.google.gson
- javax.inject
- javax.jms
- org.antlr.runtime
- org.aopalliance
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" {
org.apache.ant
- org.apache.commons.beanutils
- org.apache.commons.collections
- org.apache.commons.compress
- org.apache.commons.fileupload
- org.apache.commons.io
- org.apache.commons.lang3
- org.apache.commons.lang
- org.apache.commons.net
- org.apache.lucene.analyzers-common
- org.apache.lucene.core
- org.apache.xalan
org.apache.xml.resolver
- org.apache.xml.serializer
- org.apache.xmlgraphics
- org.dom4j
- org.glassfish.hk2.api
- org.glassfish.hk2.locator
- org.glassfish.hk2.utils
- org.glassfish.jersey.inject.jersey-hk2
- org.glassfish.jersey.containers.servlet.core
- org.glassfish.jersey.core.jersey-client
- org.glassfish.jersey.core.jersey-common
- org.glassfish.jersey.core.jersey-server
- org.glassfish.jersey.ext.entityfiltering
- org.glassfish.jersey.media.jersey-media-json-jackson
- org.hamcrest.core
org.w3c.css.sac
+ org.w3c.dom.smil
org.w3c.dom.svg
- org.apache.commons.math3 [3.6.1,3.7.0)
-}
\ No newline at end of file
+ org.w3c.dom.events
+ org.hamcrest.core
+ javax.xml
+ org.apache.xalan
+ org.apache.xml.serializer
+ org.apache.commons.discovery
+}
+
+location "https://sourceforge.net/projects/jasperstudio/files/updatesite/6.17.0" {
+ com.jaspersoft.studio.bundles.barbecue
+ com.jaspersoft.studio.bundles.itext
+ com.jaspersoft.studio.bundles.commons-digester
+ org.w3c.dom.svg.patch
+ org.krysalis.barcode4j
+}
diff --git a/org.idempiere.p2.targetplatform/pom.xml b/org.idempiere.p2.targetplatform/pom.xml
index 4e188e34b7..d4c1c3ce51 100644
--- a/org.idempiere.p2.targetplatform/pom.xml
+++ b/org.idempiere.p2.targetplatform/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.p2.targetplatform
diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml
index 3d529e7bee..34683c99f8 100644
--- a/org.idempiere.p2/category.xml
+++ b/org.idempiere.p2/category.xml
@@ -1,61 +1,61 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
diff --git a/org.idempiere.p2/pom.xml b/org.idempiere.p2/pom.xml
index 98a1f18ff2..df0c03b153 100644
--- a/org.idempiere.p2/pom.xml
+++ b/org.idempiere.p2/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.p2
diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product
index 9e8f055711..815707feed 100644
--- a/org.idempiere.p2/server.product
+++ b/org.idempiere.p2/server.product
@@ -1,7 +1,7 @@
-
+
@@ -9,7 +9,7 @@
-console
- --add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF
+ --add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml
-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
@@ -37,39 +37,39 @@
-
-
+
+
-
+
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/org.idempiere.parent/.project b/org.idempiere.parent/.project
index 60f8cc7b11..abfcf56052 100644
--- a/org.idempiere.parent/.project
+++ b/org.idempiere.parent/.project
@@ -25,10 +25,16 @@
+
+ org.eclipse.babel.editor.rbeBuilder
+
+
+
org.eclipse.m2e.core.maven2Nature
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ com.jaspersoft.studio.babel.editor.rbeNature
diff --git a/org.idempiere.parent/pom-jetty-run.xml b/org.idempiere.parent/pom-jetty-run.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index ee9e5acb03..e89a945821 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -5,41 +5,62 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
pom
Maven parent project for idempiere
+ 9.0.0-SNAPSHOT
11
2.4.0
${tycho.version}
UTF-8
- 6.15.0
- 9.5.0.1
- 3.23.1-GA
+ 6.17.0
+ 9.6.0.1
3.1.1
1.4.1
1.0.0
- 4.3.19.RELEASE_1
-
- 8.1.12.v20180117
- RELEASE113
+ RELEASE124
2.5
org.idempiere.p2.targetplatform
- https://download.eclipse.org/eclipse/updates/4.17
- eclipse-2020-09
- https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository
- orbit-2020-09-R20200831200620
+ https://download.eclipse.org/eclipse/updates/4.20
+ eclipse-2021-06
+ 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.adempiere.server.product
- 2.8.5
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+ 1.1.0
+
+ true
+ resolveCiFriendliesOnly
+
+
+
+ flatten
+ process-resources
+
+ flatten
+
+
+
+ flatten.clean
+ clean
+
+ clean
+
+
+
+
org.apache.maven.plugins
maven-clean-plugin
@@ -145,7 +166,7 @@
eclipse-plugin
- org.eclipse.equinox.ds
+ org.apache.felix.scr
eclipse-plugin
@@ -527,8 +548,8 @@
-
-
+
+
org.eclipse.tycho
target-platform-configuration
${tycho.version}
@@ -555,7 +576,7 @@
org.idempiere
${idempiere.target}
- 8.2.0-SNAPSHOT
+ 9.0.0-SNAPSHOT
@@ -571,7 +592,7 @@
win32
x86_64
-
+
macosx
cocoa
x86_64
@@ -580,30 +601,9 @@
JavaSE-${jdk.version}
JavaSE-${jdk.version}
-
-
-
-
-
-
- buildP2FromMaven
-
-
- ${idempiere-equinox-repository-id}
- ${idempiere-equinox-url}
- p2
-
-
- ${idempiere-orbit-repository-id}
- ${idempiere-orbit-url}
- p2
-
-
- wso2
- https://dist.wso2.org/maven2
-
-
-
-
+
+
+
+
diff --git a/org.idempiere.printformat.editor/META-INF/MANIFEST.MF b/org.idempiere.printformat.editor/META-INF/MANIFEST.MF
index 566aabf318..517a5e563a 100644
--- a/org.idempiere.printformat.editor/META-INF/MANIFEST.MF
+++ b/org.idempiere.printformat.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Report Editor
Bundle-SymbolicName: org.idempiere.printformat.editor
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-Activator: org.idempiere.printformat.editor.Activator
Bundle-Vendor: TREKGLOBAL
Import-Package: org.osgi.framework,
@@ -11,9 +11,9 @@ Import-Package: org.osgi.framework,
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
-Require-Bundle: org.adempiere.base;bundle-version="8.2.0",
- org.adempiere.ui.zk;bundle-version="8.2.0",
- org.adempiere.plugin.utils;bundle-version="8.2.0",
+Require-Bundle: org.adempiere.base;bundle-version="9.0.0",
+ org.adempiere.ui.zk;bundle-version="9.0.0",
+ org.adempiere.plugin.utils;bundle-version="9.0.0",
zcommon,
zel,
zhtml,
@@ -22,6 +22,6 @@ Require-Bundle: org.adempiere.base;bundle-version="8.2.0",
zkplus,
zul,
zweb
-Service-Component: OSGI-INF/org.idempiere.printformat.editor.action.EditorAction.xml
Export-Package: action.images
Automatic-Module-Name: org.idempiere.printformat.editor
+Service-Component: OSGI-INF/org.idempiere.printformat.editor.action.EditorAction.xml
diff --git a/org.idempiere.printformat.editor/pom.xml b/org.idempiere.printformat.editor/pom.xml
index 688e9a4efe..8966dc12af 100644
--- a/org.idempiere.printformat.editor/pom.xml
+++ b/org.idempiere.printformat.editor/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.printformat.editor
diff --git a/org.idempiere.test-feature/feature.xml b/org.idempiere.test-feature/feature.xml
index cbcc9db255..92e02880f1 100644
--- a/org.idempiere.test-feature/feature.xml
+++ b/org.idempiere.test-feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/org.idempiere.test-feature/pom.xml b/org.idempiere.test-feature/pom.xml
index 507ca2fa82..a8d836474b 100644
--- a/org.idempiere.test-feature/pom.xml
+++ b/org.idempiere.test-feature/pom.xml
@@ -3,9 +3,9 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.test.feature
eclipse-feature
-
\ No newline at end of file
+
diff --git a/org.idempiere.test/.settings/org.eclipse.pde.core.prefs b/org.idempiere.test/.settings/org.eclipse.pde.core.prefs
index f29e940a00..4b08937777 100644
--- a/org.idempiere.test/.settings/org.eclipse.pde.core.prefs
+++ b/org.idempiere.test/.settings/org.eclipse.pde.core.prefs
@@ -1,3 +1,2 @@
eclipse.preferences.version=1
pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/org.idempiere.test/META-INF/MANIFEST.MF b/org.idempiere.test/META-INF/MANIFEST.MF
index 40a5d670c6..5b4d5de0d1 100644
--- a/org.idempiere.test/META-INF/MANIFEST.MF
+++ b/org.idempiere.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Unit Testing
Bundle-SymbolicName: org.idempiere.test
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-Vendor: iDempiere
Automatic-Module-Name: org.idempiere.test
Import-Package: org.junit.jupiter.api;version="5.6.0",
@@ -20,10 +20,10 @@ Import-Package: org.junit.jupiter.api;version="5.6.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"
-Require-Bundle: org.adempiere.base;bundle-version="8.2.0",
- org.adempiere.base.callout;bundle-version="8.2.0",
- org.adempiere.base.process;bundle-version="8.2.0",
- org.adempiere.payment.processor;bundle-version="8.2.0"
+Require-Bundle: org.adempiere.base;bundle-version="9.0.0",
+ org.adempiere.base.callout;bundle-version="9.0.0",
+ org.adempiere.base.process;bundle-version="9.0.0",
+ org.adempiere.payment.processor;bundle-version="9.0.0"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.idempiere.test.TestActivator
Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch
index c2fd7ebb64..a7ba0cc5f2 100644
--- a/org.idempiere.test/idempiere.unit.test.launch
+++ b/org.idempiere.test/idempiere.unit.test.launch
@@ -13,7 +13,7 @@
-
+
@@ -39,9 +39,11 @@
+
+
@@ -58,7 +60,6 @@
-
@@ -67,20 +68,15 @@
+
-
-
-
-
-
+
-
-
@@ -91,47 +87,40 @@
-
+
+
-
-
-
-
-
+
-
-
-
-
+
-
-
+
+
+
-
-
+
+
+
+
-
-
-
-
@@ -143,68 +132,34 @@
-
-
-
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -226,7 +181,6 @@
-
@@ -259,31 +213,28 @@
-
-
-
+
-
-
-
+
+
@@ -292,26 +243,25 @@
+
+
+
-
-
-
+
-
-
@@ -338,21 +288,41 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.test/pom.xml b/org.idempiere.test/pom.xml
index 9c3c0eb7cc..b971c53840 100644
--- a/org.idempiere.test/pom.xml
+++ b/org.idempiere.test/pom.xml
@@ -5,7 +5,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.test
diff --git a/org.idempiere.webservices-feature/feature.xml b/org.idempiere.webservices-feature/feature.xml
index 40dabef5ea..c23652b400 100644
--- a/org.idempiere.webservices-feature/feature.xml
+++ b/org.idempiere.webservices-feature/feature.xml
@@ -2,7 +2,7 @@
@@ -115,13 +115,6 @@
version="0.0.0"
unpack="false"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.webservices.feature
diff --git a/org.idempiere.webservices.client-feature/feature.xml b/org.idempiere.webservices.client-feature/feature.xml
index d94efcd6ae..a502db6b54 100644
--- a/org.idempiere.webservices.client-feature/feature.xml
+++ b/org.idempiere.webservices.client-feature/feature.xml
@@ -2,7 +2,7 @@
@@ -21,147 +21,147 @@
id="org.glassfish.external.management-api"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.3"
unpack="false"/>
+
+
-
-
+
+
+
+
+
+
diff --git a/org.idempiere.webservices.client-feature/pom.xml b/org.idempiere.webservices.client-feature/pom.xml
index fdce31ac4b..22a5cba07a 100644
--- a/org.idempiere.webservices.client-feature/pom.xml
+++ b/org.idempiere.webservices.client-feature/pom.xml
@@ -3,7 +3,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.webservices.client.feature
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 581e5b2c94..9419b8a0a1 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Webservices
Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-Activator: org.idempiere.webservices.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
@@ -14,7 +14,18 @@ Import-Package: javax.activation,
javax.mail.internet;version="1.5",
javax.servlet;version="3.0.0",
javax.servlet.http;version="3.0.0",
- javax.xml.bind;version="2.3.0",
+ javax.xml.bind;version="2.3.3",
+ javax.xml.bind.annotation;version="2.3.3",
+ javax.xml.namespace,
+ javax.xml.transform,
+ javax.xml.ws;version="2.3.3",
+ javax.xml.ws.handler;version="2.3.3",
+ javax.xml.ws.handler.soap;version="2.3.3",
+ javax.xml.ws.http;version="2.3.3",
+ javax.xml.ws.soap;version="2.3.3",
+ javax.xml.ws.spi;version="2.3.3",
+ javax.xml.ws.spi.http;version="2.3.3",
+ javax.xml.ws.wsaddressing;version="2.3.3",
net.sf.jasperreports.engine,
net.sf.jasperreports.engine.base,
net.sf.jasperreports.engine.util,
@@ -55,14 +66,14 @@ Import-Package: javax.activation,
org.apache.xerces.xs;version="2.9.0",
org.apache.xerces.xs.datatypes;version="2.9.0",
org.apache.xml.serialize;version="2.9.0",
- org.osgi.framework;version="1.6.0"
+ org.osgi.framework;version="1.6.0",
+ org.w3c.dom
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.adempiere.ui;bundle-version="0.0.0",
org.apache.ecs;bundle-version="0.0.0",
org.apache.cxf.cxf-core;bundle-version="3.3.1",
org.apache.neethi;bundle-version="3.1.1",
org.apache.ws.xmlschema.core;bundle-version="2.2.3",
- org.apache.commons.discovery;bundle-version="0.5.0",
stax2-api;bundle-version="4.1.0",
org.apache.cxf.cxf-rt-frontend-jaxrs;bundle-version="3.3.1",
org.apache.cxf.cxf-rt-frontend-jaxws;bundle-version="3.3.1",
@@ -72,21 +83,10 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.apache.cxf.cxf-rt-frontend-simple;bundle-version="3.3.1",
org.apache.cxf.cxf-rt-transports-http;bundle-version="3.3.1",
org.apache.cxf.cxf-rt-wsdl;bundle-version="3.3.1",
- org.aopalliance;bundle-version="1.0.0",
org.apache.xml.resolver;bundle-version="1.2.0",
- org.apache.cxf.cxf-rt-transports-http-jetty;bundle-version="3.3.1",
org.apache.cxf.cxf-rt-ws-addr;bundle-version="3.3.1",
org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.3.1",
org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17",
- org.apache.xmlbeans;bundle-version="3.0.1",
- org.apache.servicemix.bundles.spring-aop,
- org.apache.servicemix.bundles.spring-beans,
- org.apache.servicemix.bundles.spring-context,
- org.apache.servicemix.bundles.spring-context-support,
- org.apache.servicemix.bundles.spring-core,
- org.apache.servicemix.bundles.spring-expression,
- org.springframework.spring-jcl;bundle-version="5.1.1",
- org.apache.servicemix.bundles.spring-web,
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",
@@ -95,9 +95,17 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.glassfish.hk2.locator;bundle-version="2.5.0",
org.glassfish.hk2.utils;bundle-version="2.5.0",
jakarta.ws.rs-api;bundle-version="2.1.5",
- jakarta.xml.ws-api;bundle-version="2.3.2",
jakarta.xml.soap-api;bundle-version="1.4.1",
- org.glassfish.hk2.osgi-resource-locator;bundle-version="1.0.3"
+ org.glassfish.hk2.osgi-resource-locator;bundle-version="1.0.3",
+ org.glassfish.hk2.external.aopalliance-repackaged;bundle-version="2.6.1",
+ wrapped.org.springframework.spring-aop;bundle-version="5.2.15",
+ wrapped.org.springframework.spring-beans;bundle-version="5.2.15",
+ wrapped.org.springframework.spring-context;bundle-version="5.2.15",
+ wrapped.org.springframework.spring-context-support;bundle-version="5.2.15",
+ wrapped.org.springframework.spring-core;bundle-version="5.2.15",
+ wrapped.org.springframework.spring-expression;bundle-version="5.2.15",
+ wrapped.org.apache.xmlbeans.xmlbeans;bundle-version="3.1.0",
+ wrapped.org.springframework.spring-web;bundle-version="5.2.15"
Bundle-ClassPath: .,
lib/idempiere-xmlbeans.jar
Export-Package: org.compiere.model,
diff --git a/org.idempiere.webservices/WEB-INF/web.xml b/org.idempiere.webservices/WEB-INF/web.xml
index 08ab39b75b..f90b602498 100644
--- a/org.idempiere.webservices/WEB-INF/web.xml
+++ b/org.idempiere.webservices/WEB-INF/web.xml
@@ -1,10 +1,8 @@
-
-
-
-
-
+
+
contextConfigLocation
@@ -21,7 +19,6 @@
CXFServlet
- CXF Servlet
org.apache.cxf.transport.servlet.CXFServlet
@@ -44,5 +41,4 @@
15
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml
index dd7eb3d069..cd1513d540 100644
--- a/org.idempiere.webservices/pom.xml
+++ b/org.idempiere.webservices/pom.xml
@@ -4,7 +4,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.webservices
diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml
index 220a977a24..7fa6967510 100644
--- a/org.idempiere.zk-feature/feature.xml
+++ b/org.idempiere.zk-feature/feature.xml
@@ -2,7 +2,7 @@
@@ -88,14 +88,14 @@
unpack="false"/>
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
org.idempiere.zk.feature
diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
index 65797c6015..7923748427 100644
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: extra zk library
Bundle-SymbolicName: org.idempiere.zk.extra
-Bundle-Version: 8.2.0.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Bundle-ClassPath: .,
@@ -57,8 +57,6 @@ Export-Package: com.google.debugging.sourcemap,
com.google.protobuf,
google.protobuf,
google.protobuf.compiler,
- javax.annotation,
- javax.annotation.meta,
jsinterop.annotations,
metainfo.zk,
org.checkerframework.checker.nullness.qual,
@@ -199,7 +197,7 @@ Require-Bundle: zcommon,
zul,
zweb,
zjavassist,
- org.apache.commons.fileupload;bundle-version="1.2.2"
+ org.apache.commons.commons-fileupload;bundle-version="1.4.0"
Import-Package: javax.servlet;version="3.1.0",
javax.servlet.annotation;version="3.1.0",
javax.servlet.descriptor;version="3.1.0",
diff --git a/org.idempiere.zk.extra/pom.xml b/org.idempiere.zk.extra/pom.xml
index 1484278c46..cd93e904fb 100644
--- a/org.idempiere.zk.extra/pom.xml
+++ b/org.idempiere.zk.extra/pom.xml
@@ -7,16 +7,10 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
../org.idempiere.parent/pom.xml
-
-
- idempiere.github.io.maven.zk
- https://idempiere.github.io/binary.file/maven.zk
-
-
@@ -33,7 +27,7 @@
org.zkoss.zkforge
gmapsz
- 3.0.5
+ 3.2.0
org.zkoss.zkforge
diff --git a/pom.xml b/pom.xml
index b3e414a0bb..f24950d90d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
org.idempiere
org.idempiere.parent
- 8.2.0-SNAPSHOT
+ ${revision}
org.idempiere.parent/pom.xml
@@ -53,6 +53,7 @@
org.adempiere.payment.processor-feature
org.idempiere.zk-feature
org.idempiere.webservices.client-feature
+ org.idempiere.jetty.osgi.boot.fragment
org.idempiere.p2
org.idempiere.javadoc
org.idempiere.test-feature