diff --git a/CHANGES b/CHANGES new file mode 100644 index 0000000..f66f40a --- /dev/null +++ b/CHANGES @@ -0,0 +1,21 @@ +Release Notes - PHPJasper - Version 1.15 +======================================================== + +** Improvement + * Updated JasperStarter to Version 3.1.0 + +________________________________________________________ + + +Release Notes - JasperStarter - Version 3.1.0 +======================================================== + +** New Feature + * [JAS-83] - JSON file as a data source + +** Task + * [JAS-95] - Include JasperReports 6.4.0 + +** Improvement + * [JAS-84] - How to pass $P{XML_DATA_DOCUMENT} to sub report - additional documentation +________________________________________________________ \ No newline at end of file diff --git a/README.md b/README.md index db4c551..2f63b46 100755 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Bitcoin Donations](https://img.shields.io/badge/bitcoin-donation-orange.svg)](https://blockchain.info/address/1LqwqcMfNuNzq6S671z1HjM61MpBuFCGqg) ### Docs -[![Language-pt_BR](https://img.shields.io/badge/pt__BR-100%25-green.svg)](https://github.com/geekcom/phpjasper/blob/master/docs/pt_BR/LEIA-ME_pt_BR.md) +[![Language-pt_BR](https://img.shields.io/badge/pt__BR-100%25-green.svg)](https://github.com/PHPJasper/phpjasper/blob/master/docs/pt_BR/LEIA-ME_pt_BR.md) ### About This package is the solution to compile and process JasperReports (.jrxml & .jasper files) just using PHP. @@ -47,7 +47,7 @@ It is recommended using [Jaspersoft Studio](http://community.jaspersoft.com/proj * Reports * Listings -Package to generate reports with [JasperReports 6.3.1](http://community.jaspersoft.com/project/jaspersoft-studio/releases) library through [JasperStarter v3](http://jasperstarter.sourceforge.net/) command-line tool. +Package to generate reports with [JasperReports 6.3.1](http://community.jaspersoft.com/project/jaspersoft-studio/releases) library through [JasperStarter v3.1.0](https://bitbucket.org/cenote/jasperstarter) command-line tool. ## Requirements @@ -96,7 +96,7 @@ composer require geekcom/phpjasper ``` Or in your file'composer.json' add: -```javascript +```json { "require": { "geekcom/phpjasper": "1.*" @@ -348,15 +348,15 @@ I have a report that generates a *Invoice* with a DB connection, images and mult [JetBrains](https://www.jetbrains.com/) for the [PhpStorm](https://www.jetbrains.com/phpstorm/) and all great tools. -## [Questions?](https://github.com/geekcom/phpjasper/issues) +## [Questions?](https://github.com/PHPJasper/phpjasper/issues) -Open a new [Issue](https://github.com/geekcom/phpjasper/issues) or look for a closed issue +Open a new [Issue](https://github.com/PHPJasper/phpjasper/issues) or look for a closed issue -## [License](https://github.com/geekcom/phpjasper/blob/master/LICENSE) +## [License](https://github.com/PHPJasper/phpjasper/blob/master/LICENSE) MIT -## [Contribute](https://github.com/geekcom/phpjasper/blob/master/CONTRIBUTING.md) +## [Contribute](https://github.com/PHPJasper/phpjasper/blob/master/CONTRIBUTING.md) -Contribute to the community PHP, make a fork!! +Contribute to the community PHP, make a fork!! \ No newline at end of file diff --git a/bin/jasperstarter/CHANGES b/bin/jasperstarter/CHANGES index bc6b829..756ed9c 100755 --- a/bin/jasperstarter/CHANGES +++ b/bin/jasperstarter/CHANGES @@ -2,6 +2,19 @@ JasperStarter - Running JasperReports from command line ======================================================== +Release Notes - JasperStarter - Version 3.1.0 +--------------------------------------------- + +** New Feature + * [JAS-83] - JSON file as a data source + +** Task + * [JAS-95] - Include JasperReports 6.4.0 + +** Improvement + * [JAS-84] - How to pass $P{XML_DATA_DOCUMENT} to sub report - additional documentation + + Release Notes - JasperStarter - Version 3.0.0 --------------------------------------------- diff --git a/bin/jasperstarter/README.md b/bin/jasperstarter/README.md index 556fbc7..1ca00c3 100755 --- a/bin/jasperstarter/README.md +++ b/bin/jasperstarter/README.md @@ -95,21 +95,6 @@ project website is hosted at [Sourceforge][]. JasperStarter is build with [Maven][]. -Unfortunately one dependency (jasperreports-functions) is not provided -in a public maven repository so you must add it to your local maven -repo: - - # Download jasperreports-functions-6.1.0.jar from - # https://sourceforge.net/projects/jasperreports/files/jasperreports/ - $ jar xvf jasperreports-functions-6.1.0.jar META-INF/maven/net.sf.jasperreports/jasperreports-functions/pom.xml - $ mvn install:install-file -Dfile=jasperreports-functions-6.1.0.jar -DpomFile=META-INF/maven/net.sf.jasperreports/jasperreports-functions/pom.xml - -See https://maven.apache.org/guides/mini/guide-3rd-party-jars-local.html - -It is possible to compile JasperStarter without this dependency but users -will run into errors if they use specific functions in their reports. -So there is a test that fails if jasperreports-functions is not available. - On Linux 64 bit the launch4j-maven-plugin may fail. You need the folloing libs in a 32 bit version: * z1 diff --git a/bin/jasperstarter/bin/jasperstarter.exe b/bin/jasperstarter/bin/jasperstarter.exe index 40ee73c..b955fea 100755 Binary files a/bin/jasperstarter/bin/jasperstarter.exe and b/bin/jasperstarter/bin/jasperstarter.exe differ diff --git a/bin/jasperstarter/lib/commons-collections-3.2.1.jar b/bin/jasperstarter/lib/commons-collections-3.2.1.jar deleted file mode 100644 index c35fa1f..0000000 Binary files a/bin/jasperstarter/lib/commons-collections-3.2.1.jar and /dev/null differ diff --git a/bin/jasperstarter/lib/commons-collections-3.2.2.jar b/bin/jasperstarter/lib/commons-collections-3.2.2.jar new file mode 100644 index 0000000..fa5df82 Binary files /dev/null and b/bin/jasperstarter/lib/commons-collections-3.2.2.jar differ diff --git a/bin/jasperstarter/lib/core-2.3.0.jar b/bin/jasperstarter/lib/core-2.3.0.jar deleted file mode 100644 index 4ab8cb7..0000000 Binary files a/bin/jasperstarter/lib/core-2.3.0.jar and /dev/null differ diff --git a/bin/jasperstarter/lib/core-3.2.1.jar b/bin/jasperstarter/lib/core-3.2.1.jar new file mode 100644 index 0000000..05d7cda Binary files /dev/null and b/bin/jasperstarter/lib/core-3.2.1.jar differ diff --git a/bin/jasperstarter/lib/icu4j-57.1.jar b/bin/jasperstarter/lib/icu4j-57.1.jar new file mode 100644 index 0000000..e6151ce Binary files /dev/null and b/bin/jasperstarter/lib/icu4j-57.1.jar differ diff --git a/bin/jasperstarter/lib/itext-2.1.7.js2.jar b/bin/jasperstarter/lib/itext-2.1.7.js5.jar similarity index 65% rename from bin/jasperstarter/lib/itext-2.1.7.js2.jar rename to bin/jasperstarter/lib/itext-2.1.7.js5.jar index 5d319fc..46f23cc 100644 Binary files a/bin/jasperstarter/lib/itext-2.1.7.js2.jar and b/bin/jasperstarter/lib/itext-2.1.7.js5.jar differ diff --git a/bin/jasperstarter/lib/jasperreports-6.1.0.jar b/bin/jasperstarter/lib/jasperreports-6.1.0.jar deleted file mode 100644 index 87e84d1..0000000 Binary files a/bin/jasperstarter/lib/jasperreports-6.1.0.jar and /dev/null differ diff --git a/bin/jasperstarter/lib/jasperreports-6.4.0.jar b/bin/jasperstarter/lib/jasperreports-6.4.0.jar new file mode 100644 index 0000000..b9f3e8e Binary files /dev/null and b/bin/jasperstarter/lib/jasperreports-6.4.0.jar differ diff --git a/bin/jasperstarter/lib/jasperreports-functions-6.1.0.jar b/bin/jasperstarter/lib/jasperreports-functions-6.1.0.jar deleted file mode 100644 index 3a50b35..0000000 Binary files a/bin/jasperstarter/lib/jasperreports-functions-6.1.0.jar and /dev/null differ diff --git a/bin/jasperstarter/lib/jasperreports-functions-6.4.0.jar b/bin/jasperstarter/lib/jasperreports-functions-6.4.0.jar new file mode 100644 index 0000000..89fed94 Binary files /dev/null and b/bin/jasperstarter/lib/jasperreports-functions-6.4.0.jar differ diff --git a/bin/jasperstarter/lib/jasperstarter.jar b/bin/jasperstarter/lib/jasperstarter.jar index 8865a34..e49d026 100644 Binary files a/bin/jasperstarter/lib/jasperstarter.jar and b/bin/jasperstarter/lib/jasperstarter.jar differ diff --git a/bin/jasperstarter/lib/jcommon-1.0.15.jar b/bin/jasperstarter/lib/jcommon-1.0.15.jar deleted file mode 100644 index d0dc26d..0000000 Binary files a/bin/jasperstarter/lib/jcommon-1.0.15.jar and /dev/null differ diff --git a/bin/jasperstarter/lib/jcommon-1.0.23.jar b/bin/jasperstarter/lib/jcommon-1.0.23.jar new file mode 100644 index 0000000..4dbb094 Binary files /dev/null and b/bin/jasperstarter/lib/jcommon-1.0.23.jar differ diff --git a/bin/jasperstarter/lib/jfreechart-1.0.12.jar b/bin/jasperstarter/lib/jfreechart-1.0.12.jar deleted file mode 100644 index 73be90f..0000000 Binary files a/bin/jasperstarter/lib/jfreechart-1.0.12.jar and /dev/null differ diff --git a/bin/jasperstarter/lib/jfreechart-1.0.19.jar b/bin/jasperstarter/lib/jfreechart-1.0.19.jar new file mode 100644 index 0000000..23bbbed Binary files /dev/null and b/bin/jasperstarter/lib/jfreechart-1.0.19.jar differ diff --git a/bin/jasperstarter/lib/joda-time-2.0.jar b/bin/jasperstarter/lib/joda-time-2.1.jar similarity index 51% rename from bin/jasperstarter/lib/joda-time-2.0.jar rename to bin/jasperstarter/lib/joda-time-2.1.jar index 169a7a4..b2aca95 100644 Binary files a/bin/jasperstarter/lib/joda-time-2.0.jar and b/bin/jasperstarter/lib/joda-time-2.1.jar differ diff --git a/bin/jasperstarter/lib/rhino-1.7.7.1.jar b/bin/jasperstarter/lib/rhino-1.7.7.1.jar new file mode 100644 index 0000000..a8b9417 Binary files /dev/null and b/bin/jasperstarter/lib/rhino-1.7.7.1.jar differ diff --git a/bin/jasperstarter/lib/xml-apis-1.3.02.jar b/bin/jasperstarter/lib/xml-apis-1.3.04.jar similarity index 53% rename from bin/jasperstarter/lib/xml-apis-1.3.02.jar rename to bin/jasperstarter/lib/xml-apis-1.3.04.jar index 243eaea..d42c0ea 100644 Binary files a/bin/jasperstarter/lib/xml-apis-1.3.02.jar and b/bin/jasperstarter/lib/xml-apis-1.3.04.jar differ diff --git a/docs/pt_BR/LEIA-ME_pt_BR.md b/docs/pt_BR/LEIA-ME_pt_BR.md index fed189c..bff4cf9 100644 --- a/docs/pt_BR/LEIA-ME_pt_BR.md +++ b/docs/pt_BR/LEIA-ME_pt_BR.md @@ -8,7 +8,7 @@ [![Bitcoin Donations](https://img.shields.io/badge/bitcoin-donation-orange.svg)](https://blockchain.info/address/1LqwqcMfNuNzq6S671z1HjM61MpBuFCGqg) ### Documentação -[![Language-en_US](https://img.shields.io/badge/en__US-100%25-green.svg)](https://github.com/geekcom/phpjasper/blob/master/README.md) +[![Language-en_US](https://img.shields.io/badge/en__US-100%25-green.svg)](https://github.com/PHPJasper/phpjasper/blob/master/README.md) ### Sobre a biblioteca @@ -337,20 +337,20 @@ Depende da complexidade do seu relatório. ## Agradecimentos -[Cenote GmbH](http://www.cenote.de/) pelo [JasperStarter](http://jasperstarter.sourceforge.net/) tool. +[Cenote GmbH](http://www.cenote.de/) pelo [JasperStarter](https://bitbucket.org/cenote/jasperstarter/) tool. [JetBrains](https://www.jetbrains.com/) pelo [PhpStorm](https://www.jetbrains.com/phpstorm/) e seu grande apoio. -## [Dúvidas?](https://github.com/geekcom/phpjasper/issues) +## [Dúvidas?](https://github.com/PHPJasper/phpjasper/issues) -Abra uma [Issue](https://github.com/geekcom/phpjasper/issues) ou procure por Issues antigas +Abra uma [Issue](https://github.com/PHPJasper/phpjasper/issues) ou procure por Issues antigas -## [Licença](https://github.com/geekcom/phpjasper/blob/master/LICENSE) +## [Licença](https://github.com/PHPJasper/phpjasper/blob/master/LICENSE) MIT -## [Contribuição](https://github.com/geekcom/phpjasper/blob/master/CONTRIBUTING.md) +## [Contribuição](https://github.com/PHPJasper/phpjasper/blob/master/CONTRIBUTING.md) -Contribua com a comunidade PHP, faça um fork !! +Contribua com a comunidade PHP, faça um fork !! \ No newline at end of file diff --git a/tests/JasperPHP/JasperPHPServiceProviderTest.php b/tests/JasperPHP/JasperPHPServiceProviderTest.php deleted file mode 100644 index 603e11e..0000000 --- a/tests/JasperPHP/JasperPHPServiceProviderTest.php +++ /dev/null @@ -1,18 +0,0 @@ -assertTrue(true); - - } - -} \ No newline at end of file diff --git a/tests/JasperPHP/JasperPHPTest.php b/tests/JasperPHP/JasperPHPTest.php index 2faa844..4e8e710 100644 --- a/tests/JasperPHP/JasperPHPTest.php +++ b/tests/JasperPHP/JasperPHPTest.php @@ -10,8 +10,6 @@ class JasperPHPTest extends PHPUnit_Framework_TestCase * @author Rafael Queiroz * @package JasperPHP */ -class JasperPHPTest extends \PHPUnit_Framework_TestCase - { /**