Merge pull request #140 from PHPJasper/develop

Version 3.0.0
PHPJasper · Mar 17, 2019 · b89f240 · b89f240
2 parents 5d3bf18 + 18d9a47
commit b89f240
Show file tree

Hide file tree

Showing 93 changed files with 163 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,12 @@
+Release Notes - PHPJasper - Version 3.0.0
+========================================================
+* Improvement
+    * added Semantic Versioning 2.0.0
+* Update
+    * updated for jasperstarter 3.5.0
+* Bug
+    * solved problems with useSSL at MySQL connections
+____________________________________
 Release Notes - PHPJasper - Version 2.7
 ========================================================
 * Improvement https://github.com/PHPJasper/phpjasper/issues/99

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Or in your file'composer.json' add:
 ```json
 {
     "require": {
-        "geekcom/phpjasper": "^2.7"
+        "geekcom/phpjasper": "^3.0.0"
     }
 }
 ```

diff --git a/bin/jasperstarter/CHANGES b/bin/jasperstarter/CHANGES
@@ -2,6 +2,109 @@
 JasperStarter - Running JasperReports from command line
 ========================================================
 
+Release notes - JasperStarter - Version 3.5.0
+---------------------------------------------
+
+** Bug
+    * [JAS-134] - "InterruptedException" should not be ignored in App.java
+    * [JAS-135] - comparisons between unrelated types in Config.java
+
+** New Feature
+    * [JAS-131] - Jasperstarter does not provide a way to use the query string saved in the report itself
+
+** Task
+    * [JAS-133] - Release Pipeline takes longer than before
+    * [JAS-136] - Throwable.printStackTrace(...) should not be called in Report.java setLookAndFeel()
+    * [JAS-137] - Do not use a bitwise operator with a Boolean-like operand in ParameterPanel.java
+    * [JAS-138] - Do not use a bitwise operator with a Boolean-like operand in ParameterPrompt.java
+
+
+Release notes - JasperStarter - Version 3.4.1
+---------------------------------------------
+
+** Bug
+    * [JAS-132] - Security alert on org.springframework:spring-core
+                  Updated springframework to 4.3.21
+
+    CVE-2016-5007 - moderate severity - Vulnerable versions: < 4.3.1
+    CVE-2018-1275 - high severity - Vulnerable versions: < 4.3.16
+    CVE-2018-1272 - moderate severity - Vulnerable versions: < 4.3.15
+    CVE-2018-1271 - moderate severity - Vulnerable versions: < 4.3.15
+    CVE-2018-1270 - high severity - Vulnerable versions: < 4.3.16
+    CVE-2018-1257 - moderate severity - Vulnerable versions: < 4.3.17
+
+
+Release notes - JasperStarter - Version 3.4.0
+---------------------------------------------
+
+  JasperStarter-3.2.0 silently dropped Java7 support by using the
+  latest available JasperReports Library.
+  JasperReports-6.4.0 is the last release which works with Java7 so
+  JasperStarter-3.1.0 was the latest release supporting Java7.
+
+  Now JasperStarter needs Java8 at a minimum and is manually tested
+  with OpenJDK-8, OpenJDK-10, OpenJDK-11. Automatic testing is on the
+  way (see JAS-128).
+  There will be a special release supporting Java7.
+
+  "Diskless" operation using stdin and stdout for input data and
+  output is now complete. See ([JAS-97] and [JAS-89]).
+
+  A public API allows direct integration with Python using jpy
+  ([JAS-125]).
+
+Known bugs:
+    * [JAS-120] - JasperReports-6.7.0 Version does not match with
+                  reported version from the jar file in
+      This is an upstream error which causes JasperStarter to put out
+      a wrong JasperReports version number of 6.6.0 instead of 6.7.0
+      if you call: jasperstarter -V
+
+** Bug
+    * [JAS-111] - JRE 1.7 incompatibility - not fixed in the main
+                  release but clarified.
+    * [JAS-122] - Runtime error if a chart with "chart customizers" is
+                  used
+    * [JAS-126] - Jasperstarter does not usefully propagate
+                  compilation errors
+
+** New Feature
+    * [JAS-97] - Use stdout for the resulting PDF (so we don't have to
+                 write to the hosting server's storage)
+    * [JAS-125] - Make report fill accessible via API
+
+** Task
+    * [JAS-127] - Enable dependency caching in build pipeline
+    * [JAS-129] - Remove test dependency to font Arial
+    * [JAS-130] - launch4j-maven-plugin:1.5.2 depends on 32bit
+                  libraries
+
+
+Release notes - JasperStarter - Version 3.3.0
+---------------------------------------------
+
+Known bugs:
+    * [JAS-120] - JasperReports-6.7.0 Version does not match with reported version from the jar file in 
+      This is an upstream error which causes JasperStarter to put out
+      a wrong JasperReports version number of 6.6.0 instead of 6.7.0
+      if you call: jasperstarter -V
+
+** Bug
+    * [JAS-116] - SSL error
+    * [JAS-121] - Container 'Build' exceeded memory limit.
+    * [JAS-122] - Runtime error if a chart with "chart customizers" is used
+
+** New Feature
+    * [JAS-113] - JSONQL data source support
+
+** Task
+    * [JAS-102] - Pipeline: enable build artifact upload to download section
+    * [JAS-119] - Include JasperReports-6.7.0
+
+** Improvement
+    * [JAS-89] - Accept stdin for datafile input
+
+
 Release Notes - JasperStarter - Version 3.2.1
 ---------------------------------------------
 

diff --git a/bin/jasperstarter/LICENSE b/bin/jasperstarter/LICENSE
diff --git a/bin/jasperstarter/NOTICE b/bin/jasperstarter/NOTICE
diff --git a/bin/jasperstarter/README.md b/bin/jasperstarter/README.md
@@ -9,7 +9,7 @@ The official homepage is [jasperstater.cenote.de][].
 
 It has the following features:
 
-  * Run any JasperReport that needs a jdbc, csv, xml, json or empty datasource
+  * Run any JasperReport that needs a jdbc, csv, xml, json, jsonql or empty datasource
   * Use with any database for which a jdbc driver is available
   * Run reports with subreports
   * Execute reports that need runtime parameters. Any parameter whose class has
@@ -29,10 +29,11 @@ It has the following features:
   * Integrate in non Java applications (for example PHP, Python)
   * Binary executable on Windows
   * Includes JasperReports so this is the only tool you need to install
+  * "Diskless" operation using stdin and stdout for input data and output.
 
 Requirements:
 
-  * Java 1.6 or higher
+  * Java 1.8 or higher
   * A JDBC 2.1 driver for your database
 
 
@@ -67,6 +68,43 @@ Example with hsql using database type generic:
 For more information take a look in the docs directory of the distibution
 archive or read the [Usage][] page online.
 
+### Python Integration using public API
+
+JasperStarter exposes an API which can be used with [jpy][] to
+provide direct access from Python:
+
+    #
+    # Load the JVM. See the jpy docs for details.
+    #
+    import jpyutil
+    jpyutil.init_jvm(jvm_maxmem='512M', jvm_classpath=['.../jasperstarter.jar'])
+    #
+    # Load the Java types needed.
+    #
+    import jpy
+    Arrays = jpy.get_type('java.util.Arrays')
+    File = jpy.get_type('java.io.File')
+    Report = jpy.get_type('de.cenote.jasperstarter.Report')
+    Config = jpy.get_type('de.cenote.jasperstarter.Config')
+    DsType = jpy.get_type('de.cenote.jasperstarter.types.DsType')
+    #
+    # Create the JasperStarter configuration. See Config.java for details.
+    #
+    config = Config()
+    config.setInput('jsonql.jrxml')
+    config.setOutput('contacts.pdf')
+    config.setDbType(DsType.json)
+    config.setDataFile(File('contacts.json'))
+    config.setJsonQuery('contacts.person')
+    config.setOutputFormats(Arrays.asList([]))
+    #
+    # Run the report. See Report.java for details.
+    #
+    instance = Report(config, File(config.getInput()))
+    instance.fill()
+    instance.exportPdf()
+
+See the examples/python directory for a fuller example.
 
 ### Release Notes
 
@@ -88,23 +126,26 @@ and create a bug or feature request.
 If you like the software you can write a [review][] :-)
 
 
-### Developement
+### Development
 
 The sourcecode is available at [bitbucket.org/cenote/jasperstarter][], the
 project website is hosted at [Sourceforge][].
 
 JasperStarter is build with [Maven][]. 
 
-On Linux 64 bit the launch4j-maven-plugin may fail. You need the folloing libs in a 32 bit version:
+On Linux 64 bit the launch4j-maven-plugin may fail. In this case, may you need the following libs in a 32 bit version:
 
   * z1
   * ncurses5
   * bz2-1.0
 
-On Ubuntu 14.04 for example use this command:
+Install on Ubuntu 14.04 or above:
 
     $ sudo apt-get install lib32z1 lib32ncurses5 lib32bz2-1.0
 
+Install on Fedora 27 or above:
+
+    $sudo dnf install ncurses-compat-libs.i686
 
 To get a distribution package run:
 
@@ -187,3 +228,4 @@ limitations under the License.
 [Usage]:http://jasperstarter.sourceforge.net/usage.html
 [Issues]:https://cenote-issues.atlassian.net/browse/JAS
 [Changes]:changes.html
+[jpy]:https://github.com/bcdev/jpy
diff --git a/bin/jasperstarter/bin/jasperstarter b/bin/jasperstarter/bin/jasperstarter
@@ -18,7 +18,7 @@
 if(test -L "$0") then
   auxlink=`ls -l "$0" | sed 's/^[^>]*-> //g'`
   HOME_FOLDER=`dirname "$auxlink"`/..
-else 
+else
   HOME_FOLDER=`dirname "$0"`/..
 fi
 

diff --git a/bin/jasperstarter/bin/jasperstarter.exe b/bin/jasperstarter/bin/jasperstarter.exe
diff --git a/bin/jasperstarter/lib/ant-1.7.1.jar b/bin/jasperstarter/lib/ant-1.7.1.jar
diff --git a/bin/jasperstarter/lib/ant-launcher-1.7.1.jar b/bin/jasperstarter/lib/ant-launcher-1.7.1.jar
diff --git a/bin/jasperstarter/lib/antlr-2.7.7.jar b/bin/jasperstarter/lib/antlr-2.7.7.jar
diff --git a/bin/jasperstarter/lib/antlr-3.0b5.jar b/bin/jasperstarter/lib/antlr-3.0b5.jar
diff --git a/bin/jasperstarter/lib/argparse4j-0.5.0.jar b/bin/jasperstarter/lib/argparse4j-0.5.0.jar
diff --git a/bin/jasperstarter/lib/avalon-framework-impl-4.2.0.jar b/bin/jasperstarter/lib/avalon-framework-impl-4.2.0.jar
diff --git a/bin/jasperstarter/lib/barbecue-1.5-beta1.jar b/bin/jasperstarter/lib/barbecue-1.5-beta1.jar
diff --git a/bin/jasperstarter/lib/barcode4j-2.1.jar b/bin/jasperstarter/lib/barcode4j-2.1.jar
diff --git a/bin/jasperstarter/lib/batik-anim-1.9.1.jar b/bin/jasperstarter/lib/batik-anim-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-awt-util-1.9.1.jar b/bin/jasperstarter/lib/batik-awt-util-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-bridge-1.9.1.jar b/bin/jasperstarter/lib/batik-bridge-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-constants-1.9.1.jar b/bin/jasperstarter/lib/batik-constants-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-css-1.9.1.jar b/bin/jasperstarter/lib/batik-css-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-dom-1.9.1.jar b/bin/jasperstarter/lib/batik-dom-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-ext-1.9.1.jar b/bin/jasperstarter/lib/batik-ext-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-gvt-1.9.1.jar b/bin/jasperstarter/lib/batik-gvt-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-i18n-1.9.1.jar b/bin/jasperstarter/lib/batik-i18n-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-parser-1.9.1.jar b/bin/jasperstarter/lib/batik-parser-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-script-1.9.1.jar b/bin/jasperstarter/lib/batik-script-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-svg-dom-1.9.1.jar b/bin/jasperstarter/lib/batik-svg-dom-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-svggen-1.9.1.jar b/bin/jasperstarter/lib/batik-svggen-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-util-1.9.1.jar b/bin/jasperstarter/lib/batik-util-1.9.1.jar
diff --git a/bin/jasperstarter/lib/batik-xml-1.9.1.jar b/bin/jasperstarter/lib/batik-xml-1.9.1.jar
diff --git a/bin/jasperstarter/lib/bcprov-jdk15on-1.52.jar b/bin/jasperstarter/lib/bcprov-jdk15on-1.52.jar
diff --git a/bin/jasperstarter/lib/castor-core-1.3.3.jar b/bin/jasperstarter/lib/castor-core-1.3.3.jar
diff --git a/bin/jasperstarter/lib/castor-xml-1.3.3.jar b/bin/jasperstarter/lib/castor-xml-1.3.3.jar
diff --git a/bin/jasperstarter/lib/commons-beanutils-1.9.3.jar b/bin/jasperstarter/lib/commons-beanutils-1.9.3.jar
diff --git a/bin/jasperstarter/lib/commons-cli-1.0.jar b/bin/jasperstarter/lib/commons-cli-1.0.jar
diff --git a/bin/jasperstarter/lib/commons-codec-1.10.jar b/bin/jasperstarter/lib/commons-codec-1.10.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/commons-collections4-4.1.jar b/bin/jasperstarter/lib/commons-collections4-4.1.jar
diff --git a/bin/jasperstarter/lib/commons-digester-2.1.jar b/bin/jasperstarter/lib/commons-digester-2.1.jar
diff --git a/bin/jasperstarter/lib/commons-io-2.5.jar b/bin/jasperstarter/lib/commons-io-2.5.jar
diff --git a/bin/jasperstarter/lib/commons-lang-2.6.jar b/bin/jasperstarter/lib/commons-lang-2.6.jar
diff --git a/bin/jasperstarter/lib/commons-logging-1.1.1.jar b/bin/jasperstarter/lib/commons-logging-1.1.1.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/ecj-4.4.2.jar b/bin/jasperstarter/lib/ecj-4.4.2.jar
diff --git a/bin/jasperstarter/lib/groovy-all-2.4.12.jar b/bin/jasperstarter/lib/groovy-all-2.4.12.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.js6.jar b/bin/jasperstarter/lib/itext-2.1.7.js6.jar
diff --git a/bin/jasperstarter/lib/jackson-annotations-2.1.4.jar b/bin/jasperstarter/lib/jackson-annotations-2.1.4.jar
diff --git a/bin/jasperstarter/lib/jackson-annotations-2.9.5.jar b/bin/jasperstarter/lib/jackson-annotations-2.9.5.jar
diff --git a/bin/jasperstarter/lib/jackson-core-2.1.4.jar b/bin/jasperstarter/lib/jackson-core-2.1.4.jar
diff --git a/bin/jasperstarter/lib/jackson-core-2.9.5.jar b/bin/jasperstarter/lib/jackson-core-2.9.5.jar
diff --git a/bin/jasperstarter/lib/jackson-databind-2.1.4.jar b/bin/jasperstarter/lib/jackson-databind-2.1.4.jar
diff --git a/bin/jasperstarter/lib/jackson-databind-2.9.5.jar b/bin/jasperstarter/lib/jackson-databind-2.9.5.jar
diff --git a/bin/jasperstarter/lib/jakarta-regexp-1.4.jar b/bin/jasperstarter/lib/jakarta-regexp-1.4.jar
diff --git a/bin/jasperstarter/lib/jasperreports-6.4.3.jar b/bin/jasperstarter/lib/jasperreports-6.4.3.jar
diff --git a/bin/jasperstarter/lib/jasperreports-6.7.0.jar b/bin/jasperstarter/lib/jasperreports-6.7.0.jar
diff --git a/bin/jasperstarter/lib/jasperreports-chart-customizers-6.7.0.jar b/bin/jasperstarter/lib/jasperreports-chart-customizers-6.7.0.jar
diff --git a/bin/jasperstarter/lib/jasperreports-chart-themes-6.7.0.jar b/bin/jasperstarter/lib/jasperreports-chart-themes-6.7.0.jar
diff --git a/bin/jasperstarter/lib/jasperreports-fonts-6.0.0.jar b/bin/jasperstarter/lib/jasperreports-fonts-6.0.0.jar
diff --git a/...ter/lib/jasperreports-functions-6.4.3.jar → ...ter/lib/jasperreports-functions-6.7.0.jar b/...ter/lib/jasperreports-functions-6.4.3.jar → ...ter/lib/jasperreports-functions-6.7.0.jar
diff --git a/bin/jasperstarter/lib/jasperstarter.jar b/bin/jasperstarter/lib/jasperstarter.jar
diff --git a/bin/jasperstarter/lib/javax.inject-1.jar b/bin/jasperstarter/lib/javax.inject-1.jar
diff --git a/bin/jasperstarter/lib/jcalendar-1.4.jar b/bin/jasperstarter/lib/jcalendar-1.4.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.19.jar b/bin/jasperstarter/lib/jfreechart-1.0.19.jar
diff --git a/bin/jasperstarter/lib/joda-time-2.1.jar b/bin/jasperstarter/lib/joda-time-2.1.jar
diff --git a/bin/jasperstarter/lib/joda-time-2.9.9.jar b/bin/jasperstarter/lib/joda-time-2.9.9.jar
diff --git a/bin/jasperstarter/lib/jython-2.7.0.jar b/bin/jasperstarter/lib/jython-2.7.0.jar
diff --git a/bin/jasperstarter/lib/log4j-1.2.17.jar b/bin/jasperstarter/lib/log4j-1.2.17.jar
diff --git a/bin/jasperstarter/lib/lucene-analyzers-common-4.5.1.jar b/bin/jasperstarter/lib/lucene-analyzers-common-4.5.1.jar
diff --git a/bin/jasperstarter/lib/lucene-core-4.5.1.jar b/bin/jasperstarter/lib/lucene-core-4.5.1.jar
diff --git a/bin/jasperstarter/lib/lucene-queries-4.5.1.jar b/bin/jasperstarter/lib/lucene-queries-4.5.1.jar
diff --git a/bin/jasperstarter/lib/lucene-queryparser-4.5.1.jar b/bin/jasperstarter/lib/lucene-queryparser-4.5.1.jar
diff --git a/bin/jasperstarter/lib/lucene-sandbox-4.5.1.jar b/bin/jasperstarter/lib/lucene-sandbox-4.5.1.jar
diff --git a/bin/jasperstarter/lib/olap4j-0.9.7.309-JS-3.jar b/bin/jasperstarter/lib/olap4j-0.9.7.309-JS-3.jar
diff --git a/bin/jasperstarter/lib/poi-3.17.jar b/bin/jasperstarter/lib/poi-3.17.jar
diff --git a/bin/jasperstarter/lib/rhino-1.7.7.2.jar b/bin/jasperstarter/lib/rhino-1.7.7.2.jar
diff --git a/bin/jasperstarter/lib/serializer-2.7.2.jar b/bin/jasperstarter/lib/serializer-2.7.2.jar
diff --git a/bin/jasperstarter/lib/servlet-api-2.5.jar b/bin/jasperstarter/lib/servlet-api-2.5.jar
diff --git a/bin/jasperstarter/lib/spring-beans-4.3.21.RELEASE.jar b/bin/jasperstarter/lib/spring-beans-4.3.21.RELEASE.jar
diff --git a/bin/jasperstarter/lib/spring-core-4.3.21.RELEASE.jar b/bin/jasperstarter/lib/spring-core-4.3.21.RELEASE.jar
diff --git a/bin/jasperstarter/lib/spring-expression-4.3.21.RELEASE.jar b/bin/jasperstarter/lib/spring-expression-4.3.21.RELEASE.jar
diff --git a/bin/jasperstarter/lib/stax-1.2.0.jar b/bin/jasperstarter/lib/stax-1.2.0.jar
diff --git a/bin/jasperstarter/lib/stax-api-1.0-2.jar b/bin/jasperstarter/lib/stax-api-1.0-2.jar
diff --git a/bin/jasperstarter/lib/stax-api-1.0.1.jar b/bin/jasperstarter/lib/stax-api-1.0.1.jar
diff --git a/bin/jasperstarter/lib/stringtemplate-3.0.jar b/bin/jasperstarter/lib/stringtemplate-3.0.jar
diff --git a/bin/jasperstarter/lib/xalan-2.7.2.jar b/bin/jasperstarter/lib/xalan-2.7.2.jar
diff --git a/bin/jasperstarter/lib/xml-apis-1.3.04.jar b/bin/jasperstarter/lib/xml-apis-1.3.04.jar
diff --git a/bin/jasperstarter/lib/xml-apis-ext-1.3.04.jar b/bin/jasperstarter/lib/xml-apis-ext-1.3.04.jar
diff --git a/bin/jasperstarter/lib/xmlgraphics-commons-2.2.jar b/bin/jasperstarter/lib/xmlgraphics-commons-2.2.jar
diff --git a/docs/pt_BR/LEIA-ME_pt_BR.md b/docs/pt_BR/LEIA-ME_pt_BR.md
@@ -65,7 +65,7 @@ Ou crie um arquivo 'composer.json' e adicione o trecho:
 ```json
 {
     "require": {
-        "geekcom/phpjasper": "^2.7"
+        "geekcom/phpjasper": "^3.0.0"
     }
 }
 ```

diff --git a/tests/PHPJasperTest.php b/tests/PHPJasperTest.php
@@ -19,7 +19,7 @@
 /**
  * @author Rafael Queiroz <[email protected]>
  */
-class PHPJasperTest extends TestCase
+final class PHPJasperTest extends TestCase
 {
     /**
      * @var
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ Or in your file'composer.json' add: @@
     ```json
     {
         "require": {
-            "geekcom/phpjasper": "^2.7"
+            "geekcom/phpjasper": "^3.0.0"
         }
     }
     ```
@@ Expand Down @@