Merge branch 'v/5.5' into wrmay-patch-2

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # These owners will be the default owners for everything in
 # the repo
-*   @rebekah-lawrence @oliverhowell
+*   @oliverhowell @amandalindsay

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/action-updater.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4
         with:
           # [Required] Access token with `workflow` scope.
           token: ${{ secrets.ACTION_UPDATER }}

.github/workflows/adoc-html.yml

@@ -9,8 +9,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4.1.4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
         node-version: 20
     - name: Convert adoc

.github/workflows/backport-5-0.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
 
       - name: checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
          fetch-depth: 0
 

.github/workflows/backport-5-1.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
 
       - name: checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
          fetch-depth: 0
 

.github/workflows/backport-5-2.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
 
       - name: checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
          fetch-depth: 0
 

.github/workflows/backport-5-3.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
 
       - name: checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
          fetch-depth: 0
 

.github/workflows/backport-5-4.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
 
       - name: checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
          fetch-depth: 0
 

.github/workflows/backport-5-5.yml

@@ -0,0 +1,40 @@
+name: Backport changes to the 5.5.0 branch
+on:
+ push:
+  branches:
+   - main
+jobs:
+  backport:
+    strategy:
+      matrix:
+        branch: ['v/5.5']
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: checkout
+        uses: actions/[email protected]
+        with:
+         fetch-depth: 0
+
+      - name: Set up git config
+        run: |
+          git config user.name "GitHub Actions Bot"
+          git config user.email "<>"
+
+      - name: Check PR for backport label
+        id: check_pr_labels
+        uses: shioyang/[email protected]
+        with:
+         github-token: ${{ secrets.GITHUB_TOKEN }}
+         labels: '["backport to 5.5"]'
+
+      - name: See result
+        run: echo "${{ steps.check_pr_labels.outputs.result }}"
+
+      - name: Checkout maintenance branch and cherry-pick
+        if: ${{ steps.check_pr_labels.outputs.result == 'true' }}
+        run: |
+          git fetch
+          git checkout ${{ matrix.branch }}
+          git cherry-pick -x --strategy=recursive -X theirs $GITHUB_SHA
+          git push

.github/workflows/backport.yml

@@ -7,12 +7,12 @@ jobs:
   backport:
     strategy:
       matrix:
-        branch: ['v/5.0', 'v/5.1', 'v/5.2', 'v/5.3', 'v/5.4']
+        branch: ['v/5.0', 'v/5.1', 'v/5.2', 'v/5.3', 'v/5.4', 'v/5.5']
     runs-on: ubuntu-latest
     steps:
 
       - name: checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
          fetch-depth: 0
 

.github/workflows/forwardport.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
 
       - name: checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
          fetch-depth: 0
 

.github/workflows/maven-pr-builder.yaml

@@ -0,0 +1,29 @@
+name: Compile Java source files
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - '**/*.java'
+      - 'pom.xml'
+      - 'docs/antora.yml'
+      - '.github/workflows/maven-pr-builder.yaml'
+  schedule:
+    - cron: '15 2 * * 0'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Maven compile
+        run: |
+          HZ_VERSION=$(grep full-version docs/antora.yml|sed "s/.*:[ ]*'\(.*\)'/\1/")
+          mvn --show-version --batch-mode --no-transfer-progress test "-Dhazelcast.version=$HZ_VERSION"

.github/workflows/to-plain-html.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:              
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.TO_HTML }}      
       - name: Asciidoc to html

.github/workflows/validate.yml

@@ -13,8 +13,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4.1.4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
         node-version: 20
     - name: Check for broken internal links

.gitignore

@@ -9,3 +9,5 @@ package-lock.json
 .project
 .settings/
 .vscode/settings.json
+/target/
+.classpath

antora-playbook-local.yml

@@ -7,6 +7,7 @@ site:
     docsearch_id: 'QK2EAH8GB0'
     docsearch_api: 'ef7bd9485eafbd75d6e8425949eda1f5'
     docsearch_index: 'prod_hazelcast_docs'
+    ai_search_id: '6b326171-dd1e-40c6-a948-1f9bb6c0ed52'       
 urls:
   html_extension_style: drop    
 content:

antora-playbook.yml

@@ -1,12 +1,13 @@
 site:
   title: Documentation
   url: https://hardcore-allen-f5257d.netlify.app/
-  start_page: hazelcast:whats-new.adoc
+  start_page: hazelcast:ROOT:what-is-hazelcast.adoc
   robots: disallow
   keys:
     docsearch_id: 'QK2EAH8GB0'
     docsearch_api: 'ef7bd9485eafbd75d6e8425949eda1f5'
     docsearch_index: 'prod_hazelcast_docs'
+    ai_search_id: '6b326171-dd1e-40c6-a948-1f9bb6c0ed52'        
 content:
   sources:
   - url: .
@@ -47,9 +48,7 @@ asciidoc:
     idseparator: '-'
     # Variables used in the docs
     page-survey: https://www.surveymonkey.co.uk/r/NYGJNF9
-    hazelcast-cloud: Cloud
-    ucn: User Code Namespaces
-    ucd: User Code Deployment
+    # variables moved to antora.yml
   extensions:
     - ./docs-tabs-library/tabs-block.js
     - asciidoctor-kroki

check-links-playbook.yml

@@ -2,18 +2,21 @@ site:
   title: Documentation
   url: http:localhost:5000
 content:
-  sources: 
+  sources:
   - url: .
     branches: HEAD
     start_path: docs
+  - url: https://github.com/hazelcast/hz-docs
+    branches: [v/5.5]
+    start_path: docs
   - url: https://github.com/hazelcast/hazelcast-docs
     branches: [main]
     start_paths: [home,tutorials]
   - url: https://github.com/hazelcast/imdg-docs
     branches: [main]
     start_path: docs
   - url: https://github.com/hazelcast/management-center-docs
-    branches: [main]
+    branches: [main, v/5.5]
     start_path: docs
   - url: https://github.com/hazelcast/cloud-docs
     branches: [main]
@@ -140,7 +143,7 @@ content:
   - url: https://github.com/hazelcast/clc-docs
     branches: main
     start_path: docs
-ui: 
+ui:
   bundle:
     url: https://github.com/hazelcast/hazelcast-docs-ui/releases/latest/download/ui-bundle.zip #../hazelcast-docs-ui/build/ui-bundle.zip
     snapshot: true

docs/antora.yml

@@ -4,30 +4,44 @@ title: Hazelcast Platform
 version: '5.5'
 # Version in the version selector (we display only the latest major.minor version)
 display_version: '5.5'
-# Displays a banner to inform users that this is a prerelease version 
+# Displays a banner to inform users that this is a prerelease version
 asciidoc:
   attributes:
     # The full major.minor.patch version, which is used as a variable in the docs for things like download links
-    full-version: '5.5.0'
+    full-version: '5.5.2'
     # The minor.patch version, which is used as a variable in the docs for things like file versions
     minor-version: '5.5'
     # The snapshot version for installing with brew
-    version-brew: '5.5.0'
+    version-brew: '5.5.2'
+    java-client-standalone-version: '5.5.0-BETA'
     # Allows us to use UI macros. See https://docs.asciidoctor.org/asciidoc/latest/macros/ui-macros/
     experimental: true
     page-toclevels: 1@
     # All page-latest attributes are used as a variable in the docs for things like download links and search results
     page-latest-cli: '5.2021.09'
     # Must be lowercase because this is how the version appears in the docs
-    page-latest-supported-mc: '5.5.0'
-    page-latest-supported-java-client: '5.5.0'
-    page-latest-supported-go-client: '1.4.1'
+    page-latest-supported-mc: '5.6'
+    page-latest-supported-java-client: '5.5.2'
+    page-latest-supported-java-client-new: '5.5.0-BETA'    
+    # https://github.com/hazelcast/hazelcast-go-client/releases
+    page-latest-supported-go-client: '1.4.2'
+    # https://github.com/hazelcast/hazelcast-cpp-client/releases
     page-latest-supported-cplusplus-client: '5.3.0'
-    page-latest-supported-csharp-client: '5.3.0'
-    page-latest-supported-python-client: '5.3.0'
+    # https://github.com/hazelcast/hazelcast-csharp-client/releases
+    page-latest-supported-csharp-client: '5.4.0'
+    # https://github.com/hazelcast/hazelcast-python-client/releases
+    page-latest-supported-python-client: '5.5.0'
+    # https://github.com/hazelcast/hazelcast-nodejs-client/releases
     page-latest-supported-nodejs-client: '5.3.0'
-    page-latest-supported-clc: '5.4.1'
+    # https://github.com/hazelcast/clc/releases
+    page-latest-supported-clc: '5.5.0'
     open-source-product-name: 'Community Edition'
     enterprise-product-name: 'Enterprise Edition'
+    java-client-new: 'Java Client (Standalone)'
+    java-client: 'Java Client and Embedded Server'
+    url-cloud-signup: https://cloud.hazelcast.com/sign-up 
+    hazelcast-cloud: Cloud
+    ucn: User Code Namespaces
+    ucd: User Code Deployment    
 nav:
   - modules/ROOT/nav.adoc

docs/modules/ROOT/examples/dds/map/Employee.java

@@ -1,7 +1,9 @@
+import com.hazelcast.core.HazelcastJsonValue;
+
 //tag::emp[]
 public class Employee {
     public static HazelcastJsonValue asJson(String surname) {
         return new HazelcastJsonValue("{ \"surname\": \"" + surname + "\" }");
     }
 }
-//end::emp[]
+//end::emp[]

docs/modules/ROOT/examples/dds/map/ListenerWithPredicate.java

@@ -2,6 +2,7 @@
 import com.hazelcast.core.EntryEvent;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.core.HazelcastJsonValue;
 import com.hazelcast.map.IMap;
 import com.hazelcast.map.listener.EntryAddedListener;
 import com.hazelcast.map.listener.EntryRemovedListener;
@@ -41,4 +42,4 @@ public void entryUpdated(EntryEvent<String, HazelcastJsonValue> event) {
         }
     }
 }
-//end::lwp[]
+//end::lwp[]

docs/modules/ROOT/examples/dds/map/Supplement.java

@@ -1,3 +1,5 @@
+package dds.map;
+
 import java.io.Serializable;
 
 
@@ -18,4 +20,4 @@ public String getName() {
     public Integer getPrice() {
         return price;
     }
-}
+}

docs/modules/ROOT/examples/dds/map/YourMapStoreImplementation.java

@@ -1,3 +1,5 @@
+package dds.map;
+
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.map.MapLoaderLifecycleSupport;
 import com.hazelcast.map.MapStore;
@@ -106,4 +108,4 @@ public void delete(String key) {
     public void deleteAll(Collection<String> keys) {
         this.collection.deleteMany(in("_id", keys));
     }
-}
+}