Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-26 08:06:09 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
René Pfeuffer
2024-09-24 11:53:23 +02:00
parent e6433d01d1 6ed2f14d33
commit 35aec03814
27 changed files with 93 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -5,6 +5,11 @@ 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.4.2] - 2024-09-24
### Fixed
- Fix sorting error caused by some namespace/name constellations
- Show PDF files in Firefox
## [3.4.1] - 2024-08-29
### Fixed
- The environment variable for defining the log directory is now applied
@@ -1604,3 +1609,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[3.3.0]: https://scm-manager.org/download/3.3.0
[3.4.0]: https://scm-manager.org/download/3.4.0
[3.4.1]: https://scm-manager.org/download/3.4.1
[3.4.2]: https://scm-manager.org/download/3.4.2

2
gradle.properties
View File

@@ -15,6 +15,6 @@
#
group = sonia.scm
version = 3.4.2-SNAPSHOT
version = 3.4.3-SNAPSHOT
org.gradle.jvmargs=-Xmx1024M
org.gradle.caching=true

2
scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java
View File

@@ -170,7 +170,7 @@ public class XmlRepositoryDAO implements RepositoryDAO {
@Override
public Collection<Repository> getAll() {
return withReadLockedMaps(() -> ImmutableList.copyOf(byNamespaceAndName.values().stream().sorted(Comparator.comparing(v -> v.getNamespaceAndName().toString().toLowerCase())).collect(Collectors.toList())));
return withReadLockedMaps(() -> ImmutableList.copyOf(byNamespaceAndName.values()));
}
@Override

18
scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java
View File

@@ -352,6 +352,18 @@ class XmlRepositoryDAOTest {
verify(locationResolver).updateModificationDate();
}
@Test
void shouldGetAllWithCorrectSorting() {
dao.add(createRepository("banana1", "banana", "red"));
dao.add(createRepository("banana2", "banana.venezuela", "red"));
Collection<Repository> repositories = dao.getAll();
assertThat(repositories)
.hasSize(2)
.extracting("id").containsExactly("banana1", "banana2");
}
private String getXmlFileContent(String id) {
Path storePath = metadataFile(id);
@@ -476,7 +488,11 @@ class XmlRepositoryDAOTest {
Files.copy(metadataUrl.openStream(), repositoryPath.resolve("metadata.xml"));
}
private Repository createRepository(String id, String namespace, String name) {
return new Repository(id, "xml", namespace, name);
}
private Repository createRepository(String id) {
return new Repository(id, "xml", "space", id);
return createRepository(id, "space", id);
}
}

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

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-git-plugin",
"private": true,
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-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.4.2-SNAPSHOT"
"@scm-manager/ui-plugins": "3.4.3-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/babel-preset": "^2.13.1",

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

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-hg-plugin",
"private": true,
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-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.4.2-SNAPSHOT"
"@scm-manager/ui-plugins": "3.4.3-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": "3.4.2-SNAPSHOT",
"version": "3.4.3-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.4.2-SNAPSHOT"
"@scm-manager/ui-plugins": "3.4.3-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": "3.4.2-SNAPSHOT",
"version": "3.4.3-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.4.2-SNAPSHOT"
"@scm-manager/ui-plugins": "3.4.3-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": "3.4.2-SNAPSHOT",
"version": "3.4.3-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": "3.4.2-SNAPSHOT",
"version": "3.4.3-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": "3.4.2-SNAPSHOT",
"@scm-manager/ui-types": "3.4.3-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,10 +1,10 @@
{
"name": "@scm-manager/ui-buttons",
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"private": false,
"main": "index.ts",
"peerDependencies": {
"@scm-manager/ui-core": "3.4.2-SNAPSHOT"
"@scm-manager/ui-core": "3.4.3-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/prettier-config": "^2.11.1",

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

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-components",
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"description": "UI Components for SCM-Manager and its plugins",
"main": "src/index.ts",
"files": [
@@ -24,10 +24,10 @@
"@scm-manager/jest-preset": "^2.13.0",
"@scm-manager/prettier-config": "^2.10.1",
"@scm-manager/tsconfig": "^2.13.0",
"@scm-manager/ui-shortcuts": "3.4.2-SNAPSHOT",
"@scm-manager/ui-syntaxhighlighting": "3.4.2-SNAPSHOT",
"@scm-manager/ui-tests": "3.4.2-SNAPSHOT",
"@scm-manager/ui-text": "3.4.2-SNAPSHOT",
"@scm-manager/ui-shortcuts": "3.4.3-SNAPSHOT",
"@scm-manager/ui-syntaxhighlighting": "3.4.3-SNAPSHOT",
"@scm-manager/ui-tests": "3.4.3-SNAPSHOT",
"@scm-manager/ui-text": "3.4.3-SNAPSHOT",
"@storybook/addon-actions": "^6.4.20",
"@storybook/addon-essentials": "^6.4.20",
"@storybook/addon-interactions": "^6.4.20",
@@ -65,9 +65,9 @@
},
"dependencies": {
"@headlessui/react": "^1.4.3",
"@scm-manager/ui-api": "3.4.2-SNAPSHOT",
"@scm-manager/ui-extensions": "3.4.2-SNAPSHOT",
"@scm-manager/ui-types": "3.4.2-SNAPSHOT",
"@scm-manager/ui-api": "3.4.3-SNAPSHOT",
"@scm-manager/ui-extensions": "3.4.3-SNAPSHOT",
"@scm-manager/ui-types": "3.4.3-SNAPSHOT",
"classnames": "^2.2.6",
"date-fns": "^2.4.1",
"deepmerge": "^4.2.2",

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

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-core",
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"main": "./src/index.ts",
"license": "AGPL-3.0-only",
"scripts": {

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

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

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

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/ui-forms",
"private": false,
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"main": "index.ts",
"license": "AGPL-3.0-only",
"devDependencies": {
@@ -10,7 +10,7 @@
"@scm-manager/tsconfig": "^2.13.0"
},
"peerDependencies": {
"@scm-manager/ui-core": "3.4.2-SNAPSHOT"
"@scm-manager/ui-core": "3.4.3-SNAPSHOT"
},
"prettier": "@scm-manager/prettier-config",
"eslintConfig": {

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

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/ui-layout",
"private": false,
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"main": "index.ts",
"license": "AGPL-3.0-only",
"devDependencies": {
@@ -10,7 +10,7 @@
"@scm-manager/tsconfig": "^2.13.0"
},
"peerDependencies": {
"@scm-manager/ui-core": "3.4.2-SNAPSHOT"
"@scm-manager/ui-core": "3.4.3-SNAPSHOT"
},
"prettier": "@scm-manager/prettier-config",
"eslintConfig": {

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

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

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

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/ui-overlays",
"private": false,
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"main": "index.ts",
"license": "AGPL-3.0-only",
"devDependencies": {
@@ -10,7 +10,7 @@
"@scm-manager/tsconfig": "^2.13.0"
},
"peerDependencies": {
"@scm-manager/ui-core": "3.4.2-SNAPSHOT"
"@scm-manager/ui-core": "3.4.3-SNAPSHOT"
},
"prettier": "@scm-manager/prettier-config",
"eslintConfig": {

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

@@ -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.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"license": "AGPL-3.0-only",
"dependencies": {
"react": "17",
@@ -10,13 +10,13 @@
"react-router-dom": "^5.3.1",
"react-i18next": "11",
"styled-components": "^5.3.5",
"@scm-manager/ui-api": "3.4.2-SNAPSHOT",
"@scm-manager/ui-extensions": "3.4.2-SNAPSHOT",
"@scm-manager/ui-components": "3.4.2-SNAPSHOT",
"@scm-manager/ui-forms": "3.4.2-SNAPSHOT",
"@scm-manager/ui-buttons": "3.4.2-SNAPSHOT",
"@scm-manager/ui-overlays": "3.4.2-SNAPSHOT",
"@scm-manager/ui-layout": "3.4.2-SNAPSHOT",
"@scm-manager/ui-api": "3.4.3-SNAPSHOT",
"@scm-manager/ui-extensions": "3.4.3-SNAPSHOT",
"@scm-manager/ui-components": "3.4.3-SNAPSHOT",
"@scm-manager/ui-forms": "3.4.3-SNAPSHOT",
"@scm-manager/ui-buttons": "3.4.3-SNAPSHOT",
"@scm-manager/ui-overlays": "3.4.3-SNAPSHOT",
"@scm-manager/ui-layout": "3.4.3-SNAPSHOT",
"classnames": "^2.2.6",
"query-string": "6.14.1",
"redux": "^4.0.0",
@@ -31,8 +31,8 @@
"@scm-manager/plugin-scripts": "^1.6.1",
"@scm-manager/prettier-config": "^2.10.1",
"@scm-manager/tsconfig": "^2.13.0",
"@scm-manager/ui-tests": "3.4.2-SNAPSHOT",
"@scm-manager/ui-types": "3.4.2-SNAPSHOT",
"@scm-manager/ui-tests": "3.4.3-SNAPSHOT",
"@scm-manager/ui-types": "3.4.3-SNAPSHOT",
"@types/classnames": "^2.2.9",
"@types/enzyme": "^3.10.3",
"@types/fetch-mock": "^7.3.1",

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

@@ -1,11 +1,11 @@
{
"name": "@scm-manager/ui-shortcuts",
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"license": "AGPL-3.0-only",
"private": true,
"main": "index.ts",
"peerDependencies": {
"@scm-manager/ui-core": "3.4.2-SNAPSHOT"
"@scm-manager/ui-core": "3.4.3-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/eslint-config": "^2.16.0",

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

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-styles",
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"description": "Styles for SCM-Manager",
"main": "src/scm.scss",
"license": "AGPL-3.0-only",

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

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-syntaxhighlighting",
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"private": true,
"main": "src/index.ts",
"scripts": {
@@ -13,7 +13,7 @@
"depcheck": "depcheck"
},
"dependencies": {
"@scm-manager/ui-text": "3.4.2-SNAPSHOT",
"@scm-manager/ui-text": "3.4.3-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": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"description": "UI-Tests helpers",
"author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",
"license": "AGPL-3.0-only",

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

@@ -1,10 +1,10 @@
{
"name": "@scm-manager/ui-text",
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"private": true,
"main": "index.ts",
"peerDependencies": {
"@scm-manager/ui-core": "3.4.2-SNAPSHOT"
"@scm-manager/ui-core": "3.4.3-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/eslint-config": "^2.17.0",

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

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

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

@@ -1,21 +1,21 @@
{
"name": "@scm-manager/ui-webapp",
"version": "3.4.2-SNAPSHOT",
"version": "3.4.3-SNAPSHOT",
"private": true,
"dependencies": {
"@headlessui/react": "^1.7.15",
"@scm-manager/ui-components": "3.4.2-SNAPSHOT",
"@scm-manager/ui-api": "3.4.2-SNAPSHOT",
"@scm-manager/ui-extensions": "3.4.2-SNAPSHOT",
"@scm-manager/ui-syntaxhighlighting": "3.4.2-SNAPSHOT",
"@scm-manager/ui-text": "3.4.2-SNAPSHOT",
"@scm-manager/ui-shortcuts": "3.4.2-SNAPSHOT",
"@scm-manager/ui-legacy": "3.4.2-SNAPSHOT",
"@scm-manager/ui-forms": "3.4.2-SNAPSHOT",
"@scm-manager/ui-core": "3.4.2-SNAPSHOT",
"@scm-manager/ui-overlays": "3.4.2-SNAPSHOT",
"@scm-manager/ui-layout": "3.4.2-SNAPSHOT",
"@scm-manager/ui-buttons": "3.4.2-SNAPSHOT",
"@scm-manager/ui-components": "3.4.3-SNAPSHOT",
"@scm-manager/ui-api": "3.4.3-SNAPSHOT",
"@scm-manager/ui-extensions": "3.4.3-SNAPSHOT",
"@scm-manager/ui-syntaxhighlighting": "3.4.3-SNAPSHOT",
"@scm-manager/ui-text": "3.4.3-SNAPSHOT",
"@scm-manager/ui-shortcuts": "3.4.3-SNAPSHOT",
"@scm-manager/ui-legacy": "3.4.3-SNAPSHOT",
"@scm-manager/ui-forms": "3.4.3-SNAPSHOT",
"@scm-manager/ui-core": "3.4.3-SNAPSHOT",
"@scm-manager/ui-overlays": "3.4.3-SNAPSHOT",
"@scm-manager/ui-layout": "3.4.3-SNAPSHOT",
"@scm-manager/ui-buttons": "3.4.3-SNAPSHOT",
"@radix-ui/react-portal": "^1.0.4",
"@react-aria/overlays": "^3.23.1",
"classnames": "^2.2.5",
@@ -45,7 +45,7 @@
"devDependencies": {
"@scm-manager/eslint-config": "^2.17.0",
"@scm-manager/jest-preset": "^2.13.0",
"@scm-manager/ui-tests": "3.4.2-SNAPSHOT",
"@scm-manager/ui-tests": "3.4.3-SNAPSHOT",
"@testing-library/react": "^12.1.5",
"@types/classnames": "^2.2.9",
"@types/enzyme": "^3.10.3",

2
scm-webapp/src/main/java/sonia/scm/filter/SecurityHeadersFilter.java
View File

@@ -42,7 +42,7 @@ public class SecurityHeadersFilter extends HttpFilter {
@Override
protected void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
if (contextProvider.getStage() != Stage.TESTING) {
response.setHeader("X-Frame-Options", "deny");
response.setHeader("X-Frame-Options", "sameorigin");
response.setHeader("X-Content-Type-Options", "nosniff");
response.setHeader("Content-Security-Policy",
"form-action 'self'; " +