ESB-950 Mapping Entando <> Azure AD

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
       contents: write
       pull-requests: read
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v4
@@ -42,7 +42,10 @@ jobs:
         if [ -f ".github/configure" ]; then . .github/configure "build"; fi
         gh.job.outputVar SKIP_SCANS
         gh.job.outputVar SKIP_TESTS
-
+
+    - name: Fix Docker environment for Testcontainers
+      run: echo "DOCKER_API_VERSION=" >> $GITHUB_ENV
+
     - name: Cache Maven packages
       uses: actions/cache@v4
       with:
@@ -74,7 +77,7 @@ jobs:
       contents: read
       pull-requests: write
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     env:
       SONAR_PROJECT_KEY: ${{ vars.SONAR_PROJECT_KEY }}
@@ -109,8 +112,13 @@ jobs:
         id: configure
         run: if [ -f ".github/configure" ]; then . .github/configure "test-and-scan"; fi
 
+      - name: Fix Docker environment for Testcontainers
+        run: echo "DOCKER_API_VERSION=" >> $GITHUB_ENV
+
       - name: Test and Scan
-        run: .github/test-and-scan.sh
+        run: |
+         unset DOCKER_API_VERSION
+         .github/test-and-scan.sh
 
       - name: Save the test report
         if: failure()
@@ -129,7 +137,7 @@ jobs:
       contents: read
       pull-requests: write
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
 
     steps:

Dockerfile.tomcat

@@ -10,8 +10,8 @@ LABEL name="Entando App" \
       summary="Entando Application" \
       description="This Entando app engine application provides APIs and composition for Entando applications"
 
-COPY target/generated-resources/licenses /licenses
-COPY target/generated-resources/licenses.xml /
+###COPY target/generated-resources/licenses /licenses
+###COPY target/generated-resources/licenses.xml /
 
 COPY --chown=185:0 webapp/target/*.war /usr/local/tomcat/webapps/
 

engine/src/main/java/com/agiletec/aps/system/services/authorization/Authorization.java

@@ -18,6 +18,7 @@
 
 import java.io.Serializable;
 
+import java.util.Objects;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import org.springframework.security.core.GrantedAuthority;
@@ -67,6 +68,8 @@ protected void setRole(Role role) {
 
     @Override
     public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
         Authorization other = (Authorization) obj;
         boolean isGroupsEquals = (null == this.getGroup() && null == other.getGroup())
                 || (null != this.getGroup() && null != other.getGroup() && other.getGroup().equals(this.getGroup()));
@@ -75,4 +78,8 @@ public boolean equals(Object obj) {
         return (isRolesEquals && isGroupsEquals);
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(getGroup(), getRole());
+    }
 }