Merge branch '875-report-with-oracle-jdbc-ora-too-many-open-cursors' of

https://github.com/claesrosell/birt into tup_main

# Conflicts:
#	README.md

README.md

@@ -1,36 +1,37 @@
-# Eclipse BIRT [![Build Status](https://travis-ci.com/hvbtup/birt.svg?branch=flugtiger_master)](https://travis-ci.com/hvbtup/birt)
-The open source Eclipse BIRT reporting and data visualization project.
-
-**This is not the official Eclipse repository!**
-
-This repository was originally forked from `flugtiger/birt`, because at that time that was the only BIRT repo that seemed to work.
-As of today (March 2022), it is more or less up-to-date with the official Eclipse repo `eclipse/BIRT`,
-so if you want to compare it at the source level, you should compare
-this repo's `tup_main` branch with the official `master` branch.
-
-## Reasons for this fork and differences to the official Eclipse repository
-
-For more information about this repository see our [wiki pages](https://github.com/hvbtup/birt/wiki)
-
-If you are just looking for the official BIRT, don't use this - instead use the [official repo](https://github.com/eclipse/birt/)
-
-## BIRT documentation ##
-
-The new [BIRT website](https://eclipse.org/birt) contains a lot of useful information.
-It is in fact a wiki, though not as open as other wikis.
-The web site still could use a lot of improvement - your help is welcome.
-
-## Using a pre-built BIRT
-
-If you just want to start creating reports, you can use a pre-built BIRT version.
-See the releases page for the all-in-one designer and the POJO runtime.
-
-Binary releases of the official BIRT are available on the Eclipse web site.
-An official 4.9.0 release is planned in Q1/Q2 2022, in the meantime you can find binary artifacts for each PR on https://github.com/eclipse/birt/actions
-
-## Building BIRT
-
-Building BIRT has become relatively easy since 2021/2022. Just [see eclipse/birt](https://github.com/eclipse/birt/).
-Wim Jongman also created an excellent video tutorial.
-
-Just remember to replace `eclipse/birt` with `hvbtup/birt` and the `master` branch with `tup_main` when configuring GIT.
+# Eclipse BIRT [![Build Status](https://travis-ci.com/hvbtup/birt.svg?branch=tup_main)](https://travis-ci.com/hvbtup/birt)
+The open source Eclipse BIRT reporting and data visualization project.
+
+**This is not the official Eclipse repository!**
+
+This repository was originally forked from `flugtiger/birt`, because at that time that was the only BIRT repo that seemed to work.
+As of today (March 2022), it is more or less up-to-date with the official Eclipse repo `eclipse/BIRT`,
+so if you want to compare it at the source level, you should compare
+this repo's `tup_main` branch with the official `master` branch.
+
+## Reasons for this fork and differences to the official Eclipse repository
+
+For more information about this repository see our [wiki pages](https://github.com/hvbtup/birt/wiki)
+
+If you are just looking for the official BIRT, don't use this - instead use the [official repo](https://github.com/eclipse/birt/)
+
+## BIRT documentation ##
+
+The new [BIRT website](https://eclipse.org/birt) contains a lot of useful information.
+It is in fact a wiki, though not as open as other wikis.
+The web site still could use a lot of improvement - your help is welcome.
+
+## Using a pre-built BIRT
+
+If you just want to start creating reports, you can use a pre-built BIRT version.
+See the releases page for the all-in-one designer and the POJO runtime.
+
+Binary releases of the official BIRT are available on the Eclipse web site.
+An official 4.9.0 release is available since 2022-03-16.
+You can find binary artifacts for each PR on https://github.com/eclipse/birt/actions
+
+## Building BIRT
+
+Building BIRT has become relatively easy since 2021/2022. Just [see eclipse/birt](https://github.com/eclipse/birt/).
+Wim Jongman also created an excellent video tutorial.
+
+Just remember to replace `eclipse/birt` with `hvbtup/birt` and the `master` branch with `tup_main` when configuring GIT.

build/org.eclipse.birt.releng/BIRT.setup

@@ -392,7 +392,7 @@
           <repository
               url="https://download.eclipse.org/datatools/updates/1.14.200-SNAPSHOT/repository/"/>
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.23-I-builds/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.24-I-builds/"/>
           <repository
               url="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest/"/>
           <repository

build/org.eclipse.birt.target/org.eclipse.birt.target.target

@@ -44,7 +44,7 @@
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <!--			<repository location="https://download.eclipse.org/eclipse/updates/latest/"/>
 -->
-			<repository location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/"/>
+			<repository location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/"/>
 			<unit id="a.jre.javase" version="11.0.0"/>
 			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.platform.sdk" version="0.0.0"/>

data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/impl/QueryResults.java

@@ -1,13 +1,13 @@
 /*
  *************************************************************************
  * Copyright (c) 2004, 2014 Actuate Corporation.
- * 
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0/.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
@@ -249,7 +249,7 @@ public void close() throws BirtException {
 			iterator = null;
 		}
 
-		// queryService.close( );
+		queryService.close(); /* Reintroduced to fix #875 */
 		queryService = null;
 		logger.logp(Level.FINER, QueryResults.class.getName(), "close",
 				"Iterators associated with QueryResults are closed");

features/org.eclipse.birt.chart.feature/feature.xml

@@ -141,6 +141,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.batik.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.apache.batik.dom"
          download-size="0"

features/org.eclipse.birt.chart.osgi.runtime/feature.xml

@@ -102,6 +102,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.batik.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.apache.batik.dom.svg"
          download-size="0"

features/org.eclipse.birt.engine.runtime/feature.xml

@@ -296,6 +296,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.batik.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.apache.batik.dom"
          download-size="0"

features/org.eclipse.birt.feature/feature.xml

@@ -205,6 +205,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.batik.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.apache.batik.dom"
          download-size="0"

features/org.eclipse.birt.osgi.runtime/feature.xml

@@ -312,6 +312,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.batik.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.apache.batik.dom"
          download-size="0"

features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/feature.xml

@@ -161,6 +161,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.batik.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.apache.batik.dom"
          download-size="0"