diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath index 1767e4d2d6..bf57879ec2 100644 --- a/org.adempiere.base/.classpath +++ b/org.adempiere.base/.classpath @@ -7,16 +7,16 @@ - + - - + + - - + + diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index 8a78586241..0c778d2651 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -9,16 +9,16 @@ Bundle-ClassPath: base.jar, groovy-engine.jar, jython-engine.jar, jython.jar, - cron4j-2.2.1.jar, + cron4j-2.2.5.jar, barbecue-1.5-beta1.jar, iText-2.1.7.jar, - jcommon-1.0.16.jar, - jfreechart-1.0.13.jar, + jcommon-1.0.23.jar, + jfreechart-1.0.19.jar, jnlp.jar, groovy-all-1.7.5.jar, vt-dictionary-3.0.jar, - vt-password-3.1.1.jar, - super-csv-2.0.0-beta-1.jar, + vt-password-3.1.2.jar, + super-csv-2.2.0.jar, barcode4j-2.1.jar, bcprov-jdk15on-1.46.jar Export-Package: bsh, diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties index 06c6874dd8..4dfc9b2351 100644 --- a/org.adempiere.base/build.properties +++ b/org.adempiere.base/build.properties @@ -6,17 +6,17 @@ bin.includes = META-INF/,\ groovy-engine.jar,\ jython-engine.jar,\ jython.jar,\ - cron4j-2.2.1.jar,\ + cron4j-2.2.5.jar,\ barbecue-1.5-beta1.jar,\ iText-2.1.7.jar,\ - jcommon-1.0.16.jar,\ - jfreechart-1.0.13.jar,\ + jcommon-1.0.23.jar,\ + jfreechart-1.0.19.jar,\ jnlp.jar,\ OSGI-INF/,\ groovy-all-1.7.5.jar,\ vt-dictionary-3.0.jar,\ - vt-password-3.1.1.jar,\ - super-csv-2.0.0-beta-1.jar,\ + vt-password-3.1.2.jar,\ + super-csv-2.2.0.jar,\ OSGI-INF/dslocator.xml,\ OSGI-INF/serverbean.xml,\ OSGI-INF/statusbean.xml,\ diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 2122aceda3..fe488cb30c 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -21,8 +21,8 @@ - - + + diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath index e2b23d29b9..eb18988d45 100644 --- a/org.adempiere.report.jasper.library/.classpath +++ b/org.adempiere.report.jasper.library/.classpath @@ -3,9 +3,9 @@ - - - + + + diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF index 9a532f4b03..509cfd19a8 100644 --- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: org.adempiere.report.jasper.library Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar, lib/commons-digester-2.1.jar, - lib/jasperreports-5.1.2.jar, - lib/jasperreports-fonts-5.1.2.jar, - lib/jackson-core-2.0.5.jar, + lib/jasperreports-5.6.1.jar, + lib/jasperreports-fonts-5.6.1.jar, + lib/jackson-core-2.1.4.jar, lib/xalan-2.7.1.jar Export-Package: ., com.fasterxml.jackson.core, @@ -33,8 +33,7 @@ Export-Package: ., net.sf.jasperreports.components.charts, net.sf.jasperreports.components.headertoolbar, net.sf.jasperreports.components.headertoolbar.actions, - net.sf.jasperreports.components.headertoolbar.htmlv2, - net.sf.jasperreports.components.headertoolbar.htmlv2.resources, + net.sf.jasperreports.components.headertoolbar.json, net.sf.jasperreports.components.headertoolbar.resources, net.sf.jasperreports.components.headertoolbar.resources.images, net.sf.jasperreports.components.headertoolbar.resources.images.format, @@ -44,7 +43,6 @@ Export-Package: ., net.sf.jasperreports.components.list, net.sf.jasperreports.components.map, net.sf.jasperreports.components.map.fill, - net.sf.jasperreports.components.map.resources, net.sf.jasperreports.components.map.resources.templates, net.sf.jasperreports.components.map.type, net.sf.jasperreports.components.sort, @@ -61,6 +59,7 @@ Export-Package: ., net.sf.jasperreports.crosstabs.design, net.sf.jasperreports.crosstabs.fill, net.sf.jasperreports.crosstabs.fill.calculation, + net.sf.jasperreports.crosstabs.interactive, net.sf.jasperreports.crosstabs.type, net.sf.jasperreports.crosstabs.xml, net.sf.jasperreports.data, @@ -70,6 +69,7 @@ Export-Package: ., net.sf.jasperreports.data.ds, net.sf.jasperreports.data.ejbql, net.sf.jasperreports.data.empty, + net.sf.jasperreports.data.excel, net.sf.jasperreports.data.hibernate, net.sf.jasperreports.data.hibernate.spring, net.sf.jasperreports.data.jdbc, @@ -95,7 +95,6 @@ Export-Package: ., net.sf.jasperreports.engine.export, net.sf.jasperreports.engine.export.data, net.sf.jasperreports.engine.export.draw, - net.sf.jasperreports.engine.export.legacy, net.sf.jasperreports.engine.export.oasis, net.sf.jasperreports.engine.export.ooxml, net.sf.jasperreports.engine.export.ooxml.docx, @@ -123,6 +122,10 @@ Export-Package: ., net.sf.jasperreports.engine.util.xml, net.sf.jasperreports.engine.virtualization, net.sf.jasperreports.engine.xml, + net.sf.jasperreports.export, + net.sf.jasperreports.export.annotations, + net.sf.jasperreports.export.parameters, + net.sf.jasperreports.export.type, net.sf.jasperreports.expressions, net.sf.jasperreports.extensions, net.sf.jasperreports.fonts, @@ -134,10 +137,12 @@ Export-Package: ., net.sf.jasperreports.olap, net.sf.jasperreports.olap.mapping, net.sf.jasperreports.olap.mondrian, + net.sf.jasperreports.olap.olap4j, net.sf.jasperreports.olap.result, net.sf.jasperreports.olap.xmla, net.sf.jasperreports.renderers, net.sf.jasperreports.repo, + net.sf.jasperreports.search, net.sf.jasperreports.swing, net.sf.jasperreports.types.date, net.sf.jasperreports.util, diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties index 5d3a0d0db3..b114c0c77b 100644 --- a/org.adempiere.report.jasper.library/build.properties +++ b/org.adempiere.report.jasper.library/build.properties @@ -1,7 +1,7 @@ bin.includes = META-INF/,\ lib/commons-beanutils-1.8.0.jar,\ lib/commons-digester-2.1.jar,\ - lib/jasperreports-5.1.2.jar,\ - lib/jasperreports-fonts-5.1.2.jar,\ - lib/jackson-core-2.0.5.jar,\ + lib/jasperreports-5.6.1.jar,\ + lib/jasperreports-fonts-5.6.1.jar,\ + lib/jackson-core-2.1.4.jar,\ lib/xalan-2.7.1.jar diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 66f1a03ea7..3053589277 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -24,7 +24,7 @@ - + diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath index fc3e243f2c..036bcb4b61 100644 --- a/org.compiere.db.oracle.provider/.classpath +++ b/org.compiere.db.oracle.provider/.classpath @@ -3,9 +3,9 @@ - - - - + + + + diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index 8ccb4ad7a3..daeed551d8 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.adempiere.base;bundle-version="3.0.0", org.adempiere.install;bundle-version="3.0.0" Bundle-ClassPath: ., - ojdbc6.jar, - c3p0-0.9.2.jar, - c3p0-oracle-thin-extras-0.9.2.jar, - mchange-commons-java-0.2.3.3.jar + ojdbc7.jar, + c3p0-0.9.5-pre9.jar, + c3p0-oracle-thin-extras-0.9.5-pre9.jar, + mchange-commons-java-0.2.8.jar Import-Package: org.osgi.framework Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator diff --git a/org.compiere.db.oracle.provider/build.properties b/org.compiere.db.oracle.provider/build.properties index ff25cde9bf..da84e0fe36 100644 --- a/org.compiere.db.oracle.provider/build.properties +++ b/org.compiere.db.oracle.provider/build.properties @@ -2,10 +2,10 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.xml,\ - ojdbc6.jar,\ + ojdbc7.jar,\ OSGI-INF/oracleprovider.xml,\ OSGI-INF/,\ - c3p0-0.9.2.jar,\ - c3p0-oracle-thin-extras-0.9.2.jar,\ - mchange-commons-java-0.2.3.3.jar + c3p0-0.9.5-pre9.jar,\ + c3p0-oracle-thin-extras-0.9.5-pre9.jar,\ + mchange-commons-java-0.2.8.jar source.. = src/ diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath index b28578f71d..d1f1933da9 100644 --- a/org.compiere.db.postgresql.provider/.classpath +++ b/org.compiere.db.postgresql.provider/.classpath @@ -3,8 +3,8 @@ - - - + + + diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index 4a8c459f33..6c2f088aaa 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true Bundle-Version: 3.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ClassPath: ., - postgresql-9.2-1004.jdbc4.jar, - c3p0-0.9.2.jar, - mchange-commons-java-0.2.3.3.jar + postgresql-9.3-1102.jdbc41.jar, + c3p0-0.9.5-pre9.jar, + mchange-commons-java-0.2.8.jar Require-Bundle: org.adempiere.base;bundle-version="3.0.0", org.adempiere.install;bundle-version="3.0.0" Import-Package: junit.framework;version="3.8.2", diff --git a/org.compiere.db.postgresql.provider/build.properties b/org.compiere.db.postgresql.provider/build.properties index c93322236d..7c9025d892 100644 --- a/org.compiere.db.postgresql.provider/build.properties +++ b/org.compiere.db.postgresql.provider/build.properties @@ -4,7 +4,7 @@ bin.includes = META-INF/,\ plugin.xml,\ OSGI-INF/pgprovider.xml,\ OSGI-INF/,\ - c3p0-0.9.2.jar,\ - mchange-commons-java-0.2.3.3.jar,\ - postgresql-9.2-1004.jdbc4.jar + c3p0-0.9.5-pre9.jar,\ + mchange-commons-java-0.2.8.jar,\ + postgresql-9.3-1102.jdbc41.jar source.. = src/