From f5412a0e1a0451afee430054408d819e8ea78047 Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Mon, 23 Dec 2019 12:18:10 +0530 Subject: [PATCH 1/3] IDEMPIERE-4136: Patch from Heip add generate jfree osgi bundle, update poi --- .../org.idempiere.maven.to.p2/pom.xml | 50 ++++++++++++------- 1 file changed, 31 insertions(+), 19 deletions(-) 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 28e790c502..4a9ea5fe72 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 @@ -34,6 +34,7 @@ 7.0 2.4.1 1.6.3 + 4.1.0 @@ -42,10 +43,6 @@ http://download.eclipse.org/tools/orbit/downloads/drops2/R20180531190352/repository p2 - - org.jfree.chart - http://nexus.orbisgis.org/content/repositories/osgi-maven - jasperstudio-6.6.0 https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0 @@ -88,6 +85,31 @@ GPL v2.1 true + + org.jfree:jfreechart:1.0.19 + true + false + true + + *;resolution:=optional + * + + + + org.jfree:jcommon:1.0.21 + true + false + true + + *;resolution:=optional + * + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:jar:2.9.1_5 + true + false + org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:jar:2.9.1_5 true @@ -385,7 +407,7 @@ false - org.apache.commons:commons-collections4:jar:4.2 + org.apache.commons:commons-collections4:jar:4.4 true false @@ -564,7 +586,7 @@ false - org.apache.xmlbeans:xmlbeans:jar:3.0.1 + org.apache.xmlbeans:xmlbeans:jar:3.1.0 true false @@ -1176,17 +1198,7 @@ false - org.jfree:jfreechart-osgi:jar:1.0.19 - true - false - - - org.jfree:jcommon-osgi:jar:1.0.23 - true - false - - - org.apache.poi:poi:jar:3.15 + org.apache.poi:poi:jar:${poi.version} true false true @@ -1198,7 +1210,7 @@ - org.apache.poi:poi-ooxml:jar:3.15 + org.apache.poi:poi-ooxml:jar:${poi.version} true false true @@ -1210,7 +1222,7 @@ - org.apache.poi:poi-ooxml-schemas:jar:3.15 + org.apache.poi:poi-ooxml-schemas:jar:${poi.version} true false true From c4c5db795b67eb910b491698b7d3b48f633855fe Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Mon, 23 Dec 2019 12:24:14 +0530 Subject: [PATCH 2/3] IDEMPIERE-4136: Patch from hiep dupplicate bundle noted: 1. org.reficio isn't respect skipInvalidArtifacts, skipNotExistingArtifacts when a issue happen with artifact INSIDE it will respect in case that artifact not inside 2. good practice then search for exists "java.lang.RuntimeException" --- .../org.idempiere.maven.to.p2/pom.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 4a9ea5fe72..65bee1f8ea 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 @@ -72,6 +72,9 @@ site + false + false + org.idempiere.maven.feature @@ -105,11 +108,6 @@ * - - org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:jar:2.9.1_5 - true - false - org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:jar:2.9.1_5 true From f13bcd6de98245f26c77b4a6fbd2d98b6c60966c Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Wed, 25 Dec 2019 20:28:37 +0530 Subject: [PATCH 3/3] IDEMPIERE-4136: Upgrading Jasper report to version 6.11.0 --- org.adempiere.base/META-INF/MANIFEST.MF | 26 +++++++--------- .../print/export/PrintDataExcelExporter.java | 2 +- org.adempiere.extend/SamplePluginTest.launch | 2 +- org.adempiere.install/install.app.launch | 2 +- .../install.console.app.launch | 2 +- .../feature.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- org.adempiere.report.jasper.library/pom.xml | 31 +++++-------------- .../server.product.launch | 2 +- .../setup/configuration/config.ini | 4 +-- .../swingclient.product.launch | 2 +- org.adempiere.ui.swing/META-INF/MANIFEST.MF | 4 +-- .../META-INF/MANIFEST.MF | 6 ++-- .../META-INF/MANIFEST.MF | 4 +-- .../org.idempiere.maven.to.p2/pom.xml | 10 +++--- .../org.idempiere.p2.targetplatform.target | 29 ++++++++--------- org.idempiere.parent/pom.xml | 2 +- 17 files changed, 58 insertions(+), 76 deletions(-) diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index 5c43d3f40e..fb14b14cfe 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -74,8 +74,9 @@ Import-Package: com.google.zxing, net.sourceforge.barbecue, net.sourceforge.barbecue.linear.ean, org.apache.activemq;version="5.3.0", - org.apache.commons.collections;version="3.2.0", - org.apache.commons.collections.keyvalue;version="3.2.0", + org.apache.commons.collections;version="3.2.2", + org.apache.commons.collections.keyvalue;version="3.2.2", + org.apache.commons.collections4;version="4.4.0", org.apache.commons.net;version="2.0.0", org.apache.commons.net.ftp, org.apache.ecs, @@ -86,16 +87,6 @@ Import-Package: com.google.zxing, org.eclipse.core.runtime;version="3.4.0", org.eclipse.osgi.framework.console;version="1.1.0", org.eclipse.osgi.service.datalocation, - org.jfree.chart;version="1.0.19", - org.jfree.chart.axis;version="1.0.19", - org.jfree.chart.plot;version="1.0.19", - org.jfree.chart.renderer.category;version="1.0.19", - org.jfree.data.category;version="1.0.19", - org.jfree.data.general;version="1.0.19", - org.jfree.data.time;version="1.0.19", - org.jfree.data.xy;version="1.0.19", - org.jfree.date;version="1.0.23", - org.jfree.io;version="1.0.23", org.krysalis.barcode4j;version="2.1.0", org.krysalis.barcode4j.impl;version="2.1.0", org.krysalis.barcode4j.impl.upcean;version="2.1.0", @@ -125,8 +116,13 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", bcprov;bundle-version="1.54.0", org.krysalis.barcode4j;bundle-version="0.0.0", groovy, - org.apache.poi.poi;bundle-version="3.15.0", - org.apache.poi.poi-ooxml;bundle-version="3.15.0", - com.sun.activation.jakarta.activation;bundle-version="1.2.1" + com.sun.activation.jakarta.activation;bundle-version="1.2.1", + org.apache.poi.poi;bundle-version="4.1.0", + org.apache.poi.poi-ooxml;bundle-version="4.1.0", + org.apache.commons.compress;bundle-version="1.18.0", + org.apache.poi.poi-ooxml-schemas;bundle-version="4.1.0", + org.apache.xmlbeans;bundle-version="3.1.0", + org.jfree.chart;bundle-version="1.0.19", + org.jfree.jcommon;bundle-version="1.0.23" Automatic-Module-Name: org.adempiere.base Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java b/org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java index 0be1716b35..6746c2b640 100644 --- a/org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java +++ b/org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java @@ -338,7 +338,7 @@ extends AbstractExcelExporter HSSFCell cell = row.createCell(0); HSSFCellStyle style = m_workbook.createCellStyle(); HSSFFont font = m_workbook.createFont(); - font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); + font.setBold(true); style.setFont(font); cell.setCellStyle(style); String value = Util.stripDiacritics(Msg.getMsg(getCtx(), "Parameter") + ":"); diff --git a/org.adempiere.extend/SamplePluginTest.launch b/org.adempiere.extend/SamplePluginTest.launch index e4ee9e6fe2..8d6060a9cf 100644 --- a/org.adempiere.extend/SamplePluginTest.launch +++ b/org.adempiere.extend/SamplePluginTest.launch @@ -33,7 +33,7 @@ - + diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 00ed7a28b6..4ecbc5151e 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -24,7 +24,7 @@ - + diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index bf4cfdcc59..831cef706e 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -24,7 +24,7 @@ - + diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml index 7d3d10c081..d3412cb3f1 100644 --- a/org.adempiere.report.jasper-feature/feature.xml +++ b/org.adempiere.report.jasper-feature/feature.xml @@ -79,7 +79,7 @@ unpack="false"/> org.codehaus.castor castor-core - 1.3.3 + 1.4.1 org.codehaus.castor castor-xml - 1.3.3 + 1.4.1 net.sf.jasperreports @@ -48,6 +48,11 @@ jasperreports-functions ${jp.version} + + net.sf.jasperreports + jasperreports-fonts + ${jp.version} + org.olap4j olap4j @@ -56,7 +61,7 @@ com.adobe.xmp xmpcore - 5.1.1 + 5.1.3 lib @@ -67,26 +72,6 @@ - - com.googlecode.maven-download-plugin - download-maven-plugin - - - download-db-seed-oracle - validate - - wget - - - ${url.file.srv}/extra.jar/jasperreports-fonts-${jp.version}.jar - false - lib - jasperreports-fonts.jar - 5 - - - - diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index b6c6f61862..92bad51bb7 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index e87a843777..60c5256951 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -52,8 +52,8 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ net.sf.supercsv.super-csv,\ com.itextpdf,\ com.jaspersoft.studio.bundles.barbecue,\ - org.jfree.chart-osgi,\ - org.jfree.jcommon-osgi,\ + org.jfree.chart,\ + org.jfree.jcommon,\ org.krysalis.barcode4j,\ bcprov,\ bcpkix,\ diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch index fc005e5bf5..7e15bf6b4e 100644 --- a/org.adempiere.ui.swing-feature/swingclient.product.launch +++ b/org.adempiere.ui.swing-feature/swingclient.product.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF index 446f6dee58..fefd6b093e 100644 --- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF @@ -72,7 +72,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.ui;bundle-version="0.0.0", org.restlet;bundle-version="0.0.0", org.restlet.ext.servlet;bundle-version="0.0.0", - org.jfree.chart-osgi;bundle-version="1.0.19" + org.jfree.chart;bundle-version="1.0.19", + org.jfree.jcommon;bundle-version="1.0.23" Eclipse-ExtensibleAPI: true Eclipse-RegisterBuddy: org.adempiere.base Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -118,7 +119,6 @@ Import-Package: groovy.beans;version="2.5.3", org.compiere.css, org.eclipse.core.runtime;version="3.4.0", org.eclipse.equinox.app, - org.jfree.ui;version="1.0.23", org.osgi.framework;version="1.5.0" Service-Component: OSGI-INF/*.xml Bundle-ActivationPolicy: lazy diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index da65228a03..b553df0d36 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -6,14 +6,14 @@ Bundle-Version: 7.1.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", - org.adempiere.install;bundle-version="0.0.0" + org.adempiere.install;bundle-version="0.0.0", + org.jfree.jcommon;bundle-version="1.0.23" Bundle-ClassPath: ., lib/c3p0-oracle-thin-extras.jar, lib/c3p0.jar, lib/mchange-commons-java.jar, lib/ojdbc7.jar -Import-Package: org.jfree.io;version="1.0.23", - org.osgi.framework, +Import-Package: org.osgi.framework, org.slf4j;version="1.7.2" Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index 61178ac8e5..8f3f4ee035 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -10,9 +10,9 @@ Bundle-ClassPath: ., lib/mchange-commons-java.jar, lib/postgresql.jar Require-Bundle: org.adempiere.base;bundle-version="0.0.0", - org.adempiere.install;bundle-version="0.0.0" + org.adempiere.install;bundle-version="0.0.0", + org.jfree.jcommon;bundle-version="1.0.23" Import-Package: junit.framework;version="3.8.2", - org.jfree.io;version="1.0.23", org.junit;version="4.8.1", org.osgi.framework, org.slf4j;version="1.7.2" 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 65bee1f8ea..b21e8b5810 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 @@ -44,8 +44,8 @@ p2 - jasperstudio-6.6.0 - https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0 + jasperstudio-6.11.0 + https://sourceforge.net/projects/jasperstudio/files/updatesite/6.11.0 p2 @@ -99,7 +99,7 @@ - org.jfree:jcommon:1.0.21 + org.jfree:jcommon:1.0.23 true false true @@ -1227,7 +1227,7 @@ org.apache.poi.poi-ooxml-schemas poi-ooxml-schemas - *;resolution:=optional + *;resolution:=optional,org.apache.xmlbeans.impl.schema * @@ -1690,7 +1690,7 @@ com.jaspersoft.studio.bundles.barbecue:1.5.0.beta1_b02 - com.jaspersoft.studio.bundles.itext:2.1.7.js6_b02 + com.jaspersoft.studio.bundles.itext:2.1.7.js7_b01 org.w3c.dom.svg.patch:1.1.0.b02 diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 3ec518e83e..99b2877ba0 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -900,7 +900,7 @@ - + @@ -977,8 +977,8 @@ - - + + @@ -1009,8 +1009,8 @@ - - + + @@ -1081,12 +1081,12 @@ - - - + + + - - + + @@ -1118,7 +1118,8 @@ - + + @@ -1212,8 +1213,8 @@ - - + + @@ -1270,7 +1271,7 @@ - + diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 04b56826cf..3aa4220af3 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -13,7 +13,7 @@ 1.5.0 ${tycho.version} UTF-8 - 6.7.0 + 6.11.0 8.6.0.1 3.23.1-GA 3.1.1