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

hg merge release-6.1 (merge release6.1 into default)

This commit is contained in:
Carlos Ruiz 2018-12-21 16:45:29 +01:00
parent 83f8ea2253 e00b022e12
commit 18f789b57c
16 changed files with 179 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/compiere/model/MMatchPO.java
View File

@ -1289,7 +1289,7 @@ public class MMatchPO extends X_M_MatchPO
this.saveEx();
// auto create new matchpo if have invoice line
if ( reversal.getC_InvoiceLine_ID() > 0)
if ( reversal.getC_InvoiceLine_ID() > 0 && reversal.getM_InOutLine_ID() > 0 )
{
MMatchPO[] matchPOs = MMatchPO.getOrderLine(reversal.getCtx(), reversal.getC_OrderLine_ID(), reversal.get_TrxName());
BigDecimal matchQty = getQty();

6
org.adempiere.payment.processor/pom.xml
View File

@ -22,7 +22,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/jpayment.jar</url>
<url>${url.file.srv}/extra.jar/jpayment.jar</url>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<retries>5</retries>
@ -35,7 +35,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/Verisign.jar</url>
<url>${url.file.srv}/extra.jar/Verisign.jar</url>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<retries>5</retries>
@ -48,7 +48,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/payflow.jar</url>
<url>${url.file.srv}/extra.jar/payflow.jar</url>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<retries>5</retries>

41
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/GenericPOElementHandler.java
View File

@ -20,6 +20,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
@ -195,7 +196,7 @@ public class GenericPOElementHandler extends AbstractElementHandler {
for (int i = 1; i < components.length; i++) {
String tables[] = components[i].split("[>]");
exportDetail(ctx, document, po, 0, tables);
exportDetail(ctx, document, po, tables);
}
if (createElement) {
@ -209,19 +210,19 @@ public class GenericPOElementHandler extends AbstractElementHandler {
}
}
private void exportDetail(PIPOContext ctx, TransformerHandler document, GenericPO parent, int index, String[] tables) {
private void exportDetail(PIPOContext ctx, TransformerHandler document, GenericPO parent, String[] tables) {
String mainTable = tables[0];
AttributesImpl atts = new AttributesImpl();
tables[index] = tables[index].trim();
String sql = "SELECT * FROM " + tables[index] + " WHERE " + parent.get_TableName() + "_ID = ?";
String sql = "SELECT * FROM " + mainTable + " WHERE " + parent.get_TableName() + "_ID = ?";
PreparedStatement pstmt = null;
ResultSet rs = null;
try {
sql = MRole.getDefault().addAccessSQL(sql, tables[index], true, true);
sql = MRole.getDefault().addAccessSQL(sql, mainTable, true, true);
pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, parent.get_ID());
rs = pstmt.executeQuery();
while (rs.next()) {
GenericPO po = new GenericPO(tables[index], ctx.ctx, rs, getTrxName(ctx));
GenericPO po = new GenericPO(mainTable, ctx.ctx, rs, getTrxName(ctx));
int AD_Client_ID = po.getAD_Client_ID();
if (AD_Client_ID != Env.getAD_Client_ID(ctx.ctx))
continue;
@ -237,12 +238,12 @@ public class GenericPOElementHandler extends AbstractElementHandler {
}
if (createElement) {
verifyPackOutRequirement(po);
List<String> excludes = defaultExcludeList(tables[index]);
List<String> excludes = defaultExcludeList(mainTable);
addTypeName(atts, "table");
document.startElement("", "", tables[index], atts);
document.startElement("", "", mainTable, atts);
PoExporter filler = new PoExporter(ctx, document, po);
filler.export(excludes, true);
ctx.packOut.getCtx().ctx.put("Table_Name",tables[index]);
ctx.packOut.getCtx().ctx.put("Table_Name",mainTable);
try {
new CommonTranslationHandler().packOut(ctx.packOut,document,null,po.get_ID());
} catch(Exception e) {
@ -250,11 +251,27 @@ public class GenericPOElementHandler extends AbstractElementHandler {
}
}
}
for (int i=index+1; i<tables.length; i++) {
exportDetail(ctx, document, po, 0, new String[] {tables[i]});
for (int i=1; i<tables.length; i++) {
if (tables[i].startsWith("+")) {
continue;
}
List<String> detTablesArr = new ArrayList<String>();
for (int j=i; j<tables.length; j++) {
if (j == i) {
detTablesArr.add(tables[j]);
} else {
if (tables[j].startsWith("+")) {
detTablesArr.add(tables[j].substring(1));
} else {
break;
}
}
}
String[] detTables = detTablesArr.toArray(new String[0]);
exportDetail(ctx, document, po, detTables);
}
if (createElement) {
document.endElement("","",tables[index]);
document.endElement("","",mainTable);
}
}
} catch (Exception e) {

6
org.adempiere.pipo/src/org/adempiere/pipo2/GridTab2PackExporter.java
View File

@ -72,7 +72,11 @@ public class GridTab2PackExporter implements IGridTabExporter {
if (child.getTableName().toLowerCase().endsWith("_trl")) // ignore trl tabs as they are exported as translation
continue;
if (child.getTabLevel() > gridTab.getTabLevel()+1) {
sql = sql.append(">").append(child.getTableName());
int level = child.getTabLevel() - gridTab.getTabLevel() - 1;
String sep = ">";
for (int i = 1; i < level; i++)
sep += "+";
sql = sql.append(sep).append(child.getTableName());
} else {
sql = sql.append(";").append(child.getTableName());
}

2
org.adempiere.report.jasper.library/pom.xml
View File

@ -78,7 +78,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/jp-${jp.version}/jasperreports-fonts-${jp.version}.jar</url>
<url>${url.file.srv}/extra.jar/jasperreports-fonts-${jp.version}.jar</url>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<outputFileName>jasperreports-fonts.jar</outputFileName>

6
org.adempiere.server-feature/pom.xml
View File

@ -184,7 +184,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/101-20121212164242.zip</url>
<url>${url.file.srv}/extra.jar/101-20121212164242.zip</url>
<unpack>false</unpack>
<outputDirectory>../fitnesse/FitNesseRoot/FitLibraryWeb</outputDirectory>
<retries>5</retries>
@ -197,7 +197,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/21-20121212154702.zip</url>
<url>${url.file.srv}/extra.jar/21-20121212154702.zip</url>
<unpack>false</unpack>
<outputDirectory>../fitnesse/FitNesseRoot/FitLibraryWeb</outputDirectory>
<retries>5</retries>
@ -210,7 +210,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/6-20121212124109.zip</url>
<url>${url.file.srv}/extra.jar/6-20121212124109.zip</url>
<unpack>false</unpack>
<outputDirectory>../fitnesse/FitNesseRoot/FitLibraryWeb</outputDirectory>
<retries>5</retries>

2
org.adempiere.ui.swing/pom.xml
View File

@ -69,7 +69,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/jpedal.jar</url>
<url>${url.file.srv}/extra.jar/jpedal.jar</url>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<retries>5</retries>

34
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
View File

@ -92,32 +92,30 @@ public class NumberBox extends Div
char separatorChar = DisplayType.getNumberFormat(DisplayType.Number, Env.getLanguage(Env.getCtx())).getDecimalFormatSymbols().getDecimalSeparator();
String separator = Character.toString(separatorChar);
boolean processDotKeypad = MSysConfig.getBooleanValue(MSysConfig.ZK_DECIMALBOX_PROCESS_DOTKEYPAD, true, Env.getAD_Client_ID(Env.getCtx()));
if (".".equals(separator))
processDotKeypad = false;
if (processDotKeypad) {
StringBuffer funct = new StringBuffer();
funct.append("function(evt)");
funct.append("{");
// ignore dot and process it on key up
funct.append(" if (!this._shallIgnore(evt, '0123456789-%").append(separator).append("'))");
// ignore dot, comma and decimal separator and process them on key down
funct.append(" if (!this._shallIgnore(evt, '0123456789-%'))");
funct.append(" {");
funct.append(" this.$doKeyPress_(evt);");
funct.append(" }");
funct.append("}");
decimalBox.setWidgetOverride("doKeyPress_", funct.toString());
funct = new StringBuffer();
// not working correctly on opera
// debug // funct.append("console.log('keyCode='+event.keyCode);");
funct.append("if (window.event)");
funct.append(" key = event.keyCode;");
funct.append("else");
funct.append(" key = event.which;");
funct.append("if ((key == 110 || key == 190) && !window.opera) {");
funct.append("if (key == 108 || key == 110 || key == 188 || key == 190 || key == 194) {");
funct.append(" var id = '$'.concat('").append(decimalBox.getId()).append("');");
funct.append(" var calcText = jq(id)[0];");
funct.append(" calcText.value += '").append(separator).append("';");
funct.append(" event.stop;");
funct.append("};");
decimalBox.setWidgetListener("onKeyUp", funct.toString());
decimalBox.setWidgetListener("onKeyDown", funct.toString());
}
appendChild(decimalBox);
@ -251,29 +249,27 @@ public class NumberBox extends Div
txtCalc.setId(txtCalc.getUuid());
boolean processDotKeypad = MSysConfig.getBooleanValue(MSysConfig.ZK_DECIMALBOX_PROCESS_DOTKEYPAD, true, Env.getAD_Client_ID(Env.getCtx()));
if (".".equals(separator))
processDotKeypad = false;
// restrict allowed characters
String decimalSep = separator;
if (!processDotKeypad && !".".equals(separator))
decimalSep += ".";
StringBuffer funct = new StringBuffer();
funct.append("function(evt)");
funct.append("{");
funct.append(" if (!this._shallIgnore(evt, '= -/()*%+0123456789").append(decimalSep).append("'))");
if (processDotKeypad) {
funct.append(" if (!this._shallIgnore(evt, '= -/()*%+0123456789'))");
} else {
// restrict allowed characters
String decimalSep = separator;
if (!processDotKeypad && !".".equals(separator))
decimalSep += ".";
funct.append(" if (!this._shallIgnore(evt, '= -/()*%+0123456789").append(decimalSep).append("'))");
}
funct.append(" {");
funct.append(" this.$doKeyPress_(evt);");
funct.append(" }");
funct.append("}");
txtCalc.setWidgetOverride("doKeyPress_", funct.toString());
txtCalc.setWidgetListener("onKeyUp", "calc.validateUp('" +
txtCalc.setWidgetListener("onKeyDown", "calc.validateDown('" +
decimalBox.getId() + "','" + txtCalc.getId()
+ "'," + integral + "," + (int)separatorChar + ", event, " + ( processDotKeypad ? "true" : "false" ) + ");");
txtCalc.setWidgetListener("onKeyPress", "calc.validatePress('" +
decimalBox.getId() + "','" + txtCalc.getId()
+ "'," + integral + "," + (int)separatorChar + ", event);");
txtCalc.setMaxlength(250);
txtCalc.setCols(30);

21
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
View File

@ -216,6 +216,7 @@ public class ExportAction implements EventListener<Event>
chkSelectionTab.setAttribute("tabBinding", child);
vlayout.appendChild(chkSelectionTab);
chkSelectionTabForExport.add(chkSelectionTab);
chkSelectionTab.addEventListener(Events.ON_CHECK, this);
isHasSelectionTab = true;
}
@ -235,6 +236,26 @@ public class ExportAction implements EventListener<Event>
panel.hideBusyMask();
}else if (event.getTarget().equals(cboType) && event.getName().equals(Events.ON_SELECT)) {
displayExportTabSelection();
}else if (event.getTarget() instanceof Checkbox) {
// A child is not exportable without its parent
Checkbox cbSel = (Checkbox) event.getTarget();
GridTab gtSel = (GridTab)cbSel.getAttribute("tabBinding");
boolean found = false;
for (Checkbox cb : chkSelectionTabForExport) {
if (cb == cbSel) {
found = true;
continue;
}
GridTab gt = (GridTab)cb.getAttribute("tabBinding");
if (found) {
if (gt.getTabLevel() > gtSel.getTabLevel()) {
cb.setChecked(cbSel.isChecked());
cb.setEnabled(cbSel.isChecked());
} else {
break;
}
}
}
}else if (event.getName().equals("onExporterException")){
FDialog.error(0, winExportFile, "FileInvalidExtension");
winExportFile.onClose();

26
org.adempiere.ui.zk/js/calc.js
View File

@ -1,41 +1,25 @@
function Calc()
{
this.validateUp = validateUp;
this.validatePress = validatePress;
this.validateDown = validateDown;
this.clear = clear;
this.clearAll = clearAll;
this.evaluate = evaluate;
this.append = append;
function validatePress(displayTextId, calcTextId, integral, separatorKey, e)
{
var key;
if(window.event)
key = e.keyCode; //IE
else
key = e.which; //Firefox
// console.log("validatePress: " + displayTextId + " / " + calcTextId + " / " + integral + " / " + separatorKey + " / " + key);
if (key == 61) // =
{
evaluate(displayTextId, calcTextId, String.fromCharCode(separatorKey));
}
}
function validateUp(displayTextId, calcTextId, integral, separatorKey, e, processDotKeypad)
function validateDown(displayTextId, calcTextId, integral, separatorKey, e, processDotKeypad)
{
var key;
if(window.event)
key = e.keyCode; //IE
else
key = e.which; //Firefox
// console.log("validateUp: " + displayTextId + " / " + calcTextId + " / " + integral + " / " + separatorKey + " / " + key + " / " + processDotKeypad);
if (key == 13) // Enter
// console.log("validateDown: " + displayTextId + " / " + calcTextId + " / " + integral + " / " + separatorKey + " / " + key + " / " + processDotKeypad);
if (key == 13 || key == 61) // Enter
{
evaluate(displayTextId, calcTextId, String.fromCharCode(separatorKey));
}
else if (processDotKeypad && separatorKey != 46 && (key == 110 || key == 190) && !window.opera) // numeric dot on keypad (not working for opera)
else if (processDotKeypad && (key == 108 || key == 110 || key == 188 || key == 190 || key == 194))
{
append(calcTextId, String.fromCharCode(separatorKey));
e.stop;

2
org.adempiere.ui.zk/pom.xml
View File

@ -51,7 +51,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/labelapplet.jar</url>
<url>${url.file.srv}/extra.jar/labelapplet.jar</url>
<unpack>false</unpack>
<outputDirectory>./</outputDirectory>
<retries>5</retries>

2
org.compiere.db.oracle.provider/pom.xml
View File

@ -58,7 +58,7 @@
</goals>
<configuration>
<!-- to complicate to get from official repository https://blogs.oracle.com/dev2dev/get-oracle-jdbc-drivers-from-the-oracle-maven-repo-netbeans-eclipse-intellij -->
<url>${url.file.srv}/jarfile/6.1/ojdbc7.jar</url>
<url>${url.file.srv}/extra.jar/ojdbc7.jar</url>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<retries>5</retries>

4
org.idempiere.fitnesse.server/pom.xml
View File

@ -63,7 +63,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/fitlibrary-2.0.jar</url>
<url>${url.file.srv}/extra.jar/fitlibrary-2.0.jar</url>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<retries>5</retries>
@ -77,7 +77,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/fitlibraryweb-2.0.jar</url>
<url>${url.file.srv}/extra.jar/fitlibraryweb-2.0.jar</url>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<retries>5</retries>

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

@ -764,6 +764,14 @@
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.12.v20180830"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="bcmail" version="1.60.0"/>
<unit id="bcmail.source" version="1.60.0"/>
<unit id="bcpkix" version="1.60.0"/>
<unit id="bcpkix.source" version="1.60.0"/>
<unit id="bcprov" version="1.60.0"/>
<unit id="bcprov.source" version="1.60.0"/>
<unit id="bctsp" version="1.46.0"/>
<unit id="bctsp.source" version="1.46.0"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.5"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.9.5"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.5"/>
@ -792,82 +800,12 @@
<unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
<unit id="com.google.zxing.core" version="3.2.1"/>
<unit id="com.google.zxing.core.source" version="3.2.1"/>
<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
<unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js6_b02"/>
<unit id="javax.validation.api" version="1.1.0.Final"/>
<unit id="javax.validation.api.source" version="1.1.0.Final"/>
<unit id="json" version="20171018.0.0"/>
<unit id="json.source" version="20171018.0.0"/>
<unit id="net.sf.jasperreports.engine" version="6.6.0"/>
<unit id="net.sf.jasperreports.engine.source" version="6.6.0"/>
<unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/>
<unit id="org.apache.batik.bridge" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.codec" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.constants" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.css" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/>
<unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.ext.awt" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.extension" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.gvt" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.i18n" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.parser" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.pdf" version="1.9.1.v20180417-1407"/>
<unit id="org.apache.batik.script" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.swing" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.transcoder" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.util.gui" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.commons.digester" version="2.1.0"/>
<unit id="org.apache.commons.digester.source" version="2.1.0"/>
<unit id="org.apache.poi.poi" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml-schemas" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml.source" version="3.15.0"/>
<unit id="org.apache.poi.poi.source" version="3.15.0"/>
<unit id="org.apache.servicemix.bundles.jaxen" version="1.1.1.2"/>
<unit id="org.apache.servicemix.bundles.rhino" version="1.7.6.1"/>
<unit id="org.apache.servicemix.bundles.rhino.source" version="1.7.6.1"/>
<unit id="org.apache.xmlgraphics" version="2.2.0.v20180410-1551"/>
<unit id="org.jfree.chart-osgi" version="1.0.19"/>
<unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
<unit id="org.krysalis.barcode4j" version="2.1.0"/>
<unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
<unit id="stax2-api" version="3.1.4"/>
<unit id="stax2-api.source" version="3.1.4"/>
<unit id="zcommon" version="8.5.0"/>
<unit id="zcommon.sources" version="8.5.0"/>
<unit id="zel" version="8.5.0"/>
<unit id="zel.sources" version="8.5.0"/>
<unit id="zhtml" version="8.5.0"/>
<unit id="zhtml.sources" version="8.5.0"/>
<unit id="zjavassist" version="8.5.0"/>
<unit id="zjavassist.sources" version="8.5.0"/>
<unit id="zk" version="8.5.0"/>
<unit id="zk.sources" version="8.5.0"/>
<unit id="zkbind" version="8.5.0"/>
<unit id="zkbind.sources" version="8.5.0"/>
<unit id="zkplus" version="8.5.0"/>
<unit id="zkplus.sources" version="8.5.0"/>
<unit id="zul" version="8.5.0"/>
<unit id="zul.sources" version="8.5.0"/>
<unit id="zweb" version="8.5.0"/>
<unit id="zweb.sources" version="8.5.0"/>
<repository location="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/maven-p2-R20181031"/>
<unit id="bcmail" version="1.60.0"/>
<unit id="bcmail.source" version="1.60.0"/>
<unit id="bcpkix" version="1.60.0"/>
<unit id="bcpkix.source" version="1.60.0"/>
<unit id="bcprov" version="1.60.0"/>
<unit id="bcprov.source" version="1.60.0"/>
<unit id="bctsp" version="1.46.0"/>
<unit id="bctsp.source" version="1.46.0"/>
<unit id="com.ibm.icu" version="63.1.0"/>
<unit id="com.ibm.icu.source" version="63.1.0"/>
<unit id="com.itextpdf" version="5.5.13"/>
<unit id="com.itextpdf.source" version="5.5.13"/>
<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
<unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js6_b02"/>
<unit id="com.sun.activation.javax.activation" version="1.2.0"/>
<unit id="com.sun.activation.javax.activation.source" version="1.2.0"/>
<unit id="com.sun.mail.javax.mail" version="1.6.2"/>
@ -924,6 +862,8 @@
<unit id="javax.jws-api.source" version="1.1.0"/>
<unit id="javax.transaction-api" version="1.3.0"/>
<unit id="javax.transaction-api.source" version="1.3.0"/>
<unit id="javax.validation.api" version="1.1.0.Final"/>
<unit id="javax.validation.api.source" version="1.1.0.Final"/>
<unit id="javax.websocket-api" version="1.1.0"/>
<unit id="javax.websocket-api.source" version="1.1.0"/>
<unit id="javax.ws.rs-api" version="2.1.99.b01"/>
@ -940,6 +880,10 @@
<unit id="jaxws-api.source" version="2.3.1"/>
<unit id="joda-time" version="2.10.0"/>
<unit id="joda-time.source" version="2.10.0"/>
<unit id="json" version="20171018.0.0"/>
<unit id="json.source" version="20171018.0.0"/>
<unit id="net.sf.jasperreports.engine" version="6.6.0"/>
<unit id="net.sf.jasperreports.engine.source" version="6.6.0"/>
<unit id="net.sf.supercsv.super-csv" version="2.4.0"/>
<unit id="net.sf.supercsv.super-csv.source" version="2.4.0"/>
<unit id="org.apache.activemq.activemq-core" version="5.7.0"/>
@ -950,10 +894,32 @@
<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.0.14"/>
<unit id="org.apache.aries.util" version="1.1.3"/>
<unit id="org.apache.aries.util.source" version="1.1.3"/>
<unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/>
<unit id="org.apache.batik.bridge" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.codec" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.constants" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.css" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/>
<unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.ext.awt" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.extension" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.gvt" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.i18n" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.parser" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.pdf" version="1.9.1.v20180417-1407"/>
<unit id="org.apache.batik.script" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.swing" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.transcoder" version="1.9.1.v20180313-1559"/>
<unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.util.gui" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/>
<unit id="org.apache.commons.commons-collections4" version="4.2.0"/>
<unit id="org.apache.commons.commons-collections4.source" version="4.2.0"/>
<unit id="org.apache.commons.commons-configuration2" version="2.3.0"/>
<unit id="org.apache.commons.commons-configuration2.source" version="2.3.0"/>
<unit id="org.apache.commons.digester" version="2.1.0"/>
<unit id="org.apache.commons.digester.source" version="2.1.0"/>
<unit id="org.apache.commons.discovery" version="0.5.0"/>
<unit id="org.apache.commons.discovery.source" version="0.5.0"/>
<unit id="org.apache.commons.javaflow" version="1590792.0.0"/>
@ -1012,8 +978,30 @@
<unit id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec.source" version="1.0.1"/>
<unit id="org.apache.neethi" version="3.1.1"/>
<unit id="org.apache.neethi.source" version="3.1.1"/>
<unit id="org.apache.poi.poi" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml-schemas" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml.source" version="3.15.0"/>
<unit id="org.apache.poi.poi.source" version="3.15.0"/>
<unit id="org.apache.servicemix.bundles.cglib" version="3.2.6.1"/>
<unit id="org.apache.servicemix.bundles.cglib.source" version="3.2.6.1"/>
<unit id="org.apache.servicemix.bundles.jaxen" version="1.1.1.2"/>
<unit id="org.apache.servicemix.bundles.rhino" version="1.7.6.1"/>
<unit id="org.apache.servicemix.bundles.rhino.source" version="1.7.6.1"/>
<unit id="org.apache.servicemix.bundles.spring-aop" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-aop.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-beans" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-beans.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context-support" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context-support.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-core" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-core.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-expression" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-expression.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-web" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-web.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.wsdl4j" version="1.6.3.1"/>
<unit id="org.apache.servicemix.bundles.wsdl4j.source" version="1.6.3.1"/>
<unit id="org.apache.taglibs.standard-impl" version="1.2.5"/>
@ -1027,6 +1015,7 @@
<unit id="org.apache.ws.xmlschema.core" version="2.2.3"/>
<unit id="org.apache.ws.xmlschema.core.source" version="2.2.3"/>
<unit id="org.apache.xmlbeans" version="3.0.1"/>
<unit id="org.apache.xmlgraphics" version="2.2.0.v20180410-1551"/>
<unit id="org.atmosphere.runtime" version="2.5.0"/>
<unit id="org.atmosphere.runtime.source" version="2.5.0"/>
<unit id="org.cryptacular" version="1.2.2"/>
@ -1045,36 +1034,47 @@
<unit id="org.eclipse.jetty.osgi-servlet-api.source" version="3.1.0.M3"/>
<unit id="org.idempiere.org.conscrypt.openjdk-uber" version="1.4.0"/>
<unit id="org.idempiere.org.conscrypt.openjdk-uber.source" version="1.4.0"/>
<unit id="org.jfree.chart-osgi" version="1.0.19"/>
<unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
<unit id="org.krysalis.barcode4j" version="2.1.0"/>
<unit id="org.mortbay.jasper.apache-el" version="8.5.33"/>
<unit id="org.mortbay.jasper.apache-el.source" version="8.5.33"/>
<unit id="org.mortbay.jasper.apache-jsp" version="8.5.33"/>
<unit id="org.passay" version="1.3.1"/>
<unit id="org.passay.source" version="1.3.1"/>
<unit id="org.springframework.spring-jcl" version="5.1.1.RELEASE"/>
<unit id="org.springframework.spring-jcl.source" version="5.1.1.RELEASE"/>
<unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
<unit id="slf4j.api" version="1.7.25"/>
<unit id="slf4j.api.source" version="1.7.25"/>
<unit id="slf4j.jcl" version="1.7.25"/>
<unit id="slf4j.jcl.source" version="1.7.25"/>
<unit id="slf4j.jdk14" version="1.7.25"/>
<unit id="slf4j.jdk14.source" version="1.7.25"/>
<unit id="org.apache.servicemix.bundles.spring-beans" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-core" version="4.3.19.RELEASE_1"/>
<unit id="stax2-api" version="3.1.4"/>
<unit id="stax2-api" version="4.1.0"/>
<unit id="stax2-api.source" version="3.1.4"/>
<unit id="stax2-api.source" version="4.1.0"/>
<unit id="org.apache.servicemix.bundles.spring-beans.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-core.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-aop" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-aop.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context-support" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context-support.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-expression" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-expression.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-web" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-web.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.springframework.spring-jcl" version="5.1.1.RELEASE"/>
<unit id="org.springframework.spring-jcl.source" version="5.1.1.RELEASE"/>
<unit id="zcommon" version="8.5.0"/>
<unit id="zcommon.sources" version="8.5.0"/>
<unit id="zel" version="8.5.0"/>
<unit id="zel.sources" version="8.5.0"/>
<unit id="zhtml" version="8.5.0"/>
<unit id="zhtml.sources" version="8.5.0"/>
<unit id="zjavassist" version="8.5.0"/>
<unit id="zjavassist.sources" version="8.5.0"/>
<unit id="zk" version="8.5.0"/>
<unit id="zk.sources" version="8.5.0"/>
<unit id="zkbind" version="8.5.0"/>
<unit id="zkbind.sources" version="8.5.0"/>
<unit id="zkplus" version="8.5.0"/>
<unit id="zkplus.sources" version="8.5.0"/>
<unit id="zul" version="8.5.0"/>
<unit id="zul.sources" version="8.5.0"/>
<unit id="zweb" version="8.5.0"/>
<unit id="zweb.sources" version="8.5.0"/>
<repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20181031"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
</target>
</target>

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

@ -30,7 +30,7 @@
<idempiere-equinox-repository-id>eclipse-photon-201809</idempiere-equinox-repository-id>
<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository</idempiere-orbit-url>
<idempiere-orbit-repository-id>orbit-photon-R20180905201904</idempiere-orbit-repository-id>
<url.file.srv>http://downloads.sourceforge.net/project/idempiere/binary.file</url.file.srv>
<url.file.srv>https://raw.githubusercontent.com/idempiere/binary.file/master</url.file.srv>
<extra.ui.install>org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group</extra.ui.install>
<idempiere.product.id>org.adempiere.server.product</idempiere.product.id>
<codehaus.plexus>2.8.5</codehaus.plexus>

2
org.idempiere.webservices/pom.xml
View File

@ -32,7 +32,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/jarfile/6.1/idempiere-xmlbeans-1.0.jar</url>
<url>${url.file.srv}/extra.jar/idempiere-xmlbeans-1.0.jar</url>
<unpack>false</unpack>
<outputDirectory>WEB-INF/lib</outputDirectory>
<retries>5</retries>