Merge branch 'master' of https://github.com/Alfresco/alfresco-communi…

…ty-repo into fix/MNT-24542-Class-Cast-Exception # Conflicts: # repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacade.java
Alfresco · Jan 9, 2025 · c20df23 · c20df23
2 parents ed66d7f + 60a0d6a
commit c20df23
Show file tree

Hide file tree

Showing 1,408 changed files with 3,296 additions and 3,303 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -106,12 +106,16 @@ jobs:
         run: |
           bash ./scripts/ci/init.sh
           bash ./scripts/ci/build.sh
+      - name: "Remove excluded files"
+        run: |
+          mkdir temp-dir-for-sast
+          bash ./scripts/ci/remove-sast-exclusions.sh ./packaging/war/target/alfresco.war temp-dir-for-sast/reduced.war
       - name: "Run SAST Scan"
         uses: veracode/[email protected]
         with:
           vid: ${{ secrets.VERACODE_API_ID }}
           vkey: ${{ secrets.VERACODE_API_KEY }}
-          file: "packaging/war/target/alfresco.war"
+          file: "temp-dir-for-sast/reduced.war"
           fail_build: true
           project_name: alfresco-community-repo
           issue_details: true
@@ -129,6 +133,8 @@ jobs:
         with:
           name: Veracode Pipeline-Scan Results (Human Readable)
           path: readable_output.zip
+      - name: "Remove temporary directory"
+        run: rm -rfv temp-dir-for-sast
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 

diff --git a/.secrets.baseline b/.secrets.baseline
@@ -133,21 +133,21 @@
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "b86dc2f033a63f2b7b9e7d270ab806d2910d7572",
         "is_verified": false,
-        "line_number": 293
+        "line_number": 299
       },
       {
         "type": "Secret Keyword",
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "1bfb0e20f886150ba59b853bcd49dea893e00966",
         "is_verified": false,
-        "line_number": 368
+        "line_number": 374
       },
       {
         "type": "Secret Keyword",
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "128f14373ccfaff49e3664045d3a11b50cbb7b39",
         "is_verified": false,
-        "line_number": 902
+        "line_number": 908
       }
     ],
     ".github/workflows/master_release.yml": [
@@ -1888,5 +1888,5 @@
       }
     ]
   },
-  "generated_at": "2024-10-09T09:32:52Z"
-}
+  "generated_at": "2024-12-19T08:58:42Z"
+}
diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>25.1.0.17-SNAPSHOT</version>
+      <version>25.1.0.22-SNAPSHOT</version>
    </parent>
 
    <modules>

diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>25.1.0.17-SNAPSHOT</version>
+      <version>25.1.0.22-SNAPSHOT</version>
    </parent>
 
    <modules>

diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>25.1.0.17-SNAPSHOT</version>
+      <version>25.1.0.22-SNAPSHOT</version>
    </parent>
 
    <build>

diff --git a/...-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestProperties.java b/...-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestProperties.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -59,4 +59,4 @@ public class RMRestProperties extends RestProperties
 
     @Value ("${docker.host}")
     private String dockerHost;
-}
+}
diff --git a/.../rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestWrapper.java b/.../rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -177,4 +177,4 @@ public RestHtmlResponse processHtmlResponse(RestRequest simpleRequest)
     {
         return restWrapper.processHtmlResponse(simpleRequest);
     }
-}
+}
diff --git a/...rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java b/...rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -265,4 +265,4 @@ public RetentionScheduleAPI getRetentionScheduleAPI(UserModel userModel)
     {
         return getGSCoreAPI(userModel).usingRetentionScheduleAPI();
     }
-}
+}
diff --git a/...-community-rest-api/src/main/java/org/alfresco/rest/core/search/SearchRequestBuilder.java b/...-community-rest-api/src/main/java/org/alfresco/rest/core/search/SearchRequestBuilder.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -91,4 +91,4 @@ public SearchRequestBuilder setFieldsBuilder(List<String> fields)
         return this;
     }
 
-}
+}
diff --git a/...on/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java b/...on/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -118,4 +118,4 @@ public static String extractErrorMessageFromHttpResponse(HttpResponse httpRespon
         }
         return null;
     }
-}
+}
diff --git a/...ion/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java b/...ion/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -124,7 +124,7 @@ protected List<String> getPropertyValues(JSONObject result, String propertyName)
 
     /**
      * Helper method to extract the property value for the given nodeRef and property name
-     * 
+     *
      * @param result
      * @param nodeRef
      * @param propertyName
@@ -152,7 +152,7 @@ protected String getPropertyValue(JSONObject result, String nodeRef, String prop
 
         return propertyValue;
     }
-    
+
     /**
      * Helper method to extract property values from request result and put them in map as a list that corresponds to a unique property value.
      *
@@ -832,4 +832,4 @@ public static String getFilePlanPath()
     {
         return FILE_PLAN_PATH;
     }
-}
+}
diff --git a/...on/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/RMEvents.java b/...on/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/RMEvents.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -46,4 +46,4 @@ public String getEventName()
     {
         return eventName;
     }
-}
+}
diff --git a/...mmunity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEntry.java b/...mmunity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEntry.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -86,4 +86,4 @@ public class AuditEntry extends TestModel
     @JsonProperty (required = true)
     private String timestamp;
 
-}
+}
diff --git a/...munity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEvents.java b/...munity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEvents.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -59,4 +59,4 @@ public enum AuditEvents
         this.event = event;
         this.eventDisplayName = displayName;
     }
-}
+}
diff --git a/...munity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/IdNamePair.java b/...munity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/IdNamePair.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -58,4 +58,4 @@ public class IdNamePair
 
     @JsonProperty (required = true)
     private String nodeType;
-}
+}
diff --git a/...n-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Owner.java b/...n-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Owner.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -48,4 +48,4 @@
 public class Owner extends TestModel
 {
 
-}
+}
diff --git a/...on-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Path.java b/...on-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Path.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -59,4 +59,4 @@ public class Path extends TestModel
 
     @JsonProperty (required = true)
     private List<IdNamePair> elements;
-}
+}
diff --git a/...nity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/ReviewPeriod.java b/...nity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/ReviewPeriod.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -50,4 +50,4 @@ public class ReviewPeriod
 
     @JsonProperty (required = true)
     private String expression;
-}
+}
diff --git a/...rest-api/src/main/java/org/alfresco/rest/rm/community/model/custom/CustomDefinitions.java b/...rest-api/src/main/java/org/alfresco/rest/rm/community/model/custom/CustomDefinitions.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -60,4 +60,4 @@ public String getDefinition()
     {
         return definition;
     }
-}
+}
diff --git a/...munity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlan.java b/...munity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlan.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -96,4 +96,4 @@ public class FilePlan extends TestModel
 
     @JsonProperty
     private Path path;
-}
+}
diff --git a/...t-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlanProperties.java b/...t-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlanProperties.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -79,4 +79,4 @@ public class FilePlanProperties extends TestModel
 
     @JsonProperty (PROPERTIES_DESCRIPTION)
     private String description;
-}
+}
diff --git a/.../java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAlias.java b/.../java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAlias.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -37,4 +37,4 @@ public class FilePlanComponentAlias
     public static final String FILE_PLAN_ALIAS = "-filePlan-";
     public static final String TRANSFERS_ALIAS = "-transfers-";
     public static final String UNFILED_RECORDS_CONTAINER_ALIAS = "-unfiled-";
-}
+}
diff --git a/...ava/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java b/...ava/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -65,4 +65,4 @@ private FilePlanComponentAspects()
 
     // WORM Lock aspect
     public static final String ASPECT_WORM_LOCK = "rme:wormLock";
-}
+}