Merge pull request #137 from daust/b2.11.0

B2.11.0
daust · Nov 22, 2023 · 0aac5f6 · 0aac5f6
2 parents bcb7e26 + 7e7e262
commit 0aac5f6
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -272,6 +272,10 @@ isEnabled=false
 
 # allow only certain directories on the server to write to
 # Use "," to separate between path entries
+# On Windows, use the regular path denomination, no escaping necessary, 
+#  e.g.: C:\app\jri-downloads
+# All directories have to be named explicitly, not recursive file 
+#  paths are possible
 #directoryWhitelist=/Users/daust/oc-jasper/tmp,/Users/daust/oc-jasper
 
 #====================================================================

diff --git a/ReadMe-Dietmar.txt b/ReadMe-Dietmar.txt
@@ -5,7 +5,7 @@
 *) Development
 
 - APEX:
-	- http://win11/ords
+	- http://win11:8090/ords
 	- Workspace: DEMO, User: dietmar.aust
 	- APEX Application: Jasper Reports Integration Test (v2.6.2)
 

diff --git a/build.gradle b/build.gradle
@@ -25,6 +25,7 @@
   02.06.2022  D. Aust   #102: Upgrade libraries to JasperReports 6.19.1
   24.08.2022  D. Aust   #115: Upgrade libraries to JasperReports 6.20.0
   25.08.2022  D. Aust   #116: JDK17 support, replace Groovy library with 3.0.12 (3.0.+)
+  22.11.2023  D. Aust   #136: Upgrade libraries to JasperReports 6.20.6
 
  */
 
@@ -51,15 +52,15 @@ import org.gradle.internal.os.OperatingSystem
 //-----------------------------------------------------------------------------
 
   project.description       = "JasperReportsIntegration - more details here: https://github.com/daust/JasperReportsIntegration"
-  project.version           = '2.10.1'
+  project.version           = '2.11.0'
 
   sourceCompatibility       = 1.8
   targetCompatibility       = 1.8
 
   archivesBaseName          = "jri"
 
   // version of jasperreports to be used
-  def jasperreportsVersion  ='6.20.0'  
+  def jasperreportsVersion  ='6.20.6'  
 
   // Download Oracle JDBC drivers, must be the full version:
   // https://www.oracle.com/database/technologies/appdev/jdbc-ucp-19c-downloads.html
@@ -321,7 +322,7 @@ war {
                       "Main-Class": "main.CommandLine",
                       //"Class-Path": "*.jar"
                       //"Class-Path": configurations.runtimeClasspath.collect { it.getName() }.join(' ') + " " + jar.outputs.files.collect { it.getName() }.join(' ')
-                      "Class-Path": war.classpath.collect { it.getName() }.join(' ') + " " + jar.outputs.files.collect { it.getName() }.join(' ')
+                      //"Class-Path": war.classpath.collect { it.getName() }.join(' ') + " " + jar.outputs.files.collect { it.getName() }.join(' ')
                     )
       }
     }
@@ -458,7 +459,7 @@ task jriDownloadJasperLibraries{
             exclude "spring-beans-*"
 
             // ignore/remove older log4j2 libraries included in jasperreports-libraries
-            exclude "log4j-*-2.14*"
+            exclude "log4j-*"
             exclude "groovy-3.0.*"
     }
   }

diff --git a/src/conf/application.properties b/src/conf/application.properties
@@ -115,6 +115,10 @@ isEnabled=false
 
 # allow only certain directories on the server to write to
 # Use "," to separate between path entries
+# On Windows, use the regular path denomination, no escaping necessary, 
+#  e.g.: C:\app\jri-downloads
+# All directories have to be named explicitly, not recursive file 
+#  paths are possible
 #directoryWhitelist=/Users/daust/oc-jasper/tmp,/Users/daust/oc-jasper
 
 #====================================================================

diff --git a/src/doc/github/ReleaseNotes.md b/src/doc/github/ReleaseNotes.md
@@ -1,6 +1,23 @@
 [//]: # (Infos about this file)
 [//]: # (Markdown Syntax: https://guides.github.com/features/mastering-markdown/)
 
+# Version 2.11.0 (release: 23.11.2023)
+
+You can see the full list of issues with details in the [milestones page](https://github.com/daust/JasperReportsIntegration/milestone/12?closed=1).  
+
+## New features
+  * #136 Upgrade libraries to JasperReports 6.20.6
+
+## Bug fixes
+  * *none*
+
+## Changed behaviour
+  * *none*
+
+## Known issues
+  * Please check the current list of open issues: https://github.com/daust/JasperReportsIntegration/issues. 
+  * For running the application on Tomcat10, you have to use ``jri-2.11.0-jasper-6.20.6-tomcat10.war`` instead of ``jri.war``.
+
 # Version 2.10.1 (release: 17.01.2023)
 
 You can see the full list of issues with details in the [milestones page](https://github.com/daust/JasperReportsIntegration/milestone/13?closed=1). 
@@ -21,7 +38,7 @@ It is mainly a maintenance / bugfix release, specifically to support Oracle Webl
 ## Known issues
   * Please check the current list of open issues: https://github.com/daust/JasperReportsIntegration/issues. 
   * For running the application on Tomcat10, you have to use ``jri-2.10.1-jasper-6.20.0-tomcat10.war`` instead of ``jri.war``.
-  
+
 # Version 2.10.0 (release: 25.08.2022)
 
 You can see the full list of issues with details in the [milestones page](https://github.com/daust/JasperReportsIntegration/milestone/11?closed=1). 

diff --git a/src/doc/github/developers.md b/src/doc/github/developers.md
@@ -163,8 +163,8 @@ Modify default data source:
 [datasource:default]
 type=jdbc
 name=default
-url=jdbc:oracle:thin:@vm1:1521:XE
-username=schema1
+url=jdbc:oracle:thin:@win11:1521/orclpdb
+username=demo
 password=oracle1
 
 *) encryptPasswords
@@ -185,6 +185,11 @@ open http://localhost:8090/jri/
 
 open http://localhost:8090/jri/report?_repName=test&_repFormat=pdf&_dataSource=default&_outFilename=&_repLocale=&_repEncoding=&_repTimeZone=&_printIsEnabled=&_printPrinterName=&_printJobName=&_printPrinterTray=&_printCopies=&_printDuplex=&_printCollate=&_saveIsEnabled=&_saveFileName=
 
+*) create config directory
+
+./createConfigDir.sh /tmp/jri ..
+tree /tmp/jri
+
 *) get config directory - should be empty
 
 ./getConfigDir.sh ../webapp/jri.war

diff --git a/src/reports/demo/charts.jrxml b/src/reports/demo/charts.jrxml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.20.1.final using JasperReports Library version 6.20.1-7584acb244139816654f64e2fd57a00d3e31921e  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="oracle" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="43fdd4da-5cc1-43bd-a5e3-e58aab25c671">
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="dave"/>
+	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="225"/>
+	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="769"/>
+	<queryString language="SQL">
+		<![CDATA[select 4 as "four" from dual]]>
+	</queryString>
+	<field name="four" class="java.math.BigDecimal">
+		<property name="com.jaspersoft.studio.field.name" value="four"/>
+		<property name="com.jaspersoft.studio.field.label" value="four"/>
+	</field>
+	<background>
+		<band/>
+	</background>
+	<title>
+		<band height="72">
+			<frame>
+				<reportElement mode="Opaque" x="-20" y="-20" width="595" height="92" backcolor="#CC3333" uuid="abba8997-5810-47a5-b503-ad8d16c1bb5a"/>
+				<staticText>
+					<reportElement x="20" y="20" width="380" height="43" forecolor="#FFFFFF" uuid="dc5b14b0-228a-4920-ac4d-b530ce99fe0c"/>
+					<textElement>
+						<font size="34" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Chart]]></text>
+				</staticText>
+			</frame>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="13"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="31">
+			<staticText>
+				<reportElement x="78" y="0" width="100" height="30" uuid="14463622-99c2-439a-b599-d14319f1aaf2">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="fd1d7774-712b-41aa-b95f-4f05fd792bc1"/>
+				</reportElement>
+				<text><![CDATA[four]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="211">
+			<pieChart>
+				<chart evaluationTime="Report">
+					<reportElement x="210" y="-2" width="321" height="200" uuid="191117e7-1ccd-4611-b68e-4836671ce6a3"/>
+					<chartTitle/>
+					<chartSubtitle/>
+					<chartLegend/>
+				</chart>
+				<pieDataset>
+					<keyExpression><![CDATA[$F{four}]]></keyExpression>
+					<valueExpression><![CDATA[$F{four}]]></valueExpression>
+				</pieDataset>
+				<piePlot>
+					<plot/>
+					<itemLabel/>
+				</piePlot>
+			</pieChart>
+			<textField>
+				<reportElement x="40" y="60" width="100" height="30" uuid="b1ea244b-b58b-41b4-a5a4-b98b06432899">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="fd1d7774-712b-41aa-b95f-4f05fd792bc1"/>
+				</reportElement>
+				<textFieldExpression><![CDATA[$F{four}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band/>
+	</columnFooter>
+	<pageFooter>
+		<band height="17">
+			<textField>
+				<reportElement mode="Opaque" x="0" y="4" width="515" height="13" backcolor="#E6E6E6" uuid="128b5a34-2ee1-439d-91a7-1ba15433c9b1"/>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement mode="Opaque" x="515" y="4" width="40" height="13" backcolor="#E6E6E6" uuid="d437d18f-8a67-4f83-9fa8-7dd1cc1a7695"/>
+				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="EEEEE dd MMMMM yyyy">
+				<reportElement x="0" y="4" width="100" height="13" uuid="4f2801c2-6fab-487f-aa58-1a0a9823a218"/>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageFooter>
+	<summary>
+		<band height="8"/>
+	</summary>
+</jasperReport>
diff --git a/src/sql/user/xlib_http.pks b/src/sql/user/xlib_http.pks
@@ -28,6 +28,7 @@ AS
  2.8.0   08.02.2022  D. Aust          #79: XLIB_HTTP http_version
                                         - added optional parameter for http version
  2.10.1  16.01.2023  D. Aust          #123: Backport constant for Oracle 11
+ 2.11.0  25.01.2023  D. Aust          - Tested and fixed on Oracle11g - %Type works on variables-not constants
 
 =========================================================================*/
 
@@ -36,7 +37,7 @@ AS
 
   -- version of this package
   version_c constant varchar2(20 char) := '2.10.1';   
-  HTTP_VERSION_1_1  CONSTANT VARCHAR2(64) := 'HTTP/1.1'; -- #123
+  HTTP_VERSION_1_1 VARCHAR2(64) := 'HTTP/1.1'; -- #123
 
   TYPE vc_arr_t IS TABLE OF VARCHAR2 (32767) INDEX BY BINARY_INTEGER;
   g_empty_vc_arr vc_arr_t;

diff --git a/src/sql/user/xlib_jasperreports_demos_data.sql b/src/sql/user/xlib_jasperreports_demos_data.sql
@@ -36,4 +36,9 @@ See for details:
 - http://jasperreports.sourceforge.net/sample.reference/pdfencrypt/index.html
 - https://community.jaspersoft.com/wiki/how-configure-pdf-encryption-jasperreports-server-561','pdf','default',null,null,null,null,null,null,null,null,null,null);
 
+-- Charts exporting images
+Insert into XLIB_JASPERREPORTS_DEMOS (DEMO_CODE,DEMO_TITLE,DEMO_REPORT_NAME,DEMO_DESCRIPTION,DEMO_REPORT_FORMAT,DEMO_DATA_SOURCE,DEMO_REPORT_LOCALE,DEMO_REPORT_ENCODING,DEMO_OUT_FILENAME,DEMO_PARAM1_LABEL,DEMO_PARAM1_VALUE,DEMO_PARAM2_LABEL,DEMO_PARAM2_VALUE,DEMO_PARAM3_LABEL,DEMO_PARAM3_VALUE,DEMO_REPORT_TIME_ZONE) values ('TEST_CHART','Test with Chart','demo/charts','Test report to include charts as images','pdf','default','en_US',null,null,null,null,null,null,null,null,null);
+Insert into XLIB_JASPERREPORTS_DEMOS (DEMO_CODE,DEMO_TITLE,DEMO_REPORT_NAME,DEMO_DESCRIPTION,DEMO_REPORT_FORMAT,DEMO_DATA_SOURCE,DEMO_REPORT_LOCALE,DEMO_REPORT_ENCODING,DEMO_OUT_FILENAME,DEMO_PARAM1_LABEL,DEMO_PARAM1_VALUE,DEMO_PARAM2_LABEL,DEMO_PARAM2_VALUE,DEMO_PARAM3_LABEL,DEMO_PARAM3_VALUE,DEMO_REPORT_TIME_ZONE) values ('TEST_CHART_HTML','Test with Chart','demo/charts','Test report to include charts as images','html2','default','en_US',null,null,null,null,null,null,null,null,null);
+
+
 commit;