JasperStarter updated / general improvements

PHPJasper · May 12, 2017 · 88ef738 · 88ef738
1 parent ddd9fb0
commit 88ef738
Show file tree

Hide file tree

Showing 26 changed files with 49 additions and 50 deletions.
diff --git a/CHANGES 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
+________________________________________________________
diff --git 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!!
diff --git 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
@@ -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
diff --git a/bin/jasperstarter/lib/commons-collections-3.2.1.jar b/bin/jasperstarter/lib/commons-collections-3.2.1.jar
diff --git a/bin/jasperstarter/lib/commons-collections-3.2.2.jar b/bin/jasperstarter/lib/commons-collections-3.2.2.jar
diff --git a/bin/jasperstarter/lib/core-2.3.0.jar b/bin/jasperstarter/lib/core-2.3.0.jar
diff --git a/bin/jasperstarter/lib/core-3.2.1.jar b/bin/jasperstarter/lib/core-3.2.1.jar
diff --git a/bin/jasperstarter/lib/icu4j-57.1.jar b/bin/jasperstarter/lib/icu4j-57.1.jar
diff --git a/bin/jasperstarter/lib/itext-2.1.7.js2.jar → bin/jasperstarter/lib/itext-2.1.7.js5.jar b/bin/jasperstarter/lib/itext-2.1.7.js2.jar → bin/jasperstarter/lib/itext-2.1.7.js5.jar
diff --git a/bin/jasperstarter/lib/jasperreports-6.1.0.jar b/bin/jasperstarter/lib/jasperreports-6.1.0.jar
diff --git a/bin/jasperstarter/lib/jasperreports-6.4.0.jar b/bin/jasperstarter/lib/jasperreports-6.4.0.jar
diff --git a/bin/jasperstarter/lib/jasperreports-functions-6.1.0.jar b/bin/jasperstarter/lib/jasperreports-functions-6.1.0.jar
diff --git a/bin/jasperstarter/lib/jasperreports-functions-6.4.0.jar b/bin/jasperstarter/lib/jasperreports-functions-6.4.0.jar
diff --git a/bin/jasperstarter/lib/jasperstarter.jar b/bin/jasperstarter/lib/jasperstarter.jar
diff --git a/bin/jasperstarter/lib/jcommon-1.0.15.jar b/bin/jasperstarter/lib/jcommon-1.0.15.jar
diff --git a/bin/jasperstarter/lib/jcommon-1.0.23.jar b/bin/jasperstarter/lib/jcommon-1.0.23.jar
diff --git a/bin/jasperstarter/lib/jfreechart-1.0.12.jar b/bin/jasperstarter/lib/jfreechart-1.0.12.jar
diff --git a/bin/jasperstarter/lib/jfreechart-1.0.19.jar b/bin/jasperstarter/lib/jfreechart-1.0.19.jar
diff --git a/bin/jasperstarter/lib/joda-time-2.0.jar → bin/jasperstarter/lib/joda-time-2.1.jar b/bin/jasperstarter/lib/joda-time-2.0.jar → bin/jasperstarter/lib/joda-time-2.1.jar
diff --git a/bin/jasperstarter/lib/rhino-1.7.7.1.jar b/bin/jasperstarter/lib/rhino-1.7.7.1.jar
diff --git a/bin/jasperstarter/lib/xml-apis-1.3.02.jar → bin/jasperstarter/lib/xml-apis-1.3.04.jar b/bin/jasperstarter/lib/xml-apis-1.3.02.jar → bin/jasperstarter/lib/xml-apis-1.3.04.jar
diff --git 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 !!
diff --git a/tests/JasperPHP/JasperPHPServiceProviderTest.php b/tests/JasperPHP/JasperPHPServiceProviderTest.php
diff --git a/tests/JasperPHP/JasperPHPTest.php b/tests/JasperPHP/JasperPHPTest.php
@@ -10,8 +10,6 @@ class JasperPHPTest extends PHPUnit_Framework_TestCase
  * @author Rafael Queiroz <[email protected]>
  * @package JasperPHP
  */
-class JasperPHPTest extends \PHPUnit_Framework_TestCase
-
 {
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,8 +10,6 @@ class JasperPHPTest extends PHPUnit_Framework_TestCase @@
      * @author Rafael Queiroz <[email protected]>
      * @package JasperPHP
      */
-    class JasperPHPTest extends \PHPUnit_Framework_TestCase
     {
         /**
@@ Expand Down @@