From 5eb68823830cb18300fb9a8654e7faa9e2949a2f Mon Sep 17 00:00:00 2001
From: Patrick Jungermann <Patrick.Jungermann@gmail.com>
Date: Mon, 5 Feb 2024 18:09:15 +0100
Subject: [PATCH] chore(scaffolder): split bitbucket module into
 bitbucket-cloud/-server modules

Relates-to: PR #22323
Signed-off-by: Patrick Jungermann <Patrick.Jungermann@gmail.com>
---
 .changeset/cold-cheetahs-pull.md              | 12 ++++
 .changeset/flat-roses-happen.md               | 17 ++++++
 .changeset/shiny-apes-glow.md                 | 12 ++++
 .../.eslintrc.js                              |  1 +
 .../README.md                                 | 11 ++++
 .../api-report.md                             | 44 +++++++++++++
 .../catalog-info.yaml                         | 10 +++
 .../package.json                              | 53 ++++++++++++++++
 .../src/actions/bitbucketCloud.test.ts        |  0
 .../src/actions/bitbucketCloud.ts             |  0
 ...itbucketCloudPipelinesRun.examples.test.ts |  0
 .../bitbucketCloudPipelinesRun.examples.ts    |  0
 .../bitbucketCloudPipelinesRun.test.ts        |  0
 .../src/actions/bitbucketCloudPipelinesRun.ts |  0
 .../src/actions/helpers.ts                    |  0
 .../src/actions/index.ts                      |  3 -
 .../src/actions/inputProperties.ts            |  0
 .../src/index.ts                              | 24 ++++++++
 .../src/module.ts                             | 50 +++++++++++++++
 .../.eslintrc.js                              |  1 +
 .../README.md                                 |  9 +++
 .../api-report.md                             | 51 ++++++++++++++++
 .../catalog-info.yaml                         | 10 +++
 .../package.json                              | 53 ++++++++++++++++
 .../src/actions/bitbucketServer.test.ts       |  0
 .../src/actions/bitbucketServer.ts            |  0
 .../bitbucketServerPullRequest.test.ts        |  0
 .../src/actions/bitbucketServerPullRequest.ts |  0
 .../src/actions/index.ts                      | 17 ++++++
 .../src/index.ts                              | 24 ++++++++
 .../src/module.ts                             | 53 ++++++++++++++++
 .../README.md                                 |  7 ++-
 .../api-report.md                             | 61 +++----------------
 .../package.json                              |  3 +
 .../src/actions/bitbucket.ts                  |  2 +-
 .../src/deprecated.ts                         | 43 +++++++++++++
 .../src/index.ts                              |  2 +-
 .../src/module.ts                             |  5 +-
 plugins/scaffolder-backend/api-report.md      |  8 ++-
 plugins/scaffolder-backend/package.json       |  2 +
 .../actions/builtin/createBuiltinActions.ts   | 10 ++-
 .../src/scaffolder/actions/deprecated.ts      | 16 ++---
 yarn.lock                                     | 42 +++++++++++++
 43 files changed, 583 insertions(+), 73 deletions(-)
 create mode 100644 .changeset/cold-cheetahs-pull.md
 create mode 100644 .changeset/flat-roses-happen.md
 create mode 100644 .changeset/shiny-apes-glow.md
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-cloud/.eslintrc.js
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-cloud/README.md
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-cloud/api-report.md
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-cloud/catalog-info.yaml
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-cloud/package.json
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-cloud}/src/actions/bitbucketCloud.test.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-cloud}/src/actions/bitbucketCloud.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-cloud}/src/actions/bitbucketCloudPipelinesRun.examples.test.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-cloud}/src/actions/bitbucketCloudPipelinesRun.examples.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-cloud}/src/actions/bitbucketCloudPipelinesRun.test.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-cloud}/src/actions/bitbucketCloudPipelinesRun.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-cloud}/src/actions/helpers.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-cloud}/src/actions/index.ts (86%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-cloud}/src/actions/inputProperties.ts (100%)
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-cloud/src/index.ts
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-cloud/src/module.ts
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-server/.eslintrc.js
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-server/README.md
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-server/api-report.md
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-server/catalog-info.yaml
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-server/package.json
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-server}/src/actions/bitbucketServer.test.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-server}/src/actions/bitbucketServer.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-server}/src/actions/bitbucketServerPullRequest.test.ts (100%)
 rename plugins/{scaffolder-backend-module-bitbucket => scaffolder-backend-module-bitbucket-server}/src/actions/bitbucketServerPullRequest.ts (100%)
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-server/src/actions/index.ts
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-server/src/index.ts
 create mode 100644 plugins/scaffolder-backend-module-bitbucket-server/src/module.ts
 create mode 100644 plugins/scaffolder-backend-module-bitbucket/src/deprecated.ts

diff --git a/.changeset/cold-cheetahs-pull.md b/.changeset/cold-cheetahs-pull.md
new file mode 100644
index 0000000000..140a564e4f
--- /dev/null
+++ b/.changeset/cold-cheetahs-pull.md
@@ -0,0 +1,12 @@
+---
+'@backstage/plugin-scaffolder-backend-module-bitbucket-server': minor
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+New scaffolder module `@backstage/plugin-scaffolder-backend-module-bitbucket-server`.
+
+Extracted from `@backstage/plugin-scaffolder-backend-module-bitbucket`
+and replaces its actions related to Bitbucket Server.
+
+- `publish:bitbucketServer`
+- `publish:bitbucketServer:pull-request`
diff --git a/.changeset/flat-roses-happen.md b/.changeset/flat-roses-happen.md
new file mode 100644
index 0000000000..e20e063b4f
--- /dev/null
+++ b/.changeset/flat-roses-happen.md
@@ -0,0 +1,17 @@
+---
+'@backstage/plugin-scaffolder-backend-module-bitbucket': minor
+---
+
+Split `@backstage/plugin-scaffolder-backend-module-bitbucket` into
+`@backstage/plugin-scaffolder-backend-module-bitbucket-cloud` and
+`@backstage/plugin-scaffolder-backend-module-bitbucket-server`.
+
+`@backstage/plugin-scaffolder-backend-module-bitbucket` was **deprecated** in favor of these two replacements.
+
+Please use any of the two replacements depending on your needs.
+
+```diff
+- backend.add(import('@backstage/plugin-scaffolder-backend-module-bitbucket'));
++ backend.add(import('@backstage/plugin-scaffolder-backend-module-bitbucket-cloud'));
++ backend.add(import('@backstage/plugin-scaffolder-backend-module-bitbucket-server'));
+```
diff --git a/.changeset/shiny-apes-glow.md b/.changeset/shiny-apes-glow.md
new file mode 100644
index 0000000000..5ff66157cd
--- /dev/null
+++ b/.changeset/shiny-apes-glow.md
@@ -0,0 +1,12 @@
+---
+'@backstage/plugin-scaffolder-backend-module-bitbucket-cloud': minor
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+New scaffolder module `@backstage/plugin-scaffolder-backend-module-bitbucket-cloud`.
+
+Extracted from `@backstage/plugin-scaffolder-backend-module-bitbucket`
+and replaces its actions related to Bitbucket Cloud.
+
+- `publish:bitbucketCloud`
+- `bitbucket:pipelines:run`
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/.eslintrc.js b/plugins/scaffolder-backend-module-bitbucket-cloud/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/README.md b/plugins/scaffolder-backend-module-bitbucket-cloud/README.md
new file mode 100644
index 0000000000..0d616f2670
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/README.md
@@ -0,0 +1,11 @@
+# @backstage/plugin-scaffolder-backend-module-bitbucket
+
+The [Bitbucket Cloud](https://bitbucket.org) module for
+[@backstage/plugin-scaffolder-backend](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend).
+
+_This plugin was created through the Backstage CLI_
+
+## Actions
+
+- `publish:bitbucketCloud`
+- `bitbucket:pipelines:run`
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/api-report.md b/plugins/scaffolder-backend-module-bitbucket-cloud/api-report.md
new file mode 100644
index 0000000000..fc7e0cd494
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/api-report.md
@@ -0,0 +1,44 @@
+## API Report File for "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { Config } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
+import { ScmIntegrationRegistry } from '@backstage/integration';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+
+// @public
+const bitbucketCloudModule: () => BackendFeature;
+export default bitbucketCloudModule;
+
+// @public
+export const createBitbucketPipelinesRunAction: (options: {
+  integrations: ScmIntegrationRegistry;
+}) => TemplateAction<
+  {
+    workspace: string;
+    repo_slug: string;
+    body?: object | undefined;
+    token?: string | undefined;
+  },
+  JsonObject
+>;
+
+// @public
+export function createPublishBitbucketCloudAction(options: {
+  integrations: ScmIntegrationRegistry;
+  config: Config;
+}): TemplateAction<
+  {
+    repoUrl: string;
+    description?: string | undefined;
+    defaultBranch?: string | undefined;
+    repoVisibility?: 'private' | 'public' | undefined;
+    sourcePath?: string | undefined;
+    token?: string | undefined;
+  },
+  JsonObject
+>;
+```
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/catalog-info.yaml b/plugins/scaffolder-backend-module-bitbucket-cloud/catalog-info.yaml
new file mode 100644
index 0000000000..68db17969a
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-bitbucket-cloud
+  title: '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud'
+  description: The Bitbucket Cloud module for @backstage/plugin-scaffolder-backend
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
new file mode 100644
index 0000000000..b456affc8b
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud",
+  "description": "The Bitbucket Cloud module for @backstage/plugin-scaffolder-backend",
+  "version": "0.0.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "backstage": {
+    "role": "backend-plugin-module"
+  },
+  "exports": {
+    ".": "./src/index.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
+  "scripts": {
+    "start": "backstage-cli package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack"
+  },
+  "dependencies": {
+    "@backstage/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/config": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/integration": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
+    "fs-extra": "10.1.0",
+    "node-fetch": "^2.6.7",
+    "yaml": "^2.0.0"
+  },
+  "devDependencies": {
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "msw": "^1.0.0"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloud.test.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.test.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloud.test.ts
rename to plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.test.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloud.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloud.ts
rename to plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloudPipelinesRun.examples.test.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.examples.test.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloudPipelinesRun.examples.test.ts
rename to plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.examples.test.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloudPipelinesRun.examples.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.examples.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloudPipelinesRun.examples.ts
rename to plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.examples.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloudPipelinesRun.test.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.test.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloudPipelinesRun.test.ts
rename to plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.test.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloudPipelinesRun.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketCloudPipelinesRun.ts
rename to plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/helpers.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/helpers.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/helpers.ts
rename to plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/helpers.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/index.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/index.ts
similarity index 86%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/index.ts
rename to plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/index.ts
index 9b009255fd..a9826a268a 100644
--- a/plugins/scaffolder-backend-module-bitbucket/src/actions/index.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/index.ts
@@ -13,8 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './bitbucket';
 export * from './bitbucketCloud';
-export * from './bitbucketServer';
-export * from './bitbucketServerPullRequest';
 export { createBitbucketPipelinesRunAction } from './bitbucketCloudPipelinesRun';
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/inputProperties.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/inputProperties.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/inputProperties.ts
rename to plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/inputProperties.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/index.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/index.ts
new file mode 100644
index 0000000000..ea27405f0f
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A module for the scaffolder backend that lets you interact with Bitbucket Cloud
+ *
+ * @packageDocumentation
+ */
+
+export * from './actions';
+export { bitbucketCloudModule as default } from './module';
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/module.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/module.ts
new file mode 100644
index 0000000000..81afbf8c88
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/module.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  coreServices,
+  createBackendModule,
+} from '@backstage/backend-plugin-api';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import {
+  createBitbucketPipelinesRunAction,
+  createPublishBitbucketCloudAction,
+} from './actions';
+import { ScmIntegrations } from '@backstage/integration';
+
+/**
+ * @public
+ * The Bitbucket Cloud Module for the Scaffolder Backend
+ */
+export const bitbucketCloudModule = createBackendModule({
+  moduleId: 'bitbucketCloud',
+  pluginId: 'scaffolder',
+  register({ registerInit }) {
+    registerInit({
+      deps: {
+        scaffolder: scaffolderActionsExtensionPoint,
+        config: coreServices.rootConfig,
+      },
+      async init({ scaffolder, config }) {
+        const integrations = ScmIntegrations.fromConfig(config);
+
+        scaffolder.addActions(
+          createPublishBitbucketCloudAction({ integrations, config }),
+          createBitbucketPipelinesRunAction({ integrations }),
+        );
+      },
+    });
+  },
+});
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/.eslintrc.js b/plugins/scaffolder-backend-module-bitbucket-server/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-server/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/README.md b/plugins/scaffolder-backend-module-bitbucket-server/README.md
new file mode 100644
index 0000000000..fda626c1b4
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-server/README.md
@@ -0,0 +1,9 @@
+# @backstage/plugin-scaffolder-backend-module-bitbucket-server
+
+The Bitbucket Server module for
+[@backstage/plugin-scaffolder-backend](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend).
+
+## Actions
+
+- `publish:bitbucketServer`
+- `publish:bitbucketServer:pull-request`
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/api-report.md b/plugins/scaffolder-backend-module-bitbucket-server/api-report.md
new file mode 100644
index 0000000000..3e2e3dffe4
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-server/api-report.md
@@ -0,0 +1,51 @@
+## API Report File for "@backstage/plugin-scaffolder-backend-module-bitbucket-server"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { Config } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
+import { ScmIntegrationRegistry } from '@backstage/integration';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+
+// @public
+const bitbucketServerModule: () => BackendFeature;
+export default bitbucketServerModule;
+
+// @public
+export function createPublishBitbucketServerAction(options: {
+  integrations: ScmIntegrationRegistry;
+  config: Config;
+}): TemplateAction<
+  {
+    repoUrl: string;
+    description?: string | undefined;
+    defaultBranch?: string | undefined;
+    repoVisibility?: 'private' | 'public' | undefined;
+    sourcePath?: string | undefined;
+    enableLFS?: boolean | undefined;
+    token?: string | undefined;
+    gitCommitMessage?: string | undefined;
+    gitAuthorName?: string | undefined;
+    gitAuthorEmail?: string | undefined;
+  },
+  JsonObject
+>;
+
+// @public
+export function createPublishBitbucketServerPullRequestAction(options: {
+  integrations: ScmIntegrationRegistry;
+  config: Config;
+}): TemplateAction<
+  {
+    repoUrl: string;
+    title: string;
+    description?: string | undefined;
+    targetBranch?: string | undefined;
+    sourceBranch: string;
+    token?: string | undefined;
+  },
+  JsonObject
+>;
+```
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/catalog-info.yaml b/plugins/scaffolder-backend-module-bitbucket-server/catalog-info.yaml
new file mode 100644
index 0000000000..02c894eca3
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-server/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-bitbucket-server
+  title: '@backstage/plugin-scaffolder-backend-module-bitbucket-server'
+  description: The Bitbucket Server module for @backstage/plugin-scaffolder-backend
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/package.json b/plugins/scaffolder-backend-module-bitbucket-server/package.json
new file mode 100644
index 0000000000..a4f2aa3abf
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-server/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-server",
+  "description": "The Bitbucket Server module for @backstage/plugin-scaffolder-backend",
+  "version": "0.0.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "backstage": {
+    "role": "backend-plugin-module"
+  },
+  "exports": {
+    ".": "./src/index.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
+  "scripts": {
+    "start": "backstage-cli package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack"
+  },
+  "dependencies": {
+    "@backstage/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/config": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/integration": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
+    "fs-extra": "10.1.0",
+    "node-fetch": "^2.6.7",
+    "yaml": "^2.0.0"
+  },
+  "devDependencies": {
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "msw": "^1.0.0"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketServer.test.ts b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.test.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketServer.test.ts
rename to plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.test.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketServer.ts b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketServer.ts
rename to plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketServerPullRequest.test.ts b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServerPullRequest.test.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketServerPullRequest.test.ts
rename to plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServerPullRequest.test.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketServerPullRequest.ts b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServerPullRequest.ts
similarity index 100%
rename from plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucketServerPullRequest.ts
rename to plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServerPullRequest.ts
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/src/actions/index.ts b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/index.ts
new file mode 100644
index 0000000000..f72f03a247
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './bitbucketServer';
+export * from './bitbucketServerPullRequest';
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/src/index.ts b/plugins/scaffolder-backend-module-bitbucket-server/src/index.ts
new file mode 100644
index 0000000000..be916b5711
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-server/src/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A module for the scaffolder backend that lets you interact with Bitbucket Server
+ *
+ * @packageDocumentation
+ */
+
+export * from './actions';
+export { bitbucketServerModule as default } from './module';
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/src/module.ts b/plugins/scaffolder-backend-module-bitbucket-server/src/module.ts
new file mode 100644
index 0000000000..d3d457cb1f
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket-server/src/module.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  coreServices,
+  createBackendModule,
+} from '@backstage/backend-plugin-api';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import {
+  createPublishBitbucketServerAction,
+  createPublishBitbucketServerPullRequestAction,
+} from './actions';
+import { ScmIntegrations } from '@backstage/integration';
+
+/**
+ * @public
+ * The Bitbucket Server Module for the Scaffolder Backend
+ */
+export const bitbucketServerModule = createBackendModule({
+  moduleId: 'bitbucketServer',
+  pluginId: 'scaffolder',
+  register({ registerInit }) {
+    registerInit({
+      deps: {
+        scaffolder: scaffolderActionsExtensionPoint,
+        config: coreServices.rootConfig,
+      },
+      async init({ scaffolder, config }) {
+        const integrations = ScmIntegrations.fromConfig(config);
+
+        scaffolder.addActions(
+          createPublishBitbucketServerAction({ integrations, config }),
+          createPublishBitbucketServerPullRequestAction({
+            integrations,
+            config,
+          }),
+        );
+      },
+    });
+  },
+});
diff --git a/plugins/scaffolder-backend-module-bitbucket/README.md b/plugins/scaffolder-backend-module-bitbucket/README.md
index 90b8680e80..dde4207c0a 100644
--- a/plugins/scaffolder-backend-module-bitbucket/README.md
+++ b/plugins/scaffolder-backend-module-bitbucket/README.md
@@ -1,5 +1,8 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket
 
-The bitbucket module for [@backstage/plugin-scaffolder-backend](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend).
+**Deprecated!**
 
-_This plugin was created through the Backstage CLI_
+Please use one of the following modules instead:
+
+- [@backstage/plugin-scaffolder-backend-module-bitbucket-cloud](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend-module-bitbucket-cloud)
+- [@backstage/plugin-scaffolder-backend-module-bitbucket-server](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend-module-bitbucket-server).
diff --git a/plugins/scaffolder-backend-module-bitbucket/api-report.md b/plugins/scaffolder-backend-module-bitbucket/api-report.md
index 7540b0c113..ce16b0038f 100644
--- a/plugins/scaffolder-backend-module-bitbucket/api-report.md
+++ b/plugins/scaffolder-backend-module-bitbucket/api-report.md
@@ -4,16 +4,18 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
+import * as bitbucketCloud from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
 import { Config } from '@backstage/config';
 import { JsonObject } from '@backstage/types';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 
-// @public
+// @public @deprecated
 const bitbucketModule: () => BackendFeature;
 export default bitbucketModule;
 
-// @public
+// @public @deprecated (undocumented)
 export const createBitbucketPipelinesRunAction: (options: {
   integrations: ScmIntegrationRegistry;
 }) => TemplateAction<
@@ -46,55 +48,12 @@ export function createPublishBitbucketAction(options: {
   JsonObject
 >;
 
-// @public
-export function createPublishBitbucketCloudAction(options: {
-  integrations: ScmIntegrationRegistry;
-  config: Config;
-}): TemplateAction<
-  {
-    repoUrl: string;
-    description?: string | undefined;
-    defaultBranch?: string | undefined;
-    repoVisibility?: 'private' | 'public' | undefined;
-    sourcePath?: string | undefined;
-    token?: string | undefined;
-  },
-  JsonObject
->;
+// @public @deprecated (undocumented)
+export const createPublishBitbucketCloudAction: typeof bitbucketCloud.createPublishBitbucketCloudAction;
 
-// @public
-export function createPublishBitbucketServerAction(options: {
-  integrations: ScmIntegrationRegistry;
-  config: Config;
-}): TemplateAction<
-  {
-    repoUrl: string;
-    description?: string | undefined;
-    defaultBranch?: string | undefined;
-    repoVisibility?: 'private' | 'public' | undefined;
-    sourcePath?: string | undefined;
-    enableLFS?: boolean | undefined;
-    token?: string | undefined;
-    gitCommitMessage?: string | undefined;
-    gitAuthorName?: string | undefined;
-    gitAuthorEmail?: string | undefined;
-  },
-  JsonObject
->;
+// @public @deprecated (undocumented)
+export const createPublishBitbucketServerAction: typeof bitbucketServer.createPublishBitbucketServerAction;
 
-// @public
-export function createPublishBitbucketServerPullRequestAction(options: {
-  integrations: ScmIntegrationRegistry;
-  config: Config;
-}): TemplateAction<
-  {
-    repoUrl: string;
-    title: string;
-    description?: string | undefined;
-    targetBranch?: string | undefined;
-    sourceBranch: string;
-    token?: string | undefined;
-  },
-  JsonObject
->;
+// @public @deprecated (undocumented)
+export const createPublishBitbucketServerPullRequestAction: typeof bitbucketServer.createPublishBitbucketServerPullRequestAction;
 ```
diff --git a/plugins/scaffolder-backend-module-bitbucket/package.json b/plugins/scaffolder-backend-module-bitbucket/package.json
index 411f282834..b08aadaab6 100644
--- a/plugins/scaffolder-backend-module-bitbucket/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket/package.json
@@ -2,6 +2,7 @@
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket",
   "description": "The bitbucket module for @backstage/plugin-scaffolder-backend",
   "version": "0.1.2-next.1",
+  "deprecated": true,
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -37,6 +38,8 @@
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "fs-extra": "10.1.0",
     "node-fetch": "^2.6.7",
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.ts b/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.ts
index 76fe1de5df..f1b45111b4 100644
--- a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.ts
+++ b/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.ts
@@ -202,7 +202,7 @@ const performEnableLFS = async (opts: {
  * Creates a new action that initializes a git repository of the content in the workspace
  * and publishes it to Bitbucket.
  * @public
- * @deprecated in favor of createPublishBitbucketCloudAction and createPublishBitbucketServerAction
+ * @deprecated in favor of "createPublishBitbucketCloudAction" by \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud and "createPublishBitbucketServerAction" by \@backstage/plugin-scaffolder-backend-module-bitbucket-server
  */
 export function createPublishBitbucketAction(options: {
   integrations: ScmIntegrationRegistry;
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/deprecated.ts b/plugins/scaffolder-backend-module-bitbucket/src/deprecated.ts
new file mode 100644
index 0000000000..a17c88c3a4
--- /dev/null
+++ b/plugins/scaffolder-backend-module-bitbucket/src/deprecated.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as bitbucketCloud from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
+
+export { createPublishBitbucketAction } from './actions/bitbucket';
+
+/**
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud instead
+ */
+export const createPublishBitbucketCloudAction =
+  bitbucketCloud.createPublishBitbucketCloudAction;
+
+/**
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud instead
+ */
+export const createBitbucketPipelinesRunAction =
+  bitbucketCloud.createBitbucketPipelinesRunAction;
+
+/**
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
+ */
+export const createPublishBitbucketServerAction =
+  bitbucketServer.createPublishBitbucketServerAction;
+
+/**
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
+ */
+export const createPublishBitbucketServerPullRequestAction =
+  bitbucketServer.createPublishBitbucketServerPullRequestAction;
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/index.ts b/plugins/scaffolder-backend-module-bitbucket/src/index.ts
index 26f186b6dc..7f68a3f395 100644
--- a/plugins/scaffolder-backend-module-bitbucket/src/index.ts
+++ b/plugins/scaffolder-backend-module-bitbucket/src/index.ts
@@ -20,5 +20,5 @@
  * @packageDocumentation
  */
 
-export * from './actions';
+export * from './deprecated';
 export { bitbucketModule as default } from './module';
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/module.ts b/plugins/scaffolder-backend-module-bitbucket/src/module.ts
index 19554270a7..db27d0b7b9 100644
--- a/plugins/scaffolder-backend-module-bitbucket/src/module.ts
+++ b/plugins/scaffolder-backend-module-bitbucket/src/module.ts
@@ -23,12 +23,13 @@ import {
   createPublishBitbucketCloudAction,
   createPublishBitbucketServerAction,
   createPublishBitbucketServerPullRequestAction,
-} from './actions';
+} from './deprecated';
 import { ScmIntegrations } from '@backstage/integration';
 
 /**
- * @public
  * The Bitbucket Module for the Scaffolder Backend
+ * @public
+ * @deprecated use module by \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud or \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
  */
 export const bitbucketModule = createBackendModule({
   moduleId: 'bitbucket',
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 074bc92bf5..467887dfc5 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -6,6 +6,8 @@
 import { ActionContext as ActionContext_2 } from '@backstage/plugin-scaffolder-node';
 import * as azure from '@backstage/plugin-scaffolder-backend-module-azure';
 import * as bitbucket from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+import * as bitbucketCloud from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { Duration } from 'luxon';
@@ -238,13 +240,13 @@ export const createPublishAzureAction: typeof azure.createPublishAzureAction;
 export const createPublishBitbucketAction: typeof bitbucket.createPublishBitbucketAction;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketCloudAction: typeof bitbucket.createPublishBitbucketCloudAction;
+export const createPublishBitbucketCloudAction: typeof bitbucketCloud.createPublishBitbucketCloudAction;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketServerAction: typeof bitbucket.createPublishBitbucketServerAction;
+export const createPublishBitbucketServerAction: typeof bitbucketServer.createPublishBitbucketServerAction;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketServerPullRequestAction: typeof bitbucket.createPublishBitbucketServerPullRequestAction;
+export const createPublishBitbucketServerPullRequestAction: typeof bitbucketServer.createPublishBitbucketServerPullRequestAction;
 
 // @public @deprecated (undocumented)
 export const createPublishGerritAction: typeof gerrit.createPublishGerritAction;
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 356c10bf47..00a80a1651 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -61,6 +61,8 @@
     "@backstage/plugin-permission-node": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-azure": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-bitbucket": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-gerrit": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-github": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-gitlab": "workspace:^",
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
index 02b96e9fa7..4a8bdec951 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
@@ -55,13 +55,17 @@ import {
 
 import { createPublishAzureAction } from '@backstage/plugin-scaffolder-backend-module-azure';
 
+import { createPublishBitbucketAction } from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+
 import {
-  createPublishBitbucketAction,
   createPublishBitbucketCloudAction,
+  createBitbucketPipelinesRunAction,
+} from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+
+import {
   createPublishBitbucketServerAction,
   createPublishBitbucketServerPullRequestAction,
-  createBitbucketPipelinesRunAction,
-} from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+} from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
 
 import {
   createPublishGerritAction,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/deprecated.ts b/plugins/scaffolder-backend/src/scaffolder/actions/deprecated.ts
index d5a13fbf6d..fd5fdd49e8 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/deprecated.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/deprecated.ts
@@ -17,6 +17,8 @@ import * as github from '@backstage/plugin-scaffolder-backend-module-github';
 import * as gitlab from '@backstage/plugin-scaffolder-backend-module-gitlab';
 import * as azure from '@backstage/plugin-scaffolder-backend-module-azure';
 import * as bitbucket from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+import * as bitbucketCloud from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
 import * as gerrit from '@backstage/plugin-scaffolder-backend-module-gerrit';
 
 /**
@@ -75,28 +77,28 @@ export const createPublishGithubPullRequestAction =
   github.createPublishGithubPullRequestAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket instead
+ * @public @deprecated use "createPublishBitbucketCloudAction" from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud or "createPublishBitbucketServerAction" from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
  */
 export const createPublishBitbucketAction =
   bitbucket.createPublishBitbucketAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket instead
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud instead
  */
 export const createPublishBitbucketCloudAction =
-  bitbucket.createPublishBitbucketCloudAction;
+  bitbucketCloud.createPublishBitbucketCloudAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket instead
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
  */
 export const createPublishBitbucketServerAction =
-  bitbucket.createPublishBitbucketServerAction;
+  bitbucketServer.createPublishBitbucketServerAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket instead
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
  */
 export const createPublishBitbucketServerPullRequestAction =
-  bitbucket.createPublishBitbucketServerPullRequestAction;
+  bitbucketServer.createPublishBitbucketServerPullRequestAction;
 
 /**
  * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-azure instead
diff --git a/yarn.lock b/yarn.lock
index 5f84cbbc51..c29877d6cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8285,6 +8285,44 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-scaffolder-backend-module-bitbucket-cloud@workspace:^, @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@workspace:plugins/scaffolder-backend-module-bitbucket-cloud":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud@workspace:plugins/scaffolder-backend-module-bitbucket-cloud"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    fs-extra: 10.1.0
+    msw: ^1.0.0
+    node-fetch: ^2.6.7
+    yaml: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
+"@backstage/plugin-scaffolder-backend-module-bitbucket-server@workspace:^, @backstage/plugin-scaffolder-backend-module-bitbucket-server@workspace:plugins/scaffolder-backend-module-bitbucket-server":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-backend-module-bitbucket-server@workspace:plugins/scaffolder-backend-module-bitbucket-server"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    fs-extra: 10.1.0
+    msw: ^1.0.0
+    node-fetch: ^2.6.7
+    yaml: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
 "@backstage/plugin-scaffolder-backend-module-bitbucket@workspace:^, @backstage/plugin-scaffolder-backend-module-bitbucket@workspace:plugins/scaffolder-backend-module-bitbucket":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-scaffolder-backend-module-bitbucket@workspace:plugins/scaffolder-backend-module-bitbucket"
@@ -8296,6 +8334,8 @@ __metadata:
     "@backstage/config": "workspace:^"
     "@backstage/errors": "workspace:^"
     "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "workspace:^"
     "@backstage/plugin-scaffolder-node": "workspace:^"
     fs-extra: 10.1.0
     msw: ^1.0.0
@@ -8485,6 +8525,8 @@ __metadata:
     "@backstage/plugin-permission-node": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-azure": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-bitbucket": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-gerrit": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-github": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-gitlab": "workspace:^"