Merge branch 'main' into fix/external-data-store-leftover

.github/CODEOWNERS

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

.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.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/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:
@@ -19,7 +20,7 @@ content:
 #    start_path: docs/rest
 ui:
   bundle:
-    url: ../hazelcast-docs-ui/build/ui-bundle.zip
+    url:  https://github.com/hazelcast/hazelcast-docs-ui/releases/latest/download/ui-bundle.zip #../hazelcast-docs-ui/build/ui-bundle.zip
     snapshot: true
 antora:
   extensions:

antora-playbook.yml

@@ -1,12 +1,13 @@
 site:
   title: Documentation
   url: https://hardcore-allen-f5257d.netlify.app/
-  start_page: hazelcast:getting-started:get-started-cli.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: .

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

@@ -14,6 +14,7 @@ asciidoc:
     minor-version: '6.0-SNAPSHOT'
     # The snapshot version for installing with brew
     version-brew: '6.0.0-SNAPSHOT'
+    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
     snapshot: true
@@ -23,12 +24,13 @@ asciidoc:
     # Must be lowercase because this is how the version appears in the docs
     page-latest-supported-mc: '6.0-snapshot'
     page-latest-supported-java-client: '6.0.0-SNAPSHOT'
+    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'
     # https://github.com/hazelcast/hazelcast-csharp-client/releases
-    page-latest-supported-csharp-client: '5.4.0'
+    page-latest-supported-csharp-client: '5.5.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
@@ -37,5 +39,11 @@ asciidoc:
     page-latest-supported-clc: '5.4.1'
     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?utm_source=docs-website
+    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));
     }
-}
+}

docs/modules/ROOT/examples/dds/queue/ConsumerMember.java

@@ -7,17 +7,17 @@ public class ConsumerMember {
 
     public static void main( String[] args ) throws Exception {
         HazelcastInstance hz = Hazelcast.newHazelcastInstance();
-        IQueue<Integer> queue = hz.getQueue( "queue" ); <1>
+        IQueue<Integer> queue = hz.getQueue( "queue" ); // <1>
         while ( true ) {
-            int item = queue.take(); <2>
+            int item = queue.take(); // <2>
             System.out.println( "Consumed: " + item );
             if ( item == -1 ) {
                 queue.put( -1 );
                 break;
             }
-            Thread.sleep( 5000 ); <3>
+            Thread.sleep( 5000 ); // <3>
         }
         System.out.println( "Consumer Finished!" );
     }
 }
-//end::consumer[]
+//end::consumer[]

docs/modules/ROOT/examples/dds/queue/ProducerMember.java

@@ -7,9 +7,9 @@ public class ProducerMember {
 
     public static void main( String[] args ) throws Exception {
         HazelcastInstance hz = Hazelcast.newHazelcastInstance();
-        IQueue<Integer> queue = hz.getQueue( "queue" ); <1>
+        IQueue<Integer> queue = hz.getQueue( "queue" ); // <1>
 
-        <2>
+        // <2>
         for ( int k = 1; k < 100; k++ ) {
             queue.put( k );
             System.out.println( "Producing: " + k );
@@ -19,4 +19,4 @@ public static void main( String[] args ) throws Exception {
         System.out.println( "Producer Finished!" );
     }
 }
-//end::producer[]
+//end::producer[]

docs/modules/ROOT/examples/dds/queue/TheQueueStore.java

@@ -28,7 +28,7 @@ public void deleteAll(Collection<Long> keys) {
     }
 
     @Override
-    <1>
+    // <1>
     public Item load(Long key) {
         System.out.println("load");
         return null;
@@ -46,4 +46,4 @@ public Set<Long> loadAllKeys() {
         return null;
     }
 }
-//end::qs[]
+//end::qs[]

docs/modules/ROOT/examples/distributedcomputing/ScheduledExecutorConfiguration.java

@@ -1,7 +1,9 @@
 import com.hazelcast.config.Config;
+import com.hazelcast.config.MergePolicyConfig;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.scheduledexecutor.IScheduledExecutorService;
+import com.hazelcast.config.ScheduledExecutorConfig;
 
 public class ScheduledExecutorConfiguration {
     public static void main(String[] args) throws Exception{