From 3702cfb25078c67b35f9c16b1c6f2901fc5b1ac0 Mon Sep 17 00:00:00 2001 From: Luca Rospocher Date: Mon, 13 Apr 2026 13:05:12 +0200 Subject: [PATCH 1/2] chore: Remove submodule and whole docs for Integrations. --- .gitmodules | 4 --- CODEOWNERS | 2 +- mkdocs.yml | 80 ++++++++++++++++++++++------------------------- wire-apps-jvm-sdk | 1 - 4 files changed, 39 insertions(+), 48 deletions(-) delete mode 160000 wire-apps-jvm-sdk diff --git a/.gitmodules b/.gitmodules index ebcbe10..fa09393 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,3 @@ path = wire-server url = https://github.com/wireapp/wire-server.git branch = develop -[submodule "wire-apps-jvm-sdk"] - path = wire-apps-jvm-sdk - url = https://github.com/wireapp/wire-apps-jvm-sdk.git - branch = main diff --git a/CODEOWNERS b/CODEOWNERS index c2cf485..568bc42 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @wireapp/backend @wireapp/platform-engineering @wireapp/customerops @wireapp/integrations +* @wireapp/backend @wireapp/platform-engineering @wireapp/customerops diff --git a/mkdocs.yml b/mkdocs.yml index 971fd5e..56bfcfd 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -38,9 +38,9 @@ nav: - Upgrade process: how-to/upgrade/03-upgrade.md - Troubleshooting: how-to/upgrade/04-troubleshooting.md - Configuration Reference: - - Overview: how-to/upgrade/05-config-reference.md - - Wire Server 5.24: how-to/upgrade/config-references/wire-server-5.24.0.md - - Wire Server 5.25: how-to/upgrade/config-references/wire-server-5.25.0.md + - Overview: how-to/upgrade/05-config-reference.md + - Wire Server 5.24: how-to/upgrade/config-references/wire-server-5.24.0.md + - Wire Server 5.25: how-to/upgrade/config-references/wire-server-5.25.0.md - Administration: - Overview: how-to/administrate/README.md - kubernetes: how-to/administrate/kubernetes/README.md @@ -77,45 +77,41 @@ nav: - Developer Notes: - Overview: developer/README.md - Developer: - - API versioning: developer/developer/api-versioning.md - - How to build wire-server: developer/developer/building.md - - Writing code interacting with cassandra: developer/developer/cassandra-interaction.md - - Changelog: developer/developer/changelog.md - - Coding conventions: developer/developer/coding-conventions.md - - Dependencies: developer/developer/dependencies.md - - Editor setup: developer/developer/editor-setup.md - - Features: developer/developer/features.md - - Federation API Conventions: developer/developer/federation-api-conventions.md - - Federation Design Aspects: developer/developer/federation-design-aspects.md - - Developer how-to’s: developer/developer/how-to.md - - Refactoring galley to support large conversations: developer/developer/large-conversations.md - - Linting: developer/developer/linting.md - - OpenTelemetry Instrumentation: developer/developer/open-telemetry.md - - PR Guidelines: developer/developer/pr-guidelines.md - - Internal processes: developer/developer/processes.md - - Storing SCIM-related data: developer/developer/scim/storage.md - - Servant: developer/developer/servant.md - - Testing the wire-server Haskell code base: developer/developer/testing.md - - Upgrading: developer/developer/upgrading.md + - API versioning: developer/developer/api-versioning.md + - How to build wire-server: developer/developer/building.md + - Writing code interacting with cassandra: developer/developer/cassandra-interaction.md + - Changelog: developer/developer/changelog.md + - Coding conventions: developer/developer/coding-conventions.md + - Dependencies: developer/developer/dependencies.md + - Editor setup: developer/developer/editor-setup.md + - Features: developer/developer/features.md + - Federation API Conventions: developer/developer/federation-api-conventions.md + - Federation Design Aspects: developer/developer/federation-design-aspects.md + - Developer how-to’s: developer/developer/how-to.md + - Refactoring galley to support large conversations: developer/developer/large-conversations.md + - Linting: developer/developer/linting.md + - OpenTelemetry Instrumentation: developer/developer/open-telemetry.md + - PR Guidelines: developer/developer/pr-guidelines.md + - Internal processes: developer/developer/processes.md + - Storing SCIM-related data: developer/developer/scim/storage.md + - Servant: developer/developer/servant.md + - Testing the wire-server Haskell code base: developer/developer/testing.md + - Upgrading: developer/developer/upgrading.md - Reference: - - Config Options: developer/reference/config-options.md - - Creating and populating conversations: developer/reference/conversation.md - - Maintaining ElasticSearch: developer/reference/elastic-search.md - - ElasticSearch migration instructions for release 2021-02-16: developer/reference/elasticsearch-migration-2021-02-16.md - - Make docker and QEMU: developer/reference/make-docker-and-qemu.md - - OAuth: developer/reference/oauth.md - - SCIM tokens: developer/reference/provisioning/scim-token.md - - RabbitMQ Consumer: developer/reference/rabbitmq-consumer.md - - Spar braindump: developer/reference/spar-braindump.md - - Legal hold: developer/reference/team/legalhold.md - - User Activation: developer/reference/user/activation.md - - Connection: developer/reference/user/connection.md - - User Registration: developer/reference/user/registration.md - - User Rich info: developer/reference/user/rich-info.md - - Apps SDK: - - Understanding Apps: integrations/README.md - - Quickstart: integrations/quickstart.md - - Events: integrations/events.md + - Config Options: developer/reference/config-options.md + - Creating and populating conversations: developer/reference/conversation.md + - Maintaining ElasticSearch: developer/reference/elastic-search.md + - ElasticSearch migration instructions for release 2021-02-16: developer/reference/elasticsearch-migration-2021-02-16.md + - Make docker and QEMU: developer/reference/make-docker-and-qemu.md + - OAuth: developer/reference/oauth.md + - SCIM tokens: developer/reference/provisioning/scim-token.md + - RabbitMQ Consumer: developer/reference/rabbitmq-consumer.md + - Spar braindump: developer/reference/spar-braindump.md + - Legal hold: developer/reference/team/legalhold.md + - User Activation: developer/reference/user/activation.md + - Connection: developer/reference/user/connection.md + - User Registration: developer/reference/user/registration.md + - User Rich info: developer/reference/user/rich-info.md - Security Responses: - Overview: security-responses/README.md - "2023-01-19 - Security Advisory: HTML Injection in wire.com": security-responses/2023-01-19_html_injection.md @@ -207,7 +203,7 @@ markdown_extensions: extra: version: provider: mike - default: latest # Default version to load + default: latest # Default version to load social: - icon: fontawesome/brands/linkedin link: https://www.linkedin.com/company/wire-secure-communication diff --git a/wire-apps-jvm-sdk b/wire-apps-jvm-sdk deleted file mode 160000 index e0d4561..0000000 --- a/wire-apps-jvm-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e0d4561758ee4fae7c816f0b13c3c06a7f5c5fb4 From 0e8cacd5273b7f0f01f361dffef66ba769801031 Mon Sep 17 00:00:00 2001 From: Luca Rospocher Date: Mon, 13 Apr 2026 15:03:10 +0200 Subject: [PATCH 2/2] Delete SDK files --- Makefile | 1 - build/build_versions.sh | 2 -- build/linking-submodule/README.md | 4 ++-- build/prepare.sh | 2 +- src/README.md | 3 ++- src/integrations/README.md | 1 - src/integrations/events.md | 1 - src/integrations/images/quickstart_1.jpg | 1 - src/integrations/images/quickstart_2.jpg | 1 - src/integrations/images/quickstart_3.jpg | 1 - src/integrations/quickstart.md | 1 - 11 files changed, 5 insertions(+), 13 deletions(-) delete mode 120000 src/integrations/README.md delete mode 120000 src/integrations/events.md delete mode 120000 src/integrations/images/quickstart_1.jpg delete mode 120000 src/integrations/images/quickstart_2.jpg delete mode 120000 src/integrations/images/quickstart_3.jpg delete mode 120000 src/integrations/quickstart.md diff --git a/Makefile b/Makefile index 24dad47..8c00fd2 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,6 @@ run: check-port build current: prepare @BRANCH=$$(git branch --show-current) && cd $$(cat .tmpdir) && \ git submodule update --init --depth 1 wire-server && \ - git submodule update --init --depth 1 wire-apps-jvm-sdk && \ nix-shell build/default.nix --run "pipenv run mike deploy $$BRANCH && \ pipenv run mike set-default $$BRANCH && pipenv run mike serve -a 0.0.0.0:8000" diff --git a/build/build_versions.sh b/build/build_versions.sh index 5eb76c1..75682c8 100644 --- a/build/build_versions.sh +++ b/build/build_versions.sh @@ -71,7 +71,6 @@ git checkout ${CURRENT_TAG} # pull the submodule git submodule update --init --depth 1 wire-server -git submodule update --init --depth 1 wire-apps-jvm-sdk # Check if tag exists in mike if [ -n "${existing_tags[$CURRENT_TAG]}" ]; then @@ -92,7 +91,6 @@ else # deinit the submodule to avoid issues with the next iteration git submodule deinit -f wire-server -git submodule deinit -f wire-apps-jvm-sdk # Set the default tag and create an alias to $CURRENT_TAG $mike set-default $CURRENT_TAG diff --git a/build/linking-submodule/README.md b/build/linking-submodule/README.md index e5ada7e..6f111f6 100644 --- a/build/linking-submodule/README.md +++ b/build/linking-submodule/README.md @@ -3,7 +3,7 @@ - The '/docs' files will be included (as linked files) in the `wire-docs` repository via a submodule and will be pulled during the build process. - The submodule management documentation can be at [Submodule Management](../../README.md#submodule-management) -*Note: The further instructions will refer to `wire-server` as the example repository containing the documentation files, but the same applies to any other repository like `wire-apps-jvm-sdk`. Feel free to include these instructions in your own repository's documentation.* +*Note: The further instructions will refer to `wire-server` as the example repository containing the documentation files, but the same applies to any other repositories. Feel free to include these instructions in your own repository's documentation.* ## Example Diagram ![diagram](diagram.svg) @@ -21,7 +21,7 @@ **For content in wire-server/docs:** 1. Make changes directly in the `wire-server/docs` directory 2. Create a PR against the `wire-server:develop` branch. -*Note: The `develop` branch is specific to `wire-server`. Other repositories may have different branch names, such as `main` for `wire-apps-jvm-sdk`.* +*Note: The `develop` branch is specific to `wire-server`. Other repositories may have different branch names. 3. Once merged, these changes will be picked up by `wire-docs` through submodule updates. 4. In `wire-docs`: - Update the `wire-server` submodule (to the latest commit) and commit that change diff --git a/build/prepare.sh b/build/prepare.sh index b9966f4..70dbf2f 100644 --- a/build/prepare.sh +++ b/build/prepare.sh @@ -51,4 +51,4 @@ else fi echo "Syncing all the other files changes from ${ORIGINAL_DIR}/ to ${TEMP_DIR}, to work on uncommited changes, if any" -rsync -a --exclude='/.git' --exclude="/wire-server" --exclude="/wire-apps-jvm-sdk" --exclude='wire-docs*.tar.gz' --exclude=".tmpdir" "${ORIGINAL_DIR}/" "$TEMP_DIR/" +rsync -a --exclude='/.git' --exclude="/wire-server" --exclude='wire-docs*.tar.gz' --exclude=".tmpdir" "${ORIGINAL_DIR}/" "$TEMP_DIR/" diff --git a/src/README.md b/src/README.md index c669f29..830c427 100644 --- a/src/README.md +++ b/src/README.md @@ -17,6 +17,8 @@ If you are a developer, you may want to check out the “Notes for developers” Release notes of `wire-server` can be found [here](https://github.com/wireapp/wire-server/releases). +Instead, if you want to develop a Wire App using our SDKs, the documentation is [here](https://dev.wire.com).] + # Contents: * [Installation](how-to/install/README.md) @@ -24,7 +26,6 @@ Release notes of `wire-server` can be found [here](https://github.com/wireapp/wi * [Administration](how-to/administrate/README.md) * [Reference](understand/README.md) * [Developers Notes](developer/README.md) -* [Apps SDK](integrations/README.md) * [Security responses](security-responses/README.md) * [Release Notes](changelog/README.md) diff --git a/src/integrations/README.md b/src/integrations/README.md deleted file mode 120000 index 921a586..0000000 --- a/src/integrations/README.md +++ /dev/null @@ -1 +0,0 @@ -../../wire-apps-jvm-sdk/docs/src/README.md \ No newline at end of file diff --git a/src/integrations/events.md b/src/integrations/events.md deleted file mode 120000 index e52faf8..0000000 --- a/src/integrations/events.md +++ /dev/null @@ -1 +0,0 @@ -../../wire-apps-jvm-sdk/docs/src/events.md \ No newline at end of file diff --git a/src/integrations/images/quickstart_1.jpg b/src/integrations/images/quickstart_1.jpg deleted file mode 120000 index 577adcc..0000000 --- a/src/integrations/images/quickstart_1.jpg +++ /dev/null @@ -1 +0,0 @@ -../../../wire-apps-jvm-sdk/docs/src/images/quickstart_1.jpg \ No newline at end of file diff --git a/src/integrations/images/quickstart_2.jpg b/src/integrations/images/quickstart_2.jpg deleted file mode 120000 index 4f365f1..0000000 --- a/src/integrations/images/quickstart_2.jpg +++ /dev/null @@ -1 +0,0 @@ -../../../wire-apps-jvm-sdk/docs/src/images/quickstart_2.jpg \ No newline at end of file diff --git a/src/integrations/images/quickstart_3.jpg b/src/integrations/images/quickstart_3.jpg deleted file mode 120000 index 136e654..0000000 --- a/src/integrations/images/quickstart_3.jpg +++ /dev/null @@ -1 +0,0 @@ -../../../wire-apps-jvm-sdk/docs/src/images/quickstart_3.jpg \ No newline at end of file diff --git a/src/integrations/quickstart.md b/src/integrations/quickstart.md deleted file mode 120000 index b6fb008..0000000 --- a/src/integrations/quickstart.md +++ /dev/null @@ -1 +0,0 @@ -../../wire-apps-jvm-sdk/docs/src/quickstart.md \ No newline at end of file