IDEMPIERE-4136: Upgrading Jasper report to version 6.11.0
This commit is contained in:
parent
c4c5db795b
commit
f13bcd6de9
|
@ -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
|
||||
|
|
|
@ -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") + ":");
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
<stringAttribute key="pde.version" value="3.3"/>
|
||||
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
|
||||
<booleanAttribute key="run_in_ui_thread" value="true"/>
|
||||
<stringAttribute key="selected_target_plugins" value="bcprov@default:default,com.diffplug.osgi.extension.sun.misc@default:false,com.google.zxing.core@default:default,com.ibm.icu@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.smtp@default:default,groovy-console@default:false,groovy-datetime@default:false,groovy-json@default:false,groovy-jsr223@default:false,groovy-nio@default:false,groovy-swing@default:false,groovy-xml@default:false,groovy@default:default,jakarta.mail.api@default:default,jakarta.xml.bind-api@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.jms@default:default,javax.transaction@default:false,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.constants@default:default,org.apache.batik.css@default:default,org.apache.batik.i18n@default:default,org.apache.batik.util@default:default,org.apache.commons.collections@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xmlgraphics@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
|
||||
<stringAttribute key="selected_target_plugins" value="bcprov@default:default,com.diffplug.osgi.extension.sun.misc@default:false,com.google.zxing.core@default:default,com.ibm.icu@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.smtp@default:default,groovy-console@default:false,groovy-datetime@default:false,groovy-json@default:false,groovy-jsr223@default:false,groovy-nio@default:false,groovy-swing@default:false,groovy-xml@default:false,groovy@default:default,jakarta.mail.api@default:default,jakarta.xml.bind-api@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.jms@default:default,javax.transaction@default:false,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.constants@default:default,org.apache.batik.css@default:default,org.apache.batik.i18n@default:default,org.apache.batik.util@default:default,org.apache.commons.collections@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xmlgraphics@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart@default:default,org.jfree.jcommon@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
|
||||
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.apache.ecs@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:default"/>
|
||||
<booleanAttribute key="show_selected_only" value="false"/>
|
||||
<booleanAttribute key="tracing" value="false"/>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
|
||||
<stringAttribute key="pde.version" value="3.3"/>
|
||||
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
|
||||
<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.google.zxing.core@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.gimap@default:default,com.sun.mail.imap@default:default,com.sun.mail.jakarta.mail@default:default,com.sun.mail.smtp@default:default,groovy@default:default,jakarta.mail.api@default:default,jakarta.xml.bind-api@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.200.v20181130-2106@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.4.1@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
|
||||
<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.google.zxing.core@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.gimap@default:default,com.sun.mail.imap@default:default,com.sun.mail.jakarta.mail@default:default,com.sun.mail.smtp@default:default,groovy@default:default,jakarta.mail.api@default:default,jakarta.xml.bind-api@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.commons-collections4@default:default,org.apache.commons.compress*1.18.0.v20181121-2221@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xmlbeans*3.1.0@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.200.v20181130-2106@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.jfree.chart@default:default,org.jfree.jcommon@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.4.1@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
|
||||
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
|
||||
<booleanAttribute key="show_selected_only" value="false"/>
|
||||
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
|
||||
<stringAttribute key="pde.version" value="3.3"/>
|
||||
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
|
||||
<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.google.zxing.core@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.gimap@default:default,com.sun.mail.imap@default:default,com.sun.mail.jakarta.mail@default:default,com.sun.mail.smtp@default:default,groovy@default:default,jakarta.mail.api@default:default,jakarta.xml.bind-api@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.200.v20181130-2106@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.4.1@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
|
||||
<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.google.zxing.core@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.gimap@default:default,com.sun.mail.imap@default:default,com.sun.mail.jakarta.mail@default:default,com.sun.mail.smtp@default:default,groovy@default:default,jakarta.mail.api@default:default,jakarta.xml.bind-api@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.commons-collections4@default:default,org.apache.commons.compress*1.18.0.v20181121-2221@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xmlbeans*3.1.0@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.200.v20181130-2106@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.jfree.chart@default:default,org.jfree.jcommon@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.4.1@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
|
||||
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
|
||||
<booleanAttribute key="show_selected_only" value="false"/>
|
||||
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.jfree.jcommon-osgi"
|
||||
id="org.jfree.jcommon"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
|
@ -93,7 +93,7 @@
|
|||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.jfree.chart-osgi"
|
||||
id="org.jfree.chart"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
|
|
|
@ -5,7 +5,7 @@ Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
|
|||
Bundle-Version: 7.1.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.3.1"
|
||||
Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.11.0"
|
||||
Bundle-ClassPath: .,
|
||||
lib/castor-core.jar,
|
||||
lib/castor-xml.jar,
|
||||
|
|
|
@ -26,12 +26,12 @@
|
|||
<artifactItem>
|
||||
<groupId>org.codehaus.castor</groupId>
|
||||
<artifactId>castor-core</artifactId>
|
||||
<version>1.3.3</version>
|
||||
<version>1.4.1</version>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.codehaus.castor</groupId>
|
||||
<artifactId>castor-xml</artifactId>
|
||||
<version>1.3.3</version>
|
||||
<version>1.4.1</version>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>net.sf.jasperreports</groupId>
|
||||
|
@ -48,6 +48,11 @@
|
|||
<artifactId>jasperreports-functions</artifactId>
|
||||
<version>${jp.version}</version>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>net.sf.jasperreports</groupId>
|
||||
<artifactId>jasperreports-fonts</artifactId>
|
||||
<version>${jp.version}</version>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.olap4j</groupId>
|
||||
<artifactId>olap4j</artifactId>
|
||||
|
@ -56,7 +61,7 @@
|
|||
<artifactItem>
|
||||
<groupId>com.adobe.xmp</groupId>
|
||||
<artifactId>xmpcore</artifactId>
|
||||
<version>5.1.1</version>
|
||||
<version>5.1.3</version>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
<outputDirectory>lib</outputDirectory>
|
||||
|
@ -67,26 +72,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.googlecode.maven-download-plugin</groupId>
|
||||
<artifactId>download-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>download-db-seed-oracle</id>
|
||||
<phase>validate</phase>
|
||||
<goals>
|
||||
<goal>wget</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<url>${url.file.srv}/extra.jar/jasperreports-fonts-${jp.version}.jar</url>
|
||||
<unpack>false</unpack>
|
||||
<outputDirectory>lib</outputDirectory>
|
||||
<outputFileName>jasperreports-fonts.jar</outputFileName>
|
||||
<retries>5</retries>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -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,\
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -44,8 +44,8 @@
|
|||
<layout>p2</layout>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>jasperstudio-6.6.0</id>
|
||||
<url>https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0</url>
|
||||
<id>jasperstudio-6.11.0</id>
|
||||
<url>https://sourceforge.net/projects/jasperstudio/files/updatesite/6.11.0</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
<repository>
|
||||
|
@ -99,7 +99,7 @@
|
|||
</instructions>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>org.jfree:jcommon:1.0.21</id>
|
||||
<id>org.jfree:jcommon:1.0.23</id>
|
||||
<source>true</source>
|
||||
<transitive>false</transitive>
|
||||
<override>true</override>
|
||||
|
@ -1227,7 +1227,7 @@
|
|||
<instructions>
|
||||
<Bundle-SymbolicName>org.apache.poi.poi-ooxml-schemas</Bundle-SymbolicName>
|
||||
<Bundle-Name>poi-ooxml-schemas</Bundle-Name>
|
||||
<Import-Package>*;resolution:=optional</Import-Package>
|
||||
<Import-Package>*;resolution:=optional,org.apache.xmlbeans.impl.schema</Import-Package>
|
||||
<Export-Package>*</Export-Package>
|
||||
</instructions>
|
||||
</artifact>
|
||||
|
@ -1690,7 +1690,7 @@
|
|||
<id>com.jaspersoft.studio.bundles.barbecue:1.5.0.beta1_b02</id>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>com.jaspersoft.studio.bundles.itext:2.1.7.js6_b02</id>
|
||||
<id>com.jaspersoft.studio.bundles.itext:2.1.7.js7_b01</id>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>org.w3c.dom.svg.patch:1.1.0.b02</id>
|
||||
|
|
|
@ -900,7 +900,7 @@
|
|||
<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.jaspersoft.studio.bundles.itext" version="2.1.7.js7_b01"/>
|
||||
<unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
|
||||
<unit id="com.sun.activation.jakarta.activation.source" version="1.2.1"/>
|
||||
<unit id="com.sun.mail.gimap" version="1.6.3"/>
|
||||
|
@ -977,8 +977,8 @@
|
|||
<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.jasperreports.engine" version="6.11.0"/>
|
||||
<unit id="net.sf.jasperreports.engine.source" version="6.11.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"/>
|
||||
|
@ -1009,8 +1009,8 @@
|
|||
<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-collections4" version="4.4.0"/>
|
||||
<unit id="org.apache.commons.commons-collections4.source" version="4.4.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"/>
|
||||
|
@ -1081,12 +1081,12 @@
|
|||
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6"/>
|
||||
<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" version="4.1.0"/>
|
||||
<unit id="org.apache.poi.poi-ooxml" version="4.1.0"/>
|
||||
<unit id="org.apache.poi.poi-ooxml-schemas" version="4.1.0"/>
|
||||
<!-- unit id="org.apache.poi.poi-ooxml-schemas.source" 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.poi.poi-ooxml.source" version="4.1.0"/>
|
||||
<unit id="org.apache.poi.poi.source" version="4.1.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"/>
|
||||
|
@ -1118,7 +1118,8 @@
|
|||
<unit id="org.apache.velocity.source" version="1.7.0"/>
|
||||
<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.xmlbeans" version="3.1.0"/>
|
||||
<unit id="org.apache.xmlbeans.source" version="3.1.0"/>
|
||||
<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"/>
|
||||
|
@ -1212,8 +1213,8 @@
|
|||
<unit id="org.eclipse.jetty.websocket.servlet.source" version="9.4.14.v20181114"/>
|
||||
<unit id="org.eclipse.jetty.xml" version="9.4.14.v20181114"/>
|
||||
<unit id="org.eclipse.jetty.xml.source" version="9.4.14.v20181114"/>
|
||||
<unit id="org.jfree.chart-osgi" version="1.0.19"/>
|
||||
<unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
|
||||
<unit id="org.jfree.chart" version="1.0.19"/>
|
||||
<unit id="org.jfree.jcommon" 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"/>
|
||||
|
@ -1270,7 +1271,7 @@
|
|||
<unit id="zweb" version="8.6.0.1"/>
|
||||
<unit id="zweb.sources" version="8.6.0.1"/>
|
||||
<unit id="org.apache.servicemix.bundles.xerces" version="2.9.1.5"/>
|
||||
<repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20190411"/>
|
||||
<repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20191224"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
|
||||
<unit id="com.sun.istack.commons-runtime" version="3.0.8"/>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<tycho.version>1.5.0</tycho.version>
|
||||
<tycho.extras.version>${tycho.version}</tycho.extras.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<jp.version>6.7.0</jp.version>
|
||||
<jp.version>6.11.0</jp.version>
|
||||
<zk.version>8.6.0.1</zk.version>
|
||||
<zk.javassist.src.version>3.23.1-GA</zk.javassist.src.version>
|
||||
<maven.dependency.version>3.1.1</maven.dependency.version>
|
||||
|
|
Loading…
Reference in New Issue