Merge release/3.6.0 into main

.github/workflows/deploy-mvn-central-release.yml

@@ -33,11 +33,11 @@ jobs:
           ref: ${{ env.BRANCH }}
           fetch-depth: 0
       - name: Setup Java JDK and Maven
-        uses: ontimize/setup-java-maven-gitAction@v4
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

.github/workflows/deploy-mvn-central-snapshot-manual.yml

@@ -19,11 +19,11 @@ jobs:
       - name : Checkout repository code
         uses: actions/checkout@v3
       - name: Setup Java JDK and Maven
-        uses: ontimize/setup-java-maven-gitAction@v4
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

.github/workflows/deploy-mvn-central-snapshot.yml

@@ -15,11 +15,11 @@ jobs:
       - name : Checkout repository code
         uses: actions/checkout@v3
       - name: Setup Java JDK and Maven
-        uses: ontimize/setup-java-maven-gitAction@v4
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

.github/workflows/prepare-release-by-PR.yml

@@ -1,5 +1,11 @@
 name: Prepare a release by a pull request
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Optional. Enter a new custom version instead of default existing one.'
+        type: string
+        required: false
 jobs:
   Prepare-a-release-by-a-pull-request:
     runs-on: ubuntu-latest
@@ -21,12 +27,33 @@ jobs:
       - name: Get framework version to release
         id: version
         run: |
-          var_version=$(mvn help:evaluate -q -Dexpression=project.version -DforceStdout) 
+          var_version=""
+          if  ${{ github.event.inputs.version != '' }}; then
+            var_version=${{ github.event.inputs.version }}
+          else
+            var_version=$(mvn help:evaluate -q -Dexpression=project.version -DforceStdout) 
+          fi
           echo "version=$var_version" >> $GITHUB_OUTPUT
       - name: Set author identity
         run: |
           git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
           git config --global user.email "${{ secrets.CI_COMMIT_MAIL }}"
+      - name: Prepare CHANGELOG.md
+        run: |
+          version=$(echo "${{ steps.version.outputs.version }}" | sed 's/-SNAPSHOT//' )
+          date=$(date +%F)
+          version_header="## [$version] - $date"
+          sed -i "/^## \[Unreleased\]/a $version_header" CHANGELOG.md
+          pattern="^\[unreleased\]: https://github.com/.*/compare/"
+          linenum=$(grep -n "$pattern" CHANGELOG.md | cut -d: -f1)
+          linecontent=$(sed -n "${linenum}p" CHANGELOG.md)
+          linecontent=$(echo "$linecontent" | sed -E "s|^\[[^]]+\]|[$version]|")
+          linecontent=$(echo "$linecontent" | sed -E "s|\.\.\.HEAD|...$version|")
+          sed -i "${linenum}a $linecontent" CHANGELOG.md
+          linecontent=$(sed -n "${linenum}p" CHANGELOG.md)
+          linecontent=$(echo "$linecontent" | sed -E "s|(compare/).*?(.\.\.\HEAD)|\1$version\2|")
+          sed -i "${linenum}s|.*|$linecontent|" CHANGELOG.md
+          git add CHANGELOG.md
       - name: Prepare version to release
         id: tag
         run: |
@@ -51,4 +78,4 @@ jobs:
       - name: Create pull request
         run: |
           version=${{ steps.tag.outputs.version }}
-          gh pr create -B main -H release/$version --title "Merge release/$version into main" --body "Created by a GitHub Action → Prepare a release by a pull request" --label "release"
+          gh pr create -B main -H release/$version --title "Merge release/$version into main" --body "Created by a GitHub Action → Prepare a release by a pull request" --label "release"

.github/workflows/send-release-mail.yml

@@ -38,7 +38,7 @@ jobs:
           ref: ${{ env.BRANCH }}
           fetch-depth: 0
       - name: Setup Java JDK and Maven
-        uses: ontimize/setup-java-maven-gitAction@v4
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'

CHANGELOG.md

@@ -7,6 +7,9 @@
 <!-- ### Security 🛡️-->
 
 ## [Unreleased]
+## [3.6.0] - 2025-06-25
+* **TypeMappingsUtils.java**: Add *FLOAT* and *DOUBLE* as different types.
+* **DynamicJasperHelper.java**: Fix return data for *DOUBLE* or *FLOAT*.
 ## [3.5.0] - 2025-04-28
 ### Fixed 🐛
 * **Report store**: Fixed problems when using parameters of Jasper Report. It was added new `ReportStoreParamsDto` object into `fillReport` API method for allowing customization of parameters as types, formattings, etc.
@@ -66,7 +69,8 @@ public InputStream generateReport(final ReportParamsDto reportParamsDto)
 ### Added ✔️
 * **Report on-demand**: On-demand reports can now be created with the help of Jasper Reports via HTTP requests. The parameters for creating these reports can be stored in preferences for later use.
 
-[unreleased]: https://github.com/ontimize/ontimize-jee-report/compare/3.5.0...HEAD
+[unreleased]: https://github.com/ontimize/ontimize-jee-report/compare/3.6.0...HEAD
+[3.6.0]: https://github.com/ontimize/ontimize-jee-report/compare/3.5.0...3.6.0
 [3.5.0]: https://github.com/ontimize/ontimize-jee-report/compare/3.4.0...3.5.0
 [3.4.0]: https://github.com/ontimize/ontimize-jee-report/compare/3.3.0...3.4.0
 [3.3.0]: https://github.com/ontimize/ontimize-jee-report/compare/3.2.0...3.3.0

ontimize-jee-report-common/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.ontimize.jee.report</groupId>
 		<artifactId>ontimize-jee-report</artifactId>
-		<version>3.5.0</version>
+		<version>3.6.0</version>
 	</parent>
 	<artifactId>ontimize-jee-report-common</artifactId>
 
@@ -76,17 +76,6 @@
 		<url>https://github.com/ontimize/ontimize-jee-report/tree/master</url>
 	</scm>
 
-	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-		<repository>
-			<id>ossrh</id>
-			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>com.ontimize.jee</groupId>