Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-06 07:46:55 +02:00
Code Issues Packages Projects Releases Activity

Merge hotfix release 2.39.1 into develop

Browse Source
This commit is contained in:
René Pfeuffer
2022-10-12 11:35:32 +02:00
parent 65f111b8b4 378c6d8ce5
commit 88c51f57e9
24 changed files with 65 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -5,6 +5,10 @@ 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).
## [2.39.1] - 2022-10-12
### Fixed
- Handling of old commits as new ones in new branches ([#2130](https://github.com/scm-manager/scm-manager/pull/2130))
## [2.39.0] - 2022-09-14
### Added
- Reindex mechanism for search ([#2104](https://github.com/scm-manager/scm-manager/pull/2104))
@@ -1148,3 +1152,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[2.38.0]: https://scm-manager.org/download/2.38.0
[2.38.1]: https://scm-manager.org/download/2.38.1
[2.39.0]: https://scm-manager.org/download/2.39.0
[2.39.1]: https://scm-manager.org/download/2.39.1

2
gradle.properties
View File

@@ -22,5 +22,5 @@
# SOFTWARE.
#
group = sonia.scm
version = 2.39.1-SNAPSHOT
version = 2.39.2-SNAPSHOT
org.gradle.jvmargs=-Xmx1024M

2
gradle/changelog/fix_empty_branches.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: fixed
description: Handling of old commits as new ones in new branches ([#2130](https://github.com/scm-manager/scm-manager/pull/2130))

4
scm-plugins/scm-git-plugin/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-git-plugin",
"private": true,
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"license": "MIT",
"main": "./src/main/js/index.ts",
"scripts": {
@@ -11,7 +11,7 @@
"typecheck": "tsc"
},
"dependencies": {
"@scm-manager/ui-plugins": "2.39.1-SNAPSHOT"
"@scm-manager/ui-plugins": "2.39.2-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/babel-preset": "^2.13.1",

25
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/CollectingPackParserListener.java
View File

@@ -123,21 +123,13 @@ public class CollectingPackParserListener implements PackParserListener
if (newObjectIdMap != null)
{
newObjectIds = ImmutableSet.copyOf(newObjectIdMap);
}
else
{
logger.warn("pack parser returned no newObjectIds");
newObjectIds = ImmutableSet.of();
}
if (newObjectIds.isEmpty())
{
logger.debug("new object ids are empty, we treat every commit as new");
}
else
{
logger.debug("collected {} new object ids", newObjectIds.size());
}
else
{
logger.warn("pack parser returned no newObjectIds; no commit will be treated as a new one");
newObjectIds = Set.of();
}
}
/**
@@ -161,10 +153,7 @@ public class CollectingPackParserListener implements PackParserListener
//~--- get methods ----------------------------------------------------------
/**
* Returns {@code true} if the object is a new object. The method will also
* return {@code true}, if the pack parser does not return a list with new
* object ids.
*
* Returns {@code true} if the object is a new object.
*
* @param object rev object
*
@@ -174,7 +163,7 @@ public class CollectingPackParserListener implements PackParserListener
{
ensureAfterWasCalled();
return newObjectIds.isEmpty() || newObjectIds.contains(object.getId());
return newObjectIds.contains(object.getId());
}
//~--- methods --------------------------------------------------------------

4
scm-plugins/scm-hg-plugin/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-hg-plugin",
"private": true,
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"license": "MIT",
"main": "./src/main/js/index.ts",
"scripts": {
@@ -10,7 +10,7 @@
"typecheck": "tsc"
},
"dependencies": {
"@scm-manager/ui-plugins": "2.39.1-SNAPSHOT"
"@scm-manager/ui-plugins": "2.39.2-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/babel-preset": "^2.13.1",

4
scm-plugins/scm-legacy-plugin/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-legacy-plugin",
"private": true,
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"license": "MIT",
"main": "./src/main/js/index.tsx",
"scripts": {
@@ -10,7 +10,7 @@
"typecheck": "tsc"
},
"dependencies": {
"@scm-manager/ui-plugins": "2.39.1-SNAPSHOT"
"@scm-manager/ui-plugins": "2.39.2-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/babel-preset": "^2.13.1",

4
scm-plugins/scm-svn-plugin/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-svn-plugin",
"private": true,
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"license": "MIT",
"main": "./src/main/js/index.ts",
"scripts": {
@@ -10,7 +10,7 @@
"typecheck": "tsc"
},
"dependencies": {
"@scm-manager/ui-plugins": "2.39.1-SNAPSHOT"
"@scm-manager/ui-plugins": "2.39.2-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/babel-preset": "^2.13.1",

2
scm-ui/e2e-tests/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/e2e-tests",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"description": "End to end Tests for SCM-Manager",
"main": "index.js",
"author": "Eduard Heimbuch <eduard.heimbuch@cloudogu.com>",

4
scm-ui/ui-api/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-api",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"description": "React hook api for the SCM-Manager backend",
"main": "build/index.js",
"module": "build/index.mjs",
@@ -29,7 +29,7 @@
"tsup": "^5.12.6"
},
"dependencies": {
"@scm-manager/ui-types": "2.39.1-SNAPSHOT",
"@scm-manager/ui-types": "2.39.2-SNAPSHOT",
"fetch-mock-jest": "^1.5.1",
"gitdiff-parser": "^0.2.2",
"query-string": "6.14.1",

4
scm-ui/ui-buttons/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-buttons",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"private": true,
"main": "build/index.js",
"module": "build/index.mjs",
@@ -27,7 +27,7 @@
},
"devDependencies": {
"@scm-manager/prettier-config": "^2.11.1",
"@scm-manager/ui-api": "2.39.1-SNAPSHOT",
"@scm-manager/ui-api": "2.39.2-SNAPSHOT",
"@scm-manager/eslint-config": "^2.16.0",
"@babel/core": "^7.17.8",
"@scm-manager/tsconfig": "^2.12.0",

14
scm-ui/ui-components/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-components",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"description": "UI Components for SCM-Manager and its plugins",
"main": "src/index.ts",
"files": [
@@ -20,14 +20,14 @@
"update-storyshots": "jest --testPathPattern=\"storyshots.test.ts\" --collectCoverage=false -u"
},
"devDependencies": {
"@scm-manager/ui-syntaxhighlighting": "2.39.1-SNAPSHOT",
"@scm-manager/ui-text": "2.39.1-SNAPSHOT",
"@scm-manager/ui-syntaxhighlighting": "2.39.2-SNAPSHOT",
"@scm-manager/ui-text": "2.39.2-SNAPSHOT",
"@scm-manager/babel-preset": "^2.13.1",
"@scm-manager/eslint-config": "^2.16.0",
"@scm-manager/jest-preset": "^2.13.0",
"@scm-manager/prettier-config": "^2.10.1",
"@scm-manager/tsconfig": "^2.13.0",
"@scm-manager/ui-tests": "2.39.1-SNAPSHOT",
"@scm-manager/ui-tests": "2.39.2-SNAPSHOT",
"@storybook/addon-actions": "^6.4.20",
"@storybook/addon-essentials": "^6.4.20",
"@storybook/addon-interactions": "^6.4.20",
@@ -66,9 +66,9 @@
},
"dependencies": {
"@headlessui/react": "^1.4.3",
"@scm-manager/ui-api": "2.39.1-SNAPSHOT",
"@scm-manager/ui-extensions": "2.39.1-SNAPSHOT",
"@scm-manager/ui-types": "2.39.1-SNAPSHOT",
"@scm-manager/ui-api": "2.39.2-SNAPSHOT",
"@scm-manager/ui-extensions": "2.39.2-SNAPSHOT",
"@scm-manager/ui-types": "2.39.2-SNAPSHOT",
"classnames": "^2.2.6",
"date-fns": "^2.4.1",
"deepmerge": "^4.2.2",

4
scm-ui/ui-extensions/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-extensions",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"license": "MIT",
"private": false,
"author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",
@@ -17,7 +17,7 @@
"test": "jest"
},
"dependencies": {
"@scm-manager/ui-types": "2.39.1-SNAPSHOT",
"@scm-manager/ui-types": "2.39.2-SNAPSHOT",
"react": "^17.0.1"
},
"devDependencies": {

8
scm-ui/ui-legacy/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-legacy",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"private": true,
"main": "build/index.js",
"module": "build/index.mjs",
@@ -12,9 +12,9 @@
"test": "jest --passWithNoTests"
},
"dependencies": {
"@scm-manager/ui-api": "2.39.1-SNAPSHOT",
"@scm-manager/ui-extensions": "2.39.1-SNAPSHOT",
"@scm-manager/ui-types": "2.39.1-SNAPSHOT",
"@scm-manager/ui-api": "2.39.2-SNAPSHOT",
"@scm-manager/ui-extensions": "2.39.2-SNAPSHOT",
"@scm-manager/ui-types": "2.39.2-SNAPSHOT",
"react": "^17.0.1",
"react-redux": "^5.0.7",
"redux": "^4.0.0"

2
scm-ui/ui-modules/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-modules",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"private": true,
"main": "build/index.js",
"module": "build/index.mjs",

12
scm-ui/ui-plugins/package.json
View File

@@ -1,13 +1,13 @@
{
"name": "@scm-manager/ui-plugins",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"license": "MIT",
"bin": {
"ui-plugins": "./bin/ui-plugins.js"
},
"dependencies": {
"@scm-manager/ui-components": "2.39.1-SNAPSHOT",
"@scm-manager/ui-extensions": "2.39.1-SNAPSHOT",
"@scm-manager/ui-components": "2.39.2-SNAPSHOT",
"@scm-manager/ui-extensions": "2.39.2-SNAPSHOT",
"classnames": "^2.2.6",
"query-string": "6.14.1",
"react": "^17.0.1",
@@ -26,9 +26,9 @@
"@scm-manager/plugin-scripts": "^1.2.2",
"@scm-manager/prettier-config": "^2.10.1",
"@scm-manager/tsconfig": "^2.13.0",
"@scm-manager/ui-scripts": "2.39.1-SNAPSHOT",
"@scm-manager/ui-tests": "2.39.1-SNAPSHOT",
"@scm-manager/ui-types": "2.39.1-SNAPSHOT",
"@scm-manager/ui-scripts": "2.39.2-SNAPSHOT",
"@scm-manager/ui-tests": "2.39.2-SNAPSHOT",
"@scm-manager/ui-types": "2.39.2-SNAPSHOT",
"@types/classnames": "^2.2.9",
"@types/enzyme": "^3.10.3",
"@types/fetch-mock": "^7.3.1",

2
scm-ui/ui-polyfill/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-polyfill",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"description": "Polyfills for SCM-Manager UI",
"main": "src/index.js",
"author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",

2
scm-ui/ui-scripts/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-scripts",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"description": "Build scripts for SCM-Manager",
"main": "src/index.js",
"author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",

2
scm-ui/ui-styles/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-styles",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"description": "Styles for SCM-Manager",
"main": "src/scm.scss",
"license": "MIT",

4
scm-ui/ui-syntaxhighlighting/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-syntaxhighlighting",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"private": true,
"main": "src/index.ts",
"scripts": {
@@ -13,7 +13,7 @@
"depcheck": "depcheck"
},
"dependencies": {
"@scm-manager/ui-text": "2.39.1-SNAPSHOT",
"@scm-manager/ui-text": "2.39.2-SNAPSHOT",
"nanoid": "^3.3.2",
"react-diff-view": "^2.4.10",
"refractor": "^4.5.0"

2
scm-ui/ui-tests/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-tests",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"description": "UI-Tests helpers",
"author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",
"license": "MIT",

2
scm-ui/ui-text/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-text",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"private": true,
"main": "build/index.js",
"module": "build/index.mjs",

2
scm-ui/ui-types/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-types",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"description": "Typescript types for SCM-Manager related Objects",
"main": "src/index.ts",
"files": [

18
scm-ui/ui-webapp/package.json
View File

@@ -1,16 +1,16 @@
{
"name": "@scm-manager/ui-webapp",
"version": "2.39.1-SNAPSHOT",
"version": "2.39.2-SNAPSHOT",
"private": true,
"dependencies": {
"@headlessui/react": "^1.4.3",
"@scm-manager/ui-api": "2.39.1-SNAPSHOT",
"@scm-manager/ui-components": "2.39.1-SNAPSHOT",
"@scm-manager/ui-extensions": "2.39.1-SNAPSHOT",
"@scm-manager/ui-modules": "2.39.1-SNAPSHOT",
"@scm-manager/ui-syntaxhighlighting": "2.39.1-SNAPSHOT",
"@scm-manager/ui-text": "2.39.1-SNAPSHOT",
"@scm-manager/ui-legacy": "2.39.1-SNAPSHOT",
"@scm-manager/ui-api": "2.39.2-SNAPSHOT",
"@scm-manager/ui-components": "2.39.2-SNAPSHOT",
"@scm-manager/ui-extensions": "2.39.2-SNAPSHOT",
"@scm-manager/ui-modules": "2.39.2-SNAPSHOT",
"@scm-manager/ui-syntaxhighlighting": "2.39.2-SNAPSHOT",
"@scm-manager/ui-text": "2.39.2-SNAPSHOT",
"@scm-manager/ui-legacy": "2.39.2-SNAPSHOT",
"classnames": "^2.2.5",
"history": "^4.10.1",
"i18next": "^19.6.0",
@@ -39,7 +39,7 @@
"devDependencies": {
"@scm-manager/eslint-config": "^2.16.0",
"@scm-manager/jest-preset": "^2.13.0",
"@scm-manager/ui-tests": "2.39.1-SNAPSHOT",
"@scm-manager/ui-tests": "2.39.2-SNAPSHOT",
"@testing-library/react": "^12.1.5",
"@types/classnames": "^2.2.9",
"@types/enzyme": "^3.10.3",