diff --git a/CHANGELOG.md b/CHANGELOG.md index f535053a43..0b4ad42f47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.11.3] - 2026-02-10 + +### Fixed +- IngressClassName to helm chart +- Enhanced error message including filename of corrupt file +- Internal server error for cat command on empty repository +- Application of mercurial configration (thanks to harbison72) +- Proxy exclusions with glob patterns +- External logos in plugin overview + +### Changed +- Update IntelliJ IDEA configuration documentation + ## [3.11.2] - 2026-01-12 ### Fixed - Update of Tika to mitigate CVE-2025-54988 and CVE-2025-66516 @@ -1837,3 +1850,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [3.10.3]: https://scm-manager.org/download/3.10.3 [3.11.0]: https://scm-manager.org/download/3.11.0 [3.11.2]: https://scm-manager.org/download/3.11.2 +[3.12.0]: https://scm-manager.org/download/3.12.0 diff --git a/docs/en/release-process.md b/docs/en/release-process.md index 53b828c80f..e7470f6dc0 100644 --- a/docs/en/release-process.md +++ b/docs/en/release-process.md @@ -98,23 +98,31 @@ To release a hotfix version of SCM-Manager (or in other words a version, that is ### Create hotfix branch -To trigger the release, create a hotfix branch on the tag you want to create the hotfix for (lets say, -that's version `2.30.0`) and prepare the release like above: +To trigger the release, create a hotfix branch on the support branch for the release you want to create the hotfix for +(lets say, that's version `3.12.0` and therefore support branch `support/3.12.x`) and prepare the release like above: ```bash -git checkout 2.30.0 -git checkout -b hotfix/2.30.1 +export HOTFIX_VERSION=3.12.1 +git checkout support/3.12.x +git checkout -b hotfix/${HOTFIX_VERSION} ``` Then apply your fixes (eg. by cherry picking the relevant commits) and update the `CHANGELOG.md` (if you -have single changelog yaml files, you could use the `updateChangelog` like above). Add the `CHANGELOG.md`, +have single changelog yaml files, you could use the `updateChangelog` like above). + +```bash +./gradlew :updateChangelog +``` + +Verify, that the new version from the update step is correct and add the `CHANGELOG.md`, remove the yamls, and push the hotfix branch: ```bash -git rm -rf gradle/changelog -git add CHANGELOG.md -git commit -m "Adjust changelog for release 2.30.1" -git push origin hotfix/2.30.1 +git rm -rf gradle/changelog \ +&& git add CHANGELOG.md \ +&& git commit -m "Adjust changelog for release ${HOTFIX_VERSION}" \ +&& git push origin hotfix/${HOTFIX_VERSION} \ +&& xdg-open "https://ecosystem.cloudogu.com/jenkins/view/SCMM/job/SCM/job/scm-manager/job/scm-manager/job/hotfix%252F${HOTFIX_VERSION}/" ``` Jenkins will build and release the versions, create the new tag, but **will not** update the `main` or @@ -123,12 +131,12 @@ Jenkins will build and release the versions, create the new tag, but **will not* ### Update Branches Depending on whether you released a hotfix for an older version or the latest release, you have to update -the `main` branch to the new tag. So in our example, if there is no version `2.31.x` yet, the new version -`2.30.1` is the latest version and we have to update `main`: +the `main` branch to the new tag. So in our example, if there is no version `3.13.x` yet, the new version +`3.12.1` is the latest version and we have to update `main`: ```bash git checkout main -git merge 2.30.1 +git merge ${HOTFIX_VERSION} git push origin main ``` @@ -147,11 +155,12 @@ How these conflicts should be merged depends on the version that has been releas - If it has been a hotfix for an older version, you could keep the SNAPSHOT versions and simply discard the released version. - If the hotfix is the new main, you should take this new version and then manually create a new SNAPSHOT - based on the new hotfix version number using gradle: `./gradlew setVersionToNextSnapshot`. + based on the new hotfix version number using gradle: `./gradlew setVersionToNextSnapshot fix`. Commit these changes + with `git commit -am "Prepare for next development iteration"`. ## How to release SCM-Manager plugins -To release a new version of a Plugin for SCM-Manager you have to do the following steps (replace placeholder `` accordingly, eg. with `2.1.0`): +To release a new version of a Plugin for SCM-Manager you have to do the following steps: ### Check out default branch diff --git a/gradle.properties b/gradle.properties index fda45672dc..592fb0224f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ # group = sonia.scm -version = 3.11.3-SNAPSHOT +version = 3.11.4-SNAPSHOT org.gradle.jvmargs=-Xmx2g org.gradle.caching=true diff --git a/gradle/changelog/cat_command.yaml b/gradle/changelog/cat_command.yaml deleted file mode 100644 index bfb73f2260..0000000000 --- a/gradle/changelog/cat_command.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Internal server error for cat command on empty repository diff --git a/gradle/changelog/error.yaml b/gradle/changelog/error.yaml deleted file mode 100644 index bf58b8ca4e..0000000000 --- a/gradle/changelog/error.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Enhanced error message including filename of corrupt file diff --git a/gradle/changelog/helm_ingress_class.yaml b/gradle/changelog/helm_ingress_class.yaml deleted file mode 100644 index 7f6f9e4e54..0000000000 --- a/gradle/changelog/helm_ingress_class.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: added - description: IngressClassName to helm chart diff --git a/gradle/changelog/hg.yaml b/gradle/changelog/hg.yaml deleted file mode 100644 index 56b27554b1..0000000000 --- a/gradle/changelog/hg.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Application of mercurial configration (thanks to harbison72) diff --git a/gradle/changelog/logo.yaml b/gradle/changelog/logo.yaml deleted file mode 100644 index e213ec107d..0000000000 --- a/gradle/changelog/logo.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: External logos in plugin overview diff --git a/gradle/changelog/update_intellij_config.yaml b/gradle/changelog/update_intellij_config.yaml deleted file mode 100644 index cd919c53da..0000000000 --- a/gradle/changelog/update_intellij_config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: changed - description: Update IntelliJ IDEA configuration documentation diff --git a/scm-core/src/main/java/sonia/scm/net/HttpURLConnectionFactory.java b/scm-core/src/main/java/sonia/scm/net/HttpURLConnectionFactory.java index 4fd4fd5838..bc51d9a91f 100644 --- a/scm-core/src/main/java/sonia/scm/net/HttpURLConnectionFactory.java +++ b/scm-core/src/main/java/sonia/scm/net/HttpURLConnectionFactory.java @@ -124,15 +124,11 @@ public final class HttpURLConnectionFactory { private boolean isProxyEnabled(ProxyConfiguration proxyConfiguration, URL url) { return !options.isIgnoreProxySettings() && proxyConfiguration.isEnabled() - && !isHostExcluded(proxyConfiguration, url); + && isHostIncluded(proxyConfiguration, url); } - private boolean isHostExcluded(ProxyConfiguration proxyConfiguration, URL url) { - Collection excludes = proxyConfiguration.getExcludes(); - if (excludes == null) { - return false; - } - return excludes.contains(url.getHost()); + private boolean isHostIncluded(ProxyConfiguration proxyConfiguration, URL url) { + return Proxies.isEnabledForHost(proxyConfiguration.getExcludes(), url.getHost()); } private HttpURLConnection openProxyConnection(ProxyConfiguration configuration, URL url) throws IOException { diff --git a/scm-core/src/main/java/sonia/scm/net/Proxies.java b/scm-core/src/main/java/sonia/scm/net/Proxies.java index c6f4c5eb59..ab86794d35 100644 --- a/scm-core/src/main/java/sonia/scm/net/Proxies.java +++ b/scm-core/src/main/java/sonia/scm/net/Proxies.java @@ -24,6 +24,8 @@ import sonia.scm.config.ScmConfiguration; import sonia.scm.util.GlobUtil; import java.net.URL; +import java.util.Collection; +import java.util.Set; /** * Util class for proxy settings. @@ -48,54 +50,44 @@ public final class Proxies * * @return true if proxy settings should be used */ - public static boolean isEnabled(ScmConfiguration configuration, String url) - { - boolean result = false; - - if (configuration.isEnableProxy()) - { - result = true; - + public static boolean isEnabled(ScmConfiguration configuration, String url) { + if (configuration.isEnableProxy()) { int index = url.indexOf("://"); - if (index > 0) - { + if (index > 0) { url = url.substring(index + 3); } index = url.indexOf('/'); - if (index > 0) - { + if (index > 0) { url = url.substring(0, index); } index = url.indexOf(':'); - if (index > 0) - { + if (index > 0) { url = url.substring(0, index); } - for (String exclude : configuration.getProxyExcludes()) - { - if (GlobUtil.matches(exclude, url)) - { - logger.debug( - "disable proxy settings for url {}, because exclude {} matches", - url, exclude); - result = false; - - break; - } - } - } - else - { + Set proxyExcludes = configuration.getProxyExcludes(); + return isEnabledForHost(proxyExcludes, url); + } else { logger.trace("proxy settings are disabled"); } - return result; + return false; + } + + public static boolean isEnabledForHost(Collection proxyExcludes, String host) { + for (String exclude : proxyExcludes) { + if (GlobUtil.matches(exclude, host)) { + logger.debug( + "disable proxy settings for host {}, because exclude {} matches", host, exclude); + return false; + } + } + return true; } /** diff --git a/scm-core/src/test/java/sonia/scm/net/HttpURLConnectionFactoryTest.java b/scm-core/src/test/java/sonia/scm/net/HttpURLConnectionFactoryTest.java index 1c5db5b809..413faa1a4b 100644 --- a/scm-core/src/test/java/sonia/scm/net/HttpURLConnectionFactoryTest.java +++ b/scm-core/src/test/java/sonia/scm/net/HttpURLConnectionFactoryTest.java @@ -210,6 +210,18 @@ class HttpURLConnectionFactoryTest { assertThat(usedProxy).isNull(); } + @Test + void shouldNotCreateProxyConnectionIfHostIsOnTheExcludeListWithGlobPattern() throws IOException { + configuration.setEnableProxy(true); + configuration.setProxyServer("proxy.hitchhiker.com"); + configuration.setProxyPort(3128); + configuration.setProxyExcludes(ImmutableSet.of("localhost", "*.hitchhiker.org", "127.0.0.1")); + + connectionFactory.create(new URL("https://scm.hitchhiker.org")); + + assertThat(usedProxy).isNull(); + } + @Test void shouldNotCreateProxyConnectionWithIgnoreOption() throws IOException { configuration.setEnableProxy(true); diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 99d3247e52..ac44118905 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.11.3-SNAPSHOT" + "@scm-manager/ui-plugins": "3.11.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index c10f1041f5..cf8db0558a 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.11.3-SNAPSHOT" + "@scm-manager/ui-plugins": "3.11.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index adb8e14618..449fe0129b 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.11.3-SNAPSHOT" + "@scm-manager/ui-plugins": "3.11.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index cb30fdc447..ccb522818c 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.11.3-SNAPSHOT" + "@scm-manager/ui-plugins": "3.11.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/e2e-tests/package.json b/scm-ui/e2e-tests/package.json index 1ed1f50cfb..dfcc1f7f07 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "description": "End to end Tests for SCM-Manager", "main": "index.js", "author": "Eduard Heimbuch ", diff --git a/scm-ui/ui-api/package.json b/scm-ui/ui-api/package.json index 126b3e2f72..9cf3f9deff 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -26,7 +26,7 @@ "react-i18next": "11" }, "devDependencies": { - "@scm-manager/ui-types": "3.11.3-SNAPSHOT", + "@scm-manager/ui-types": "3.11.4-SNAPSHOT", "tsup": "^5.12.6", "@types/react-test-renderer": "^17.0.1", "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index cd5e7b6fba..602fc81866 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "private": false, "main": "index.ts", "license": "AGPL-3.0-only", @@ -13,7 +13,7 @@ "classnames": "^2.3.1" }, "dependencies": { - "@scm-manager/ui-core": "3.11.3-SNAPSHOT" + "@scm-manager/ui-core": "3.11.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/prettier-config": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index d280b807d7..a45b86f53d 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -32,8 +32,8 @@ "react-query": "^3.39.2" }, "devDependencies": { - "@scm-manager/ui-tests": "3.11.3-SNAPSHOT", - "@scm-manager/ui-types": "3.11.3-SNAPSHOT", + "@scm-manager/ui-tests": "3.11.4-SNAPSHOT", + "@scm-manager/ui-types": "3.11.4-SNAPSHOT", "@types/fetch-mock": "^7.3.1", "@types/react-select": "^2.0.19", "@types/unist": "^2.0.3", @@ -68,17 +68,17 @@ "@scm-manager/jest-preset": "^2.14.1", "@scm-manager/prettier-config": "^2.12.0", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-syntaxhighlighting": "3.11.3-SNAPSHOT", - "@scm-manager/ui-shortcuts": "3.11.3-SNAPSHOT", - "@scm-manager/ui-text": "3.11.3-SNAPSHOT" + "@scm-manager/ui-syntaxhighlighting": "3.11.4-SNAPSHOT", + "@scm-manager/ui-shortcuts": "3.11.4-SNAPSHOT", + "@scm-manager/ui-text": "3.11.4-SNAPSHOT" }, "dependencies": { - "@scm-manager/ui-core": "3.11.3-SNAPSHOT", - "@scm-manager/ui-overlays": "3.11.3-SNAPSHOT", - "@scm-manager/ui-layout": "3.11.3-SNAPSHOT", - "@scm-manager/ui-buttons": "3.11.3-SNAPSHOT", - "@scm-manager/ui-api": "3.11.3-SNAPSHOT", - "@scm-manager/ui-extensions": "3.11.3-SNAPSHOT", + "@scm-manager/ui-core": "3.11.4-SNAPSHOT", + "@scm-manager/ui-overlays": "3.11.4-SNAPSHOT", + "@scm-manager/ui-layout": "3.11.4-SNAPSHOT", + "@scm-manager/ui-buttons": "3.11.4-SNAPSHOT", + "@scm-manager/ui-api": "3.11.4-SNAPSHOT", + "@scm-manager/ui-extensions": "3.11.4-SNAPSHOT", "deepmerge": "^4.2.2", "hast-util-sanitize": "^3.0.2", "react-diff-view": "^2.4.10", diff --git a/scm-ui/ui-core/package.json b/scm-ui/ui-core/package.json index fa2503df81..ae87a5a55d 100644 --- a/scm-ui/ui-core/package.json +++ b/scm-ui/ui-core/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-core", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "main": "./src/index.ts", "license": "AGPL-3.0-only", "scripts": { @@ -20,7 +20,7 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-api": "3.11.3-SNAPSHOT", + "@scm-manager/ui-api": "3.11.4-SNAPSHOT", "@radix-ui/react-radio-group": "^1.1.3", "@radix-ui/react-slot": "^1.0.1", "@radix-ui/react-visually-hidden": "^1.0.3", @@ -37,7 +37,7 @@ "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/tsconfig": "^2.12.0", "@scm-manager/babel-preset": "^2.13.1", - "@scm-manager/ui-types": "3.11.3-SNAPSHOT", + "@scm-manager/ui-types": "3.11.4-SNAPSHOT", "@types/mousetrap": "1.6.5", "@testing-library/react-hooks": "8.0.1", "@testing-library/react": "12.1.5", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index a916a5432d..86d4455bb6 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "license": "AGPL-3.0-only", "private": false, "author": "Sebastian Sdorra ", @@ -21,8 +21,8 @@ "react": "^17.0.1" }, "devDependencies": { - "@scm-manager/ui-types": "3.11.3-SNAPSHOT", - "@scm-manager/ui-tests": "3.11.3-SNAPSHOT", + "@scm-manager/ui-types": "3.11.4-SNAPSHOT", + "@scm-manager/ui-tests": "3.11.4-SNAPSHOT", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.14.1", diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index ac55e393f3..d6cc442222 100644 --- a/scm-ui/ui-forms/package.json +++ b/scm-ui/ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-forms", "private": false, - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -21,7 +21,7 @@ "styled-components": "^5.3.5" }, "dependencies": { - "@scm-manager/ui-core": "3.11.3-SNAPSHOT" + "@scm-manager/ui-core": "3.11.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-layout/package.json b/scm-ui/ui-layout/package.json index 45cfe11009..de96c33a0f 100644 --- a/scm-ui/ui-layout/package.json +++ b/scm-ui/ui-layout/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-layout", "private": false, - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -14,7 +14,7 @@ "react": "^17.0.1" }, "dependencies": { - "@scm-manager/ui-core": "3.11.3-SNAPSHOT" + "@scm-manager/ui-core": "3.11.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index 3c1214af46..79286ccd9d 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -13,13 +13,13 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-api": "3.11.3-SNAPSHOT", - "@scm-manager/ui-extensions": "3.11.3-SNAPSHOT", + "@scm-manager/ui-api": "3.11.4-SNAPSHOT", + "@scm-manager/ui-extensions": "3.11.4-SNAPSHOT", "react-redux": "^5.0.7", "redux": "^4.0.0" }, "devDependencies": { - "@scm-manager/ui-types": "3.11.3-SNAPSHOT", + "@scm-manager/ui-types": "3.11.4-SNAPSHOT", "@types/react-redux": "5.0.7", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json index 949b90d6de..35c3e5b73d 100644 --- a/scm-ui/ui-overlays/package.json +++ b/scm-ui/ui-overlays/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-overlays", "private": false, - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -19,7 +19,7 @@ "classnames": "^2.3.1" }, "dependencies": { - "@scm-manager/ui-core": "3.11.3-SNAPSHOT" + "@scm-manager/ui-core": "3.11.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 210086d0fd..1b53bbba5f 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-plugins", "description": "Defines the versions of SCM-Manager plugin dependencies provided by the core webapp. Exclusively used by the postinstall command of @scm-manager/plugin-scripts.", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "license": "AGPL-3.0-only", "type": "module", "main": "./build/provided-modules.js", @@ -17,14 +17,14 @@ "react-router-dom": "^5.3.1", "react-i18next": "11", "styled-components": "^5.3.5", - "@scm-manager/ui-api": "3.11.3-SNAPSHOT", - "@scm-manager/ui-buttons": "3.11.3-SNAPSHOT", - "@scm-manager/ui-components": "3.11.3-SNAPSHOT", - "@scm-manager/ui-core": "3.11.3-SNAPSHOT", - "@scm-manager/ui-extensions": "3.11.3-SNAPSHOT", - "@scm-manager/ui-forms": "3.11.3-SNAPSHOT", - "@scm-manager/ui-layout": "3.11.3-SNAPSHOT", - "@scm-manager/ui-overlays": "3.11.3-SNAPSHOT", + "@scm-manager/ui-api": "3.11.4-SNAPSHOT", + "@scm-manager/ui-buttons": "3.11.4-SNAPSHOT", + "@scm-manager/ui-components": "3.11.4-SNAPSHOT", + "@scm-manager/ui-core": "3.11.4-SNAPSHOT", + "@scm-manager/ui-extensions": "3.11.4-SNAPSHOT", + "@scm-manager/ui-forms": "3.11.4-SNAPSHOT", + "@scm-manager/ui-layout": "3.11.4-SNAPSHOT", + "@scm-manager/ui-overlays": "3.11.4-SNAPSHOT", "classnames": "^2.3.1", "query-string": "6.14.1", "redux": "^4.0.0", @@ -43,8 +43,8 @@ "@scm-manager/plugin-scripts": "^1.6.1", "@scm-manager/prettier-config": "^2.12.0", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-tests": "3.11.3-SNAPSHOT", - "@scm-manager/ui-types": "3.11.3-SNAPSHOT", + "@scm-manager/ui-tests": "3.11.4-SNAPSHOT", + "@scm-manager/ui-types": "3.11.4-SNAPSHOT", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/i18next": "^13.0.0", diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json index e4feeba947..1388480f3d 100644 --- a/scm-ui/ui-shortcuts/package.json +++ b/scm-ui/ui-shortcuts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-shortcuts", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "license": "AGPL-3.0-only", "private": true, "main": "index.ts", @@ -18,7 +18,7 @@ "@scm-manager/tsconfig": "^2.13.0" }, "dependencies": { - "@scm-manager/ui-core": "3.11.3-SNAPSHOT" + "@scm-manager/ui-core": "3.11.4-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index e400614918..d41cfb0136 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "AGPL-3.0-only", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index b5ad52e4ca..09814ed473 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "3.11.3-SNAPSHOT", + "@scm-manager/ui-text": "3.11.4-SNAPSHOT", "nanoid": "^3.3.2", "refractor": "^4.5.0" }, diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 56b05b1c8e..5b92b9de6d 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "AGPL-3.0-only", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index fccda6f12d..db3ce780fa 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "private": true, "main": "index.ts", "scripts": { @@ -10,7 +10,7 @@ "react": "^17.0.1" }, "dependencies": { - "@scm-manager/ui-core": "3.11.3-SNAPSHOT" + "@scm-manager/ui-core": "3.11.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 4d7177fbea..19fdca0cf5 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "description": "Typescript types for SCM-Manager related Objects", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 4ecc01d184..6c60395c6c 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-webapp", - "version": "3.11.3-SNAPSHOT", + "version": "3.11.4-SNAPSHOT", "private": true, "scripts": { "test": "jest", @@ -11,16 +11,16 @@ }, "dependencies": { "@headlessui/react": "^1.7.17", - "@scm-manager/ui-components": "3.11.3-SNAPSHOT", - "@scm-manager/ui-api": "3.11.3-SNAPSHOT", - "@scm-manager/ui-extensions": "3.11.3-SNAPSHOT", - "@scm-manager/ui-shortcuts": "3.11.3-SNAPSHOT", - "@scm-manager/ui-legacy": "3.11.3-SNAPSHOT", - "@scm-manager/ui-forms": "3.11.3-SNAPSHOT", - "@scm-manager/ui-core": "3.11.3-SNAPSHOT", - "@scm-manager/ui-overlays": "3.11.3-SNAPSHOT", - "@scm-manager/ui-layout": "3.11.3-SNAPSHOT", - "@scm-manager/ui-buttons": "3.11.3-SNAPSHOT", + "@scm-manager/ui-components": "3.11.4-SNAPSHOT", + "@scm-manager/ui-api": "3.11.4-SNAPSHOT", + "@scm-manager/ui-extensions": "3.11.4-SNAPSHOT", + "@scm-manager/ui-shortcuts": "3.11.4-SNAPSHOT", + "@scm-manager/ui-legacy": "3.11.4-SNAPSHOT", + "@scm-manager/ui-forms": "3.11.4-SNAPSHOT", + "@scm-manager/ui-core": "3.11.4-SNAPSHOT", + "@scm-manager/ui-overlays": "3.11.4-SNAPSHOT", + "@scm-manager/ui-layout": "3.11.4-SNAPSHOT", + "@scm-manager/ui-buttons": "3.11.4-SNAPSHOT", "@radix-ui/react-portal": "^1.0.4", "@react-aria/overlays": "^3.23.1", "classnames": "^2.3.1", @@ -46,10 +46,10 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.14.1", - "@scm-manager/ui-tests": "3.11.3-SNAPSHOT", - "@scm-manager/ui-plugins": "3.11.3-SNAPSHOT", + "@scm-manager/ui-tests": "3.11.4-SNAPSHOT", + "@scm-manager/ui-plugins": "3.11.4-SNAPSHOT", "@scm-manager/prettier-config": "^2.12.0", - "@scm-manager/ui-types": "3.11.3-SNAPSHOT", + "@scm-manager/ui-types": "3.11.4-SNAPSHOT", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/react": "^17.0.1",