Merge pull request #86 from TIBCOSoftware/release8.2.0

Release8.2.0

jaspersoft-containers/Docker/README.md

@@ -1 +1 @@
-This distribution includes Dockerfile, scripts, and supporting files for building, configuring, and running TIBCO JasperReports® Server and TIBCO JasperReports® Server Scalable Query Engine in Docker.
+This distribution includes Dockerfile, scripts, and supporting files for building, configuring, and running JasperReports® Server and JasperReports® Server Scalable Query Engine in Docker.

jaspersoft-containers/Docker/jrs/.env

@@ -1,11 +1,13 @@
 INSTALL_CHROMIUM=false
 JASPERREPORTS_SERVER_APP_IMAGE_NAME=jasperserver-webapp
 JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_NAME=jasperserver-buildomatic
-JASPERREPORTS_SERVER_VERSION=8.1.1
-JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.1.1
-JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.1.1
-TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-openjdk
+JASPERREPORTS_SERVER_VERSION=8.2.0
+JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.2.0
+JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.2.0
+TOMCAT_BASE_IMAGE= tomcat:9.0.65-jdk11-openjdk
 JDK_BASE_IMAGE=openjdk:11-jdk
+## TOMCAT_BASE_IMAGE=tomcat:9.0.62-jdk17-openjdk
+## JDK_BASE_IMAGE=eclipse-temurin:17-jdk
 RELEASE_DATE=May 13,2022
 JS_INSTALL_TARGETS=gen-config pre-install-test-pro prepare-all-pro-dbs-normal
 ## For including samples gen-config pre-install-test-pro prepare-all-pro-dbs-normal

jaspersoft-containers/Docker/jrs/Dockerfile

@@ -1,11 +1,14 @@
-# Copyright (c) 2021-2021. TIBCO Software Inc.
+# Copyright © 2021-2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
 # This file is subject to the license terms contained
 # in the license file that is distributed with this file
 
-#ARG TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-corretto
-ARG TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-openjdk
+#ARG TOMCAT_BASE_IMAGE=tomcat:9.0.73-jdk11-corretto
+#ARG TOMCAT_BASE_IMAGE=tomcat:9.0.62-jdk17-openjdk
+#ARG TOMCAT_BASE_IMAGE=tomcat:9.0.73-jdk17-corretto
+ARG TOMCAT_BASE_IMAGE=tomcat:9.0.65-jdk11-openjdk
+
 ARG INSTALL_CHROMIUM=false
-ARG JASPERREPORTS_SERVER_VERSION=8.1.1
+ARG JASPERREPORTS_SERVER_VERSION=8.2.0
 
 FROM ${TOMCAT_BASE_IMAGE} as deployment
 
@@ -16,7 +19,7 @@ ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
 
 
 ENV INSTALL_CHROMIUM ${INSTALl_CHROMIUM:-false}
-ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0}
 ENV JRS_HOME /usr/src/jasperreports-server
 ENV BUILDOMATIC_MODE non-interactive
 
@@ -57,7 +60,7 @@ ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022}
 
 
 LABEL "org.jasperosft.name"="JasperReports Server" \
-      "org.jaspersoft.vendor"="TIBCO Software Inc." \
+      "org.jaspersoft.vendor"="Cloud Software Group, Inc." \
       "org.jaspersoft.maintainer"="[email protected]" \
       "org.jaspersoft.version"=$JASPERREPORTS_SERVER_VERSION \
       "org.jaspersoft.release_date"=$RELEASE_DATE \

jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic

@@ -1,22 +1,24 @@
-# Copyright (c) 2021-2021. TIBCO Software Inc.
+# Copyright © 2005-2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
 # This file is subject to the license terms contained
 # in the license file that is distributed with this file
 
 #ARG JDK_BASE_IMAGE=amazoncorretto:11
+#ARG JDK_BASE_IMAGE=amazoncorretto:17
+#ARG JDK_BASE_IMAGE=eclipse-temurin:17-jdk
 ARG JDK_BASE_IMAGE=openjdk:11-jdk
 FROM ${JDK_BASE_IMAGE}
 
-ARG JASPERREPORTS_SERVER_VERSION=8.1.1
+ARG JASPERREPORTS_SERVER_VERSION=8.2.0
 ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/jrs
 ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
 
-ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0}
 ENV JRS_HOME /usr/src/jasperreports-server
 ENV BUILDOMATIC_MODE non-interactive
 ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022}
 
 LABEL "org.jasperosft.name"="JasperReports Server" \
-      "org.jaspersoft.vendor"="TIBCO Software Inc." \
+      "org.jaspersoft.vendor"="Cloud Software Group, Inc." \
       "org.jaspersoft.maintainer"="[email protected]" \
       "org.jaspersoft.version"=$JASPERREPORTS_SERVER_VERSION \
       "org.jaspersoft.release_date"=$RELEASE_DATE \

jaspersoft-containers/Docker/jrs/cluster-config/WEB-INF/classes/ehcache_hibernate.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2005 - 2021 TIBCO Software Inc. All rights reserved.
+  ~ Copyright (C) 2005-2023. Cloud Software Group, Inc. All Rights Reserved.
   ~ http://www.jaspersoft.com.
   ~
   ~ Unless you have purchased a commercial license agreement from Jaspersoft,
@@ -26,27 +26,27 @@
 <!-- Below are four configurations:
 1. No clustering (default)
 2. RMI distribution with autodiscovery based on multicast
-   - For this to work IP-Multicasting must be enabled on all nodes 
+   - For this to work IP-Multicasting must be enabled on all nodes
 3. JMS distribution based on ActiveMQ JMS server
    - Make sure you have correct IP:PORT for each providerURL property
 4. AWS distribution utilizing Amazon SNS/SQS services. Using this option might incurr additional costs as Amazon charges customers per API call.
    - note that this is experimental support and that ActiveMQ JMS option also works for AWS and is a preferred method of distribution.
 
 ********************************************************************************
-* If you have clustering environment comment or remove default "NO CLUSTERING" * 
+* If you have clustering environment comment or remove default "NO CLUSTERING" *
 * segment and uncomment ONE of the options provided                            *
 * by removing "START" and "END" lines inside the corresponding block           *
 * (RMI, JMS or AWS)                                                            *
 ********************************************************************************
---> 
-	<defaultCache 
-		maxElementsInMemory="10000" 
-		eternal="false" 
-		overflowToDisk="false" 
-		timeToIdleSeconds="3600" 
-		timeToLiveSeconds="18000" 
-		diskPersistent="false" 
-		diskExpiryThreadIntervalSeconds="120"/>
+-->
+        <defaultCache
+                maxElementsInMemory="10000"
+                eternal="false"
+                overflowToDisk="false"
+                timeToIdleSeconds="3600"
+                timeToLiveSeconds="18000"
+                diskPersistent="false"
+                diskExpiryThreadIntervalSeconds="120"/>
 
 <!-- ******************************************************************** NO CLUSTERING *************************************************** -->
      <!-- START 
@@ -64,62 +64,108 @@
 
 <!-- ******************************************************************** END of NO CLUSTERING ******************************************** -->
 
+        <cache name="roles"
+                   maxElementsInMemory="1000"
+                   eternal="true"
+                   overflowToDisk="false"
+                   diskPersistent="false"/>
+
+        <cache name="rolesByTenant"
+                   maxElementsInMemory="1000"
+                   eternal="true"
+                   overflowToDisk="false"
+                   diskPersistent="false"/>
+
+        <cache name="users"
+                   maxElementsInMemory="10000"
+                   eternal="true"
+                   overflowToDisk="false"
+                   diskPersistent="false"/>
+        <cache name="usersByTenant"
+                   maxElementsInMemory="10000"
+                   eternal="true"
+                   overflowToDisk="false"
+                   diskPersistent="false"/>
+
+        <cache name="tenants"
+                   maxElementsInMemory="1000"
+                   eternal="true"
+                   overflowToDisk="false"
+                   diskPersistent="false"/>
+        <cache name="tenantsByName"
+                   maxElementsInMemory="1000"
+                   eternal="true"
+                   overflowToDisk="false"
+                   diskPersistent="false"/>
+
+        <cache name="folders"
+                   maxElementsInMemory="100000"
+                   eternal="true"
+                   overflowToDisk="false"
+                   diskPersistent="false"/>
+
+        <cache name="profileAttributes"
+                   maxElementsInMemory="100000"
+                   eternal="true"
+                   overflowToDisk="false"
+                   diskPersistent="false"/>
+
 <!-- ********************************************************************   RMI  ********************************************************** -->
-     <!-- START 
-	<cacheManagerPeerProviderFactory
-		class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-		properties="peerDiscovery=automatic,multicastGroupAddress=228.0.0.1,multicastGroupPort=4446,timeToLive=1"/>
-	<cacheManagerPeerListenerFactory
-		class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
-		properties="port=40011,remoteObjectPort=40012,socketTimeoutMillis=120000"/>
-
-	<cache name="org.hibernate.cache.internal.StandardQueryCache"
-		maxEntriesLocalHeap="5000"
-		maxElementsInMemory="5000"
-		eternal="false"
-		timeToLiveSeconds="120">
-               
-		<cacheEventListenerFactory
+     <!-- START
+        <cacheManagerPeerProviderFactory
+                class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
+                properties="peerDiscovery=automatic,multicastGroupAddress=228.0.0.1,multicastGroupPort=4446,timeToLive=1"/>
+        <cacheManagerPeerListenerFactory
+                class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
+                properties="port=40011,remoteObjectPort=40012,socketTimeoutMillis=120000"/>
+
+        <cache name="org.hibernate.cache.internal.StandardQueryCache"
+                maxEntriesLocalHeap="5000"
+                maxElementsInMemory="5000"
+                eternal="false"
+                timeToLiveSeconds="120">
+
+                <cacheEventListenerFactory
                         class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
                         properties="replicateAsynchronously=true, replicatePuts=true, replicateUpdates=true,replicateUpdatesViaCopy=false, replicateRemovals=true "/>
-        	<bootstrapCacheLoaderFactory
-            		class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
-            		properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
+                <bootstrapCacheLoaderFactory
+                        class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
+                        properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
 
-	</cache>
+        </cache>
 
-	<cache name="org.hibernate.cache.spi.UpdateTimestampsCache"
-		maxEntriesLocalHeap="5000"
-		eternal="true">
-               
-		<cacheEventListenerFactory
+        <cache name="org.hibernate.cache.spi.UpdateTimestampsCache"
+                maxEntriesLocalHeap="5000"
+                eternal="true">
+
+                <cacheEventListenerFactory
                         class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
                         properties="replicateAsynchronously=true, replicatePuts=true, replicateUpdates=true,replicateUpdatesViaCopy=true, replicateRemovals=true "/>
-        	<bootstrapCacheLoaderFactory
-            		class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
-            		properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
-	</cache>
-	
-	<cache name="defaultRepoCache" 
-		maxElementsInMemory="10000" 
-		eternal="false" 
-		overflowToDisk="false" 
-		timeToIdleSeconds="36000" 
-		timeToLiveSeconds="180000" 
-		diskPersistent="false" 
-		diskExpiryThreadIntervalSeconds="120"
-        	statistics="true">
-        	
-		<cacheEventListenerFactory
-			class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-			properties="replicateAsynchronously=true, replicatePuts=false, replicateUpdates=true,replicateUpdatesViaCopy=false, replicateRemovals=true "/>
-	        <bootstrapCacheLoaderFactory
-        		class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
-			properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
-	</cache>
+                <bootstrapCacheLoaderFactory
+                        class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
+                        properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
+        </cache>
+
+        <cache name="defaultRepoCache"
+                maxElementsInMemory="10000"
+                eternal="false"
+                overflowToDisk="false"
+                timeToIdleSeconds="36000"
+                timeToLiveSeconds="180000"
+                diskPersistent="false"
+                diskExpiryThreadIntervalSeconds="120"
+                statistics="true">
+
+                <cacheEventListenerFactory
+                        class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
+                        properties="replicateAsynchronously=true, replicatePuts=false, replicateUpdates=true,replicateUpdatesViaCopy=false, replicateRemovals=true "/>
+                <bootstrapCacheLoaderFactory
+                        class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
+                        properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
+        </cache>
 
      END -->
-<!-- ********************************************  END of  RMI   ************************************************ -->	
+<!-- ********************************************  END of  RMI   ************************************************ -->
 
 <!-- ***************************************************   JMS   ************************************************ -->
         <cacheManagerPeerProviderFactory
@@ -190,16 +236,16 @@
 
         </cache>
 
-	<cache name="defaultRepoCache" 
-		maxElementsInMemory="10000" 
-		eternal="false" 
-		overflowToDisk="false" 
-		timeToIdleSeconds="36000" 
-		timeToLiveSeconds="180000" 
-		diskPersistent="false" 
-		diskExpiryThreadIntervalSeconds="120"
-        	statistics="true">
-        	
+        <cache name="defaultRepoCache"
+                maxElementsInMemory="10000"
+                eternal="false"
+                overflowToDisk="false"
+                timeToIdleSeconds="36000"
+                timeToLiveSeconds="180000"
+                diskPersistent="false"
+                diskExpiryThreadIntervalSeconds="120"
+                statistics="true">
+
                  <cacheEventListenerFactory
                         class="net.sf.ehcache.distribution.jms.JMSCacheReplicatorFactory"
                         properties="replicateAsynchronously=true,
@@ -221,17 +267,17 @@
                         topicBindingName=ehcache,providerURL=${jasperserver.cache.jms.provider}"
                         propertySeparator=","/>
 
-	</cache>
+        </cache>
 
 <!-- ***************************************************** END of JMS   ****************************************************************************  -->
 
 <!-- **********************************************************   AWS   ****************************************************************************  -->
-     <!-- START 
+     <!-- START
         <cacheManagerPeerProviderFactory
                 class="com.jaspersoft.jasperserver.api.engine.replication.JRSNevadoCacheManagerPeerProviderFactory"
                 properties=""
                 propertySeparator="," />
-	
+
         <cache name="org.hibernate.cache.internal.StandardQueryCache"
                 maxEntriesLocalHeap="5000"
                 maxElementsInMemory="5000"
@@ -257,24 +303,24 @@
                         class="net.sf.ehcache.distribution.jms.JMSCacheReplicatorFactory"
                         properties="replicateAsynchronously=true,
                         replicatePuts=true,
-			replicatePutsViaCopy=true,
+                        replicatePutsViaCopy=true,
                         replicateUpdates=false,
                         replicateUpdatesViaCopy=false,
                         replicateRemovals=true,
                         asynchronousReplicationIntervalMillis=100"
                         propertySeparator=","/>
         </cache>
-	
-	<cache name="defaultRepoCache" 
-		maxElementsInMemory="10000" 
-		eternal="false" 
-		overflowToDisk="false" 
-		timeToIdleSeconds="36000" 
-		timeToLiveSeconds="180000" 
-		diskPersistent="false" 
-		diskExpiryThreadIntervalSeconds="120"
-        	statistics="true">
-        	
+
+        <cache name="defaultRepoCache"
+                maxElementsInMemory="10000"
+                eternal="false"
+                overflowToDisk="false"
+                timeToIdleSeconds="36000"
+                timeToLiveSeconds="180000"
+                diskPersistent="false"
+                diskExpiryThreadIntervalSeconds="120"
+                statistics="true">
+
                 <cacheEventListenerFactory
                         class="net.sf.ehcache.distribution.jms.JMSCacheReplicatorFactory"
                         properties="replicateAsynchronously=true,
@@ -284,10 +330,9 @@
                         replicateRemovals=true,
                         asynchronousReplicationIntervalMillis=1000"
                         propertySeparator=","/>
-	</cache>
+        </cache>
 
      END -->
 <!-- ***************************************************** END of AWS   ***************************************************************************** -->
 
 </ehcache>
-