Merge pull request #37 from wttech/upgrade-2026-02

Upgrade to recent AEMC

Author: krystian-panek-vmltech

examples/controller/src/ansible/requirements.yml

@@ -11,4 +11,4 @@ collections:
   - name: community.general
     version: 2.4.0
   - name: wttech.aem
-    version: 2.0.8
+    version: 2.0.16

examples/local/group_vars/all.yml

@@ -1,7 +1,6 @@
 ---
 
-aem_root_dir: "{{ playbook_dir }}/aem_root"
-aem_home_dir: "{{ aem_root_dir }}/home"
+aem_home_dir: "{{ playbook_dir }}/aem/home"
 aem_tmp_dir: "{{ aem_home_dir }}/tmp"
 aem_lib_dir: "{{ aem_home_dir }}/lib"
 aem_tool_dir: "{{ aem_home_dir }}/opt"
@@ -117,33 +116,39 @@ aem_config_dict:
           - "org.osgi.service.component.runtime.ServiceComponentRuntime"
           - "java.util.ResourceBundle"
         received_max_age: 5s
+      # OSGi components state tracking
+      component_stable:
+        skip: false
+        pids:
+          include: ['com.day.crx.packaging.*', 'org.apache.sling.installer.*']
+          exclude: ['org.apache.sling.installer.hc.*', 'org.apache.sling.installer.core.impl.console.*']
+          match:
+            "disabled": []
+            "no config": []
+            "unsatisfied (reference)": []
+            "satisfied": []
       # Sling Installer tracking
       installer:
+        skip: false
         # JMX state checking
         state: true
         # Pause Installation nodes checking
         pause: true
+      # Specific endpoints / paths (like login page)
+      path_ready:
+        timeout: 10s
+      login_page:
+        skip: false
+        path: "/libs/granite/core/content/login.html"
+        status_code: 200
+        contained_text: QUICKSTART_HOMEPAGE
 
     # Managed locally (set up automatically)
     local:
       # Current runtime dir (Sling launchpad, JCR repository)
       unpack_dir: "{{ aem_home_dir }}/var/instance"
       # Archived runtime dir (AEM backup files '*.aemb.zst')
       backup_dir: "{{ aem_home_dir }}/var/backup"
-      # Additional tools needed to manage instance
-      tool_dir: "{{ aem_tool_dir }}"
-
-      # Oak Run tool options (offline instance management)
-      oak_run:
-        download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.44.0/oak-run-1.44.0.jar"
-        store_path: "crx-quickstart/repository/segmentstore"
-
-      # Source files
-      quickstart:
-        # AEM SDK ZIP or JAR
-        dist_file: "{{ aem_home_dir }}/lib/{aem-sdk,cq-quickstart}-*.{zip,jar}"
-        # AEM License properties file
-        license_file: "{{ aem_home_dir }}/lib/license.properties"
 
     # Status discovery (timezone, AEM version, etc)
     status:
@@ -162,6 +167,7 @@ aem_config_dict:
     package:
       # Force re-uploading/installing of snapshot AEM packages (just built / unreleased)
       snapshot_patterns: [ "**/*-SNAPSHOT.zip" ]
+      snapshot_ignored: false
       # Use checksums to avoid re-deployments when snapshot AEM packages are unchanged
       snapshot_deploy_skipping: true
       # Disable following workflow launchers for a package deployment time only
@@ -175,6 +181,18 @@ aem_config_dict:
         console: false
         # Fail on case 'installed with errors'
         strict: true
+      # Number of changes after which the commit to the repository is performed
+      install_save_threshold: 1024
+      # Allows to relax dependency handling if needed
+      install_dependency_handling: required
+      # Controls how 'rep:policy' nodes are handled during import
+      install_ac_handling: ''
+      # Determines whether a copy of the package is created during installation
+      install_extract_only: snapshot
+
+    # 'SSL By Default'
+    ssl:
+      setup_timeout: 30s
 
     # OSGi Framework
     osgi:
@@ -186,43 +204,41 @@ aem_config_dict:
           start_level: 20
           refresh_packages: true
 
+        # Force re-uploading/installing of snapshot OSGi bundles
+        snapshot_patterns: [ "**/*-SNAPSHOT.jar" ]
+        snapshot_ignored: false
+        # Use checksums to avoid re-installations when snapshot OSGi bundles are unchanged
+        snapshot_install_skipping: true
+
+    # OAK Repository
+    oak:
+      index:
+        await_not_reindexed_timeout: 60m
+
     # Crypto Support
     crypto:
       key_bundle_symbolic_name: com.adobe.granite.crypto.file
 
+    # Replication
+    replication:
+      bundle_symbolic_name: com.day.cq.cq-replication
+
     # Workflow Manager
     workflow:
       launcher:
         lib_root: /libs/settings/workflow/launcher
         config_root: /conf/global/settings/workflow/launcher
         toggle_retry:
-          timeout: 5m
+          timeout: 10m
           delay: 10s
 
-  java:
-    # Require following versions before e.g running AEM instances
-    version_constraints: ">= 11, < 12"
-
-    # Pre-installed local JDK dir
-    # a) keep it empty to download open source Java automatically for current OS and architecture
-    # b) set it to absolute path or to env var '[[.Env.JAVA_HOME]]' to indicate where closed source Java like Oracle is installed
-    home_dir: ""
-
-    # Auto-installed JDK options
-    download:
-      # Source URL with template vars support
-      url: "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jdk_[[.Arch]]_[[.Os]]_hotspot_11.0.18_10.[[.ArchiveExt]]"
-      # Map source URL template vars to be compatible with Adoptium Java
-      replacements:
-        # Var 'Os' (GOOS)
-        "darwin": "mac"
-        # Var 'Arch' (GOARCH)
-        "x86_64": "x64"
-        "amd64": "x64"
-        "386": "x86-32"
-        # enforce non-ARM Java as some AEM features are not working on ARM (e.g Scene7)
-        "arm64": "x64"
-        "aarch64": "x64"
+  base:
+    # Location of library files (AEM SDK ZIP, Quickstart JAR & License, Crypto keys, service packs, additional packages, etc.)
+    lib_dir: "{{ aem_lib_dir }}"
+    # Location of temporary files (downloaded AEM packages, etc)
+    tmp_dir: "{{ aem_tmp_dir }}"
+    # Location of supportive tools (downloaded Java, OakRun, unpacked AEM SDK)
+    tool_dir: "{{ aem_tool_dir }}"
 
   output:
     log:
@@ -231,8 +247,51 @@ aem_config_dict:
       # Controls where outputs and logs should be written to when format is 'text' (console|file|both|none)
       mode: both
 
-  base:
-    # Location of temporary files (downloaded AEM packages, etc)
-    tmp_dir: "{{ aem_tmp_dir }}"
-    # Location of supportive tools (downloaded Java, OakRun, unpacked AEM SDK)
-    tool_dir: "{{ aem_tool_dir }}"
+  vendor:
+    # AEM instance source files
+    quickstart:
+      # AEM SDK ZIP or JAR
+      dist_file: "{{ aem_home_dir }}/lib/{aem-sdk,cq-quickstart}-*.{zip,jar}"
+      # AEM License properties file
+      license_file: "{{ aem_home_dir }}/lib/license.properties"
+
+    # AEM SDK source files
+    sdk:
+      # Controls which distribution of dispatcher is unpacked (auto|unix|windows)
+      os: auto
+
+    # JDK used to: run AEM instances, build OSGi bundles, assemble AEM packages
+    java:
+      # Require following versions before e.g running AEM instances
+      version_constraints: [">= 1.8, < 1.9", ">= 11, < 12", ">= 17, < 18", ">= 21, < 22"]
+
+      # Pre-installed local JDK dir
+      # a) keep it empty to download open source Java automatically for current OS and architecture
+      # b) set it to absolute path or to env var '[[.Env.JAVA_HOME]]' to indicate where closed source Java like Oracle is installed
+      home_dir: ""
+
+      # Auto-installed JDK options
+      download:
+        # Source URL with template vars support
+        url: "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_[[.Arch]]_[[.Os]]_hotspot_11.0.25_9.[[.ArchiveExt]]"
+        # Map source URL template vars to be compatible with Adoptium Java
+        replacements:
+          # Var 'Os' (GOOS)
+          "darwin": "mac"
+          # Var 'Arch' (GOARCH)
+          "x86_64": "x64"
+          "amd64": "x64"
+          "386": "x86-32"
+          # enforce non-ARM Java as some AEM features are not working on ARM (e.g Scene7)
+          "arm64": "x64"
+          "aarch64": "x64"
+
+    # Oak Run tool options (offline instance management)
+    oak_run:
+      download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
+      store_path: "crx-quickstart/repository/segmentstore"
+
+      # Pre-installed local JAR file
+      # a) keep it empty to download it automatically
+      # b) set it to an absolute path to skip downloading
+      jar_file: ""

galaxy.yml

@@ -8,7 +8,7 @@ namespace: wttech
 name: aem
 
 # The version of the collection. Must be compatible with semantic versioning
-version: "2.0.9"
+version: "--"
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

plugins/action/content.py

@@ -0,0 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+from ..module_utils.action import AemActionBase
+
+
+class ActionModule(AemActionBase):
+    pass

plugins/action/instance_backup.py

@@ -0,0 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+from ..module_utils.action import AemActionBase
+
+
+class ActionModule(AemActionBase):
+    pass

plugins/action/oak.py

@@ -0,0 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+from ..module_utils.action import AemActionBase
+
+
+class ActionModule(AemActionBase):
+    pass

plugins/action/replication.py

@@ -0,0 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+from ..module_utils.action import AemActionBase
+
+
+class ActionModule(AemActionBase):
+    pass