CIF-2032 - Category page mapping for UID + URL_PATH (#131)

* Category page mapping for UID + URL_PATH
* Update cloudready image
* Update casssic image

.circleci/config.yml

@@ -61,13 +61,13 @@ executors:
     docker:
       - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.4-azul-jdk11
         <<: *docker_auth
-      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:5104-azul
+      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:5181-azul
         <<: *docker_auth
   test_executor_655:
     docker:
       - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.4-azul-jdk11
         <<: *docker_auth
-      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem:6.5.7-azul
+      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem:6.5.8-azul
         <<: *docker_auth
 
 jobs:
@@ -80,7 +80,7 @@ jobs:
           keys:
             - maven-repo-v2-cloud-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
             - maven-repo-v2-cloud
-            - maven-repo-v2-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }} 
+            - maven-repo-v2-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
             - maven-repo-v2-
       - run:
           name: Update permissions
@@ -159,7 +159,7 @@ jobs:
     resource_class: large
     working_directory: /home/circleci/build
     <<: *integration_test_steps
-    
+
   integration-test-cloudready-with-addon:
     executor: test_executor_cloudready
     environment:

ui.content/src/main/content/jcr_root/etc/map.publish/https/hostname.adobeaemcloud.com/category-page-reverse/.content.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="sling:Mapping"
-    sling:internalRedirect="/content/venia/([a-z]{2})/([a-z]{2})/products/category-page\\.(\\d+)\\.html/(.+)"
+    sling:internalRedirect="/content/venia/([a-z]{2})/([a-z]{2})/products/category-page\\.([^\\.]+)\\.html/(.+)"
     sling:match="$1/$2/c/$4.$3.html" />

ui.content/src/main/content/jcr_root/etc/map.publish/https/hostname.adobeaemcloud.com/category-page/.content.xml

@@ -2,4 +2,4 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="sling:Mapping"
     sling:internalRedirect="/content/venia/$1/$2/products/category-page.$4.html/$3"
-    sling:match="content/venia/([a-z]{2})/([a-z]{2})/c/(.+)\\.(\\d+)\\.html" />
+    sling:match="content/venia/([a-z]{2})/([a-z]{2})/c/(.+)\\.([^\\.]+).html" />