Merge branch 'develop' into dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.2.7

Author: wojciech-piotrowiak

.github/workflows/codeql.yml

@@ -47,7 +47,7 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+    - uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
       with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           skip_checkout: true
       - name: Ensure SHA pinned actions
-        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@6eb1abde32fed00453b0d03497f4ba4fecba146d # v3.0.21
+        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@25ed13d0628a1601b4b44048e63cc4328ed03633 # v3.0.22
 
   build:
     runs-on: ubuntu-latest
@@ -52,7 +52,7 @@ jobs:
         with:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
-      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      - uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -153,7 +153,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      - uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -172,7 +172,7 @@ jobs:
           version: v1.19.6
 
       - name: Set up Helm
-        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v3
+        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v3
         with:
           version: v3.5.2
 
@@ -339,7 +339,7 @@ jobs:
           java-version: 21
           distribution: 'temurin'
 
-      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      - uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

activiti-cloud-acceptance-scenarios/identity-adapter-acceptance-tests/pom.xml

@@ -41,6 +41,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
+      <version>${com.squareup.okhttp3.version}</version>
     </dependency>
     <dependency>
       <groupId>io.github.openfeign</groupId>

activiti-cloud-acceptance-scenarios/pom.xml

@@ -26,6 +26,7 @@
     <activiti-cloud.version>${project.version}</activiti-cloud.version>
     <serenity-maven-plugin.version>3.6.23</serenity-maven-plugin.version>
     <commons-fileupload.version>1.5</commons-fileupload.version>
+    <com.squareup.okhttp3.version>4.12.0</com.squareup.okhttp3.version>
   </properties>
   <dependencyManagement>
     <dependencies>

activiti-cloud-api/activiti-cloud-api-process-model-impl/pom.xml

@@ -51,7 +51,7 @@
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations-jakarta</artifactId>
-      <version>2.2.22</version>
+      <version>${swagger-annotations.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

activiti-cloud-api/activiti-cloud-api-task-model-impl/pom.xml

@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations-jakarta</artifactId>
-      <version>2.2.22</version>
+      <version>${swagger-annotations.version}</version>
     </dependency>
   </dependencies>
 </project>

activiti-cloud-api/pom.xml

@@ -12,7 +12,7 @@
   <name>Activiti Cloud :: Runtime API Parent</name>
   <packaging>pom</packaging>
   <properties>
-    <activiti.version>8.8.0-alpha.5</activiti.version>
+    <activiti.version>8.8.0-alpha.7</activiti.version>
   </properties>
   <modules>
     <module>activiti-cloud-api-dependencies</module>

activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml

@@ -12,7 +12,7 @@
   <packaging>pom</packaging>
   <name>Activiti Cloud :: Dependencies Parent</name>
   <properties>
-    <spring-cloud.version>2023.0.3</spring-cloud.version>
+    <spring-cloud.version>2024.0.0</spring-cloud.version>
     <testcontainers.version>1.20.1</testcontainers.version>
     <h2.version>2.2.224</h2.version>
     <graphql-java.version>22.1</graphql-java.version>
@@ -21,6 +21,11 @@
   </properties>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.aspectj</groupId>
+        <artifactId>aspectjweaver</artifactId>
+        <version>${aspectweaver.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.graphql-java</groupId>
         <artifactId>graphql-java</artifactId>
@@ -70,6 +75,16 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.hibernate.orm</groupId>
+        <artifactId>hibernate-core</artifactId>
+        <version>${hibernate.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hibernate.orm</groupId>
+        <artifactId>hibernate-jpamodelgen</artifactId>
+        <version>${hibernate.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.postgresql</groupId>
         <artifactId>postgresql</artifactId>

activiti-cloud-examples/activiti-cloud-query/rest/src/test/java/org/activiti/cloud/query/rest/QueryRestApplicationIT.java

@@ -66,7 +66,7 @@ public class QueryRestApplicationIT {
     private IdentityTokenProducer identityTokenProducer;
 
     @Test
-    public void contextLoads() throws Exception {
+    public void contextLoads() {
         assertThat(applicationContext).isNotNull();
     }
 

activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-model/pom.xml

@@ -96,7 +96,7 @@
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations-jakarta</artifactId>
-      <version>2.2.22</version>
+      <version>${swagger-annotations.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-rest/src/main/java/org/activiti/cloud/services/query/rest/CommonExceptionHandlerQuery.java

@@ -23,6 +23,8 @@
 import org.activiti.core.common.spring.security.policies.ActivitiForbiddenException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.http.HttpStatus;
@@ -32,6 +34,7 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice
+@Order(Ordered.HIGHEST_PRECEDENCE)
 public class CommonExceptionHandlerQuery {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CommonExceptionHandlerQuery.class);

activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryAdminProcessDiagramIT.java

@@ -48,6 +48,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
@@ -59,6 +60,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource("classpath:application-test-admin.properties")
@@ -93,6 +95,9 @@ public class QueryAdminProcessDiagramIT {
     @Autowired
     private TestRestTemplate testRestTemplate;
 
+    @MockitoBean
+    private BuildProperties buildProperties;
+
     private String processDefinitionId = UUID.randomUUID().toString();
 
     private EventsAggregator eventsAggregator;

activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionCandidateStartersIT.java

@@ -36,6 +36,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
 import org.springframework.context.annotation.Import;
@@ -44,6 +45,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource("classpath:application-test.properties")
@@ -67,6 +69,9 @@ public class QueryProcessDefinitionCandidateStartersIT {
     @Autowired
     private MyProducer producer;
 
+    @MockitoBean
+    private BuildProperties buildProperties;
+
     @BeforeEach
     public void setUp() {
         identityTokenProducer.withTestUser("hruser");

activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionIT.java

@@ -37,6 +37,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
 import org.springframework.context.annotation.Import;
@@ -45,6 +46,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.util.StreamUtils;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -71,6 +73,9 @@ public class QueryProcessDefinitionIT {
     @Autowired
     private MyProducer producer;
 
+    @MockitoBean
+    private BuildProperties buildProperties;
+
     @BeforeEach
     public void setUp() {
         identityTokenProducer.withTestUser("hruser");

activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessInstancesEntityIT.java

@@ -34,6 +34,7 @@
 import org.activiti.api.process.model.ProcessInstance.ProcessInstanceStatus;
 import org.activiti.api.runtime.model.impl.ActivitiErrorMessageImpl;
 import org.activiti.api.runtime.model.impl.ProcessInstanceImpl;
+import org.activiti.cloud.alfresco.rest.model.EntryResponseContent;
 import org.activiti.cloud.api.process.model.CloudProcessInstance;
 import org.activiti.cloud.api.process.model.impl.events.CloudProcessCancelledEventImpl;
 import org.activiti.cloud.api.process.model.impl.events.CloudProcessCreatedEventImpl;
@@ -70,6 +71,7 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
@@ -83,6 +85,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.transaction.annotation.Transactional;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -133,6 +136,9 @@ public class QueryProcessInstancesEntityIT {
     @Autowired
     private VariableRepository variableRepository;
 
+    @MockitoBean
+    private BuildProperties buildProperties;
+
     private EventsAggregator eventsAggregator;
 
     private ProcessInstanceEventContainedBuilder processInstanceBuilder;
@@ -1276,14 +1282,14 @@ void should_getAllProcessInstancesWithVariables() {
 
     @Test
     void should_containMessageNotDisclosed_whenExceptionMessageIsNotHandled() {
-        ResponseEntity<ActivitiErrorMessageImpl> responseEntity = testRestTemplate.exchange(
+        ResponseEntity<EntryResponseContent<ActivitiErrorMessageImpl>> responseEntity = testRestTemplate.exchange(
             PROC_URL + "?startDate=2022-14-14T000000",
             HttpMethod.GET,
             identityTokenProducer.entityWithAuthorizationHeader(),
-            new ParameterizedTypeReference<ActivitiErrorMessageImpl>() {}
+            new ParameterizedTypeReference<EntryResponseContent<ActivitiErrorMessageImpl>>() {}
         );
 
-        assertThat(responseEntity.getBody().getMessage())
+        assertThat(responseEntity.getBody().getEntry().getMessage())
             .isEqualTo(ErrorAttributesMessageSanitizer.ERROR_NOT_DISCLOSED_MESSAGE);
     }