Skip to content

Commit

Permalink
Merge branch 'main' into cleanup/6.0/security
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverhowell authored Oct 11, 2024
2 parents f955615 + 0d93647 commit 15bd91b
Show file tree
Hide file tree
Showing 41 changed files with 1,093 additions and 463 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/action-updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/adoc-html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport-5-0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport-5-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport-5-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport-5-3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport-5-4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/forwardport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/to-plain-html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file added docs/modules/ROOT/images/feast_batch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/modules/ROOT/images/feast_streaming.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 34 additions & 22 deletions docs/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@
.Develop & build
* Ingestion
** xref:ingest:overview.adoc[]
** xref:computing:distributed-computing.adoc[]
** xref:query:overview.adoc[]
include::architecture:partial$nav.adoc[]
* xref:cluster-performance:best-practices.adoc[]
** xref:capacity-planning.adoc[]
** xref:cluster-performance:performance-tips.adoc[]
Expand All @@ -59,19 +56,27 @@
** xref:cluster-performance:near-cache.adoc[]
** xref:cluster-performance:imap-bulk-read-operations.adoc[]
** xref:cluster-performance:data-affinity.adoc[]
include::architecture:partial$nav.adoc[]
* Member/Client Discovery
** xref:clusters:discovery-mechanisms.adoc[]
** xref:clusters:discovering-by-tcp.adoc[]
** xref:clusters:discovering-by-multicast.adoc[]
** xref:clusters:discovering-native-clients.adoc[]
include::kubernetes:partial$nav.adoc[]
include::data-structures:partial$nav.adoc[]
* Distributed Compute
// Distributed Computing
* xref:computing:distributed-computing.adoc[]
// ** xref:data-structures:entry-processor.adoc[] also dupe, commenting for now
** Executor Services
include::computing:partial$nav.adoc[]
// UCN
** xref:clusters:user-code-namespaces.adoc[]
include::clusters:partial$nav.adoc[]
// Pipelines
// ** xref:pipelines:overview.adoc[Data Pipelines] this duped in partial nav below
// Ingestion
* Data Ingestion & Query
** xref:ingest:overview.adoc[]
** xref:query:overview.adoc[]
include::mapstore:partial$nav.adoc[]
include::pipelines:partial$nav.adoc[]
* SQL
Expand Down Expand Up @@ -166,7 +171,7 @@ include::wan:partial$nav.adoc[]
.Integrate
* xref:integrate:connectors.adoc[Overview]
* Integrating with Spring
* Integrate with Spring
** xref:spring:overview.adoc[Overview]
** xref:spring:configuration.adoc[]
** xref:spring:springaware.adoc[]
Expand All @@ -175,32 +180,39 @@ include::wan:partial$nav.adoc[]
** xref:spring:transaction-manager.adoc[]
** xref:spring:best-practices.adoc[]
* xref:integrate:integrate-with-feast.adoc[]
** xref:integrate:install-connect.adoc[]
** xref:integrate:install-connect.adoc[Install and connect Feast]
** xref:integrate:feast-config.adoc[]
** xref:integrate:feature-engineering-with-feast.adoc[]
* Data Structure Connectors
// Need an overview
** xref:integrate:map-connector.adoc[]
** xref:integrate:jcache-connector.adoc[]
** xref:integrate:list-connector.adoc[]
** xref:integrate:reliable-topic-connector.adoc[]
** xref:integrate:vector-collection-connector.adoc[]
* xref:integrate:database-connectors.adoc[Database Connectors]
** xref:integrate:feature-engineering-with-feast.adoc[Get started with Feast batch features]
** xref:integrate:streaming-features-with-feast.adoc[Get started with Feast streaming features]
// Connectors
* Messaging System Connectors
* xref:integrate:messaging-system-connectors.adoc[Overview]
** xref:integrate:kafka-connector.adoc[]
** xref:integrate:kinesis-connector.adoc[]
** xref:integrate:jms-connector.adoc[]
// Database and CDC
* xref:integrate:database-connectors.adoc[Database & CDC Connectors]
** xref:integrate:jdbc-connector.adoc[]
** xref:integrate:cdc-connectors.adoc[]
** xref:integrate:legacy-cdc-connectors.adoc[]
** xref:integrate:elasticsearch-connector.adoc[]
** xref:integrate:mongodb-connector.adoc[]
* File Connectors
// Files need an overview
// Need an overview
** xref:integrate:file-connector.adoc[]
** xref:integrate:legacy-file-connector.adoc[]
* xref:integrate:messaging-system-connectors.adoc[Messaging System Connectors]
** xref:integrate:kafka-connector.adoc[]
** xref:integrate:kinesis-connector.adoc[]
** xref:integrate:jms-connector.adoc[]
* Hazelcast Data Structure Connectors
// Need an overview
** xref:integrate:map-connector.adoc[]
** xref:integrate:jcache-connector.adoc[]
** xref:integrate:list-connector.adoc[]
** xref:integrate:reliable-topic-connector.adoc[]
** xref:integrate:vector-collection-connector.adoc[]
// Kafka Connect
* xref:integrate:kafka-connect-connectors.adoc[]
* xref:integrate:socket-connector.adoc[]
* xref:integrate:test-connectors.adoc[]
// Custom & Community
* xref:integrate:custom-connectors.adoc[]
* Community Connectors
// Need an overview
Expand Down
2 changes: 2 additions & 0 deletions docs/modules/clients/pages/cplusplus.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
:page-api-reference: http://hazelcast.github.io/hazelcast-cpp-client/{page-latest-supported-cplusplus-client}/index.html
[[c-client]]

TIP: For the latest C{plus}{plus} API documentation, see http://hazelcast.github.io/hazelcast-cpp-client/{page-latest-supported-cplusplus-client}/index.html[Hazelcast C++ Client docs].

You can use the native {cpp} client to connect to Hazelcast cluster members and
perform almost all operations that a member can perform.
Clients differ from members in that clients do not hold data. The {cpp} client is
Expand Down
2 changes: 2 additions & 0 deletions docs/modules/clients/pages/dotnet.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
:page-api-reference: http://hazelcast.github.io/hazelcast-csharp-client/{page-latest-supported-csharp-client}/api/index.html
[[net-client]]

TIP: For the latest .NET API documentation, see http://hazelcast.github.io/hazelcast-csharp-client/{page-latest-supported-csharp-client}/api/index.html[Hazelcast .NET Client docs].

You can use the native .NET client to connect to Hazelcast client members.
The API is very similar to the Java native client.

Expand Down
2 changes: 2 additions & 0 deletions docs/modules/clients/pages/go.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
= Go Client
:page-api-reference: https://pkg.go.dev/github.com/hazelcast/hazelcast-go-client@v{page-latest-supported-go-client}

TIP: For the latest Go API documentation, see https://pkg.go.dev/github.com/hazelcast/hazelcast-go-client@v{page-latest-supported-go-client}[Hazelcast Go Client docs].

Go Client implementation for Hazelcast. It is implemented using the Hazelcast Open Binary Client Protocol.

See Hazelcast Go client's GitHub https://github.com/hazelcast/hazelcast-go-client[repo^]
Expand Down
2 changes: 0 additions & 2 deletions docs/modules/clients/pages/java.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
:description: Hazelcast provides a {java-client} within the standard distribution you can start using right away, and also a lightweight {java-client-new} that is available in Beta.
[[java-client]]

// check redirects

== Overview

Hazelcast provides a {java-client} which you can use to connect to a Hazelcast cluster. `hazelcast-<VERSION>.jar` is bundled in the Hazelcast standard package, so just add `hazelcast-<VERSION>.jar` to your classpath and you can start using this client as if you are using the Hazelcast API.
Expand Down
7 changes: 3 additions & 4 deletions docs/modules/clients/pages/memcache.adoc
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
= Memcache Client

NOTE: Hazelcast Memcache Client only supports ASCII protocol. Binary Protocol is not supported.

A Memcache client written in any language can talk directly to a Hazelcast cluster.
No additional configuration is required.

To be able to use a Memcache client, you must enable
the Memcache client request listener service using either one of the following configuration options:
NOTE: Hazelcast Memcache Client only supports ASCII protocol. Binary Protocol is not supported.

To be able to use a Memcache client, you must enable the Memcache client request listener service using either one of the following configuration options:

1 - Using the `network` configuration element:

Expand Down
2 changes: 2 additions & 0 deletions docs/modules/clients/pages/nodejs.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
= Node.js Client
:page-api-reference: http://hazelcast.github.io/hazelcast-nodejs-client/api/{page-latest-supported-nodejs-client}/docs/

TIP: For the latest Node.js API documentation, see http://hazelcast.github.io/hazelcast-nodejs-client/api/{page-latest-supported-nodejs-client}/docs/[Hazelcast Node.js Client docs].

Node.js Client implementation for Hazelcast. It is implemented using the Hazelcast Open Binary Client Protocol.

See Hazelcast Node.js client's GitHub https://github.com/hazelcast/hazelcast-nodejs-client[repo^]
Expand Down
2 changes: 2 additions & 0 deletions docs/modules/clients/pages/python.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
= Python Client
:page-api-reference: https://hazelcast.readthedocs.io/en/v{page-latest-supported-python-client}/index.html

TIP: For the latest Python API documentation, see https://hazelcast.readthedocs.io/en/v{page-latest-supported-python-client}/index.html[Hazelcast Python Client docs].

Python Client implementation for Hazelcast. It is implemented using the Hazelcast Open Binary Client Protocol.

See Hazelcast Python client's GitHub https://github.com/hazelcast/hazelcast-python-client[repo^]
Expand Down
105 changes: 0 additions & 105 deletions docs/modules/cluster-performance/pages/bulk-read-operations.adoc

This file was deleted.

2 changes: 1 addition & 1 deletion docs/modules/clusters/partials/ucn-migrate-tip.adoc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CAUTION: {ucd} has been deprecated and will be removed in the next major version. To continue deploying your user code after this time, {open-source-product-name} users can either upgrade to {enterprise-product-name}, or add their resources to the Hazelcast member class paths. Hazelcast recommends that {enterprise-product-name} users migrate their user code to use {ucn}. For further information on migrating from {ucd} to {ucn}, see the xref:clusters:ucn-migrate-ucd.adoc[] topic.
CAUTION: {ucd} has been deprecated and will be removed in the next major version. To continue deploying your user code after this time, {open-source-product-name} users can either upgrade to {enterprise-product-name}, or add their resources to the Hazelcast member class paths. Hazelcast recommends that {enterprise-product-name} users migrate their user code to use {ucn} for all purposes other than Jet stream processing. For further information on migrating from {ucd} to {ucn}, see xref:clusters:ucn-migrate-ucd.adoc[].
Loading

0 comments on commit 15bd91b

Please sign in to comment.