Backmerge from main into develop

.github/workflows/resources/mail.html

@@ -121,7 +121,7 @@
                                                       <table width="100%" cellpadding="0" cellspacing="0" border="0">
                                                         <tr>
                                                           <td style="padding-right: 0px;padding-left: 0px;" align="center">
-                                                            <img align="center" border="0" src="https://raw.githubusercontent.com/ontimize/ontimize-boot/gh-pages/assets/images/logo-ontimize.png" alt="Logo" title="Logo" style="outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;clear: both;display: inline-block !important;border: none;height: auto;float: none;width: 29%;max-width: 168.2px;" width="168.2" class="v-src-width v-src-max-width"/>
+                                                            <img align="center" border="0" src="https://raw.githubusercontent.com/ontimize/ontimize-boot-parent/refs/heads/develop/.github/workflows/resources/logo-ontimize.png" alt="Logo" title="Logo" style="outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;clear: both;display: inline-block !important;border: none;height: auto;float: none;width: 29%;max-width: 168.2px;" width="168.2" class="v-src-width v-src-max-width"/>
                                                           </td>
                                                         </tr>
                                                       </table>

.github/workflows/sonar-build.yml

@@ -1,5 +1,9 @@
-name: Build and analyze
+name: SonarQube
 on:
+  push:
+    branches:
+      - main
+      - develop
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
@@ -10,12 +14,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: 11
-      - name: Cache SonarCloud packages
+          java-version: 17
+          distribution: 'temurin' # Alternative distribution options are available.
+      - name: Cache SonarQube packages
         uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
@@ -27,18 +31,7 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
-      - name: Build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B -Pjacoco verify
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 17
-      - name: Sonar
+      - name: Build and analyze
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=ontimize_ontimize-boot-parent
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_EE }}
+        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=ontimize_ontimize-boot-parent

CHANGELOG.md

@@ -8,6 +8,8 @@
 <!-- Este fichero sigue el formato de https://keepachangelog.com -->
 
 ## [Unreleased]
+## [3.17.0] - 2025-11-04
+* **Updated Ontimize Boot Version**: Update Ontimize EE version to 5.14.0
 ## [3.16.0] - 2025-09-12
 ### Changed 🛠️
 * **Updated Ontimize Boot Version**: Update Ontimize EE version to 5.13.0
@@ -51,7 +53,8 @@
 ### Changed 🛠️
 * **Updated Ontimize Boot Version**: Update Ontimize Version to 3.9.0.
 
-[unreleased]: https://github.com/ontimize/ontimize-boot-parent/compare/3.16.0...HEAD
+[unreleased]: https://github.com/ontimize/ontimize-boot-parent/compare/3.17.0...HEAD
+[3.17.0]: https://github.com/ontimize/ontimize-boot-parent/compare/3.16.0...3.17.0
 [3.16.0]: https://github.com/ontimize/ontimize-boot-parent/compare/3.15.3...3.16.0
 [3.15.3]: https://github.com/ontimize/ontimize-boot-parent/compare/3.15.2...3.15.3
 [3.15.2]: https://github.com/ontimize/ontimize-boot-parent/compare/3.15.1...3.15.2

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.ontimize.boot</groupId>
 	<artifactId>ontimize-boot-parent</artifactId>
-	<version>3.17.0-SNAPSHOT</version>
+	<version>3.18.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
@@ -72,7 +72,7 @@
 
 	<properties>
 		<project.dependency.spring.boot.version>2.5.0</project.dependency.spring.boot.version>
-		<project.dependency.ontimize.boot.version>3.17.0-SNAPSHOT</project.dependency.ontimize.boot.version>
+		<project.dependency.ontimize.boot.version>3.18.0-SNAPSHOT</project.dependency.ontimize.boot.version>
 		<project.dependency.spring.cloud.version>Greenwich.RELEASE</project.dependency.spring.cloud.version>
 		<project.plugin.ontimize.openapi.generator>1.2.0</project.plugin.ontimize.openapi.generator>
 		<!-- =========================================================== -->