Commit Graph

2229 Commits

Author SHA1 Message Date
Rene Pfeuffer
68110ee6b3 Retry failing integration tests
This uses 'RetryingTest' from junit jupiter to retry integration tests that are known to fail from time to time. We explicitly mark single tests in contrast to set a global retry to be able to trace those, whenever this is intended.

To do so, we have to update to the latest version of JUnit. Unfortunately, this brought a new behaviour for the @TempDir annotation: In contrast to the former behaviour where for one test all annotated parameters got the same directory, in the new version the parameters get different directories assigned. This led to the need of some consolidation between @BeforeEach methods and the related tests.

Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
2023-03-22 06:24:33 +01:00
René Pfeuffer
1122f781a1 Prepare for next development iteration 2023-03-13 08:32:29 +01:00
René Pfeuffer
34410ce6c9 Merge branch 'main' into develop 2023-03-13 08:29:36 +01:00
CES Marvin
143431cfe0 Release version 2.42.3 2023-03-13 06:13:04 +00:00
Eduard Heimbuch
2f0b46f615 Remove dependency locks 2023-03-10 13:48:55 +01:00
Rene Pfeuffer
f3027ba9f8 Update resteasy to 4.5.9.Final
Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
2023-03-10 08:29:34 +01:00
Eduard Heimbuch
56265be9a2 Add initial audit log API
Introduce audit log API which logs all creations,
modifications and deletions of annotated entities
and everything which is stored inside a
ConfigurationStore. Without the related Audit
Log Plugin installed this API does nothing.
2023-03-09 11:25:33 +01:00
CES Marvin
da2c723056 Prepare for next development iteration 2023-03-02 15:42:11 +00:00
CES Marvin
9f712aec5d Release version 2.42.2 2023-03-02 14:52:49 +00:00
Rene Pfeuffer
cb8c951cb8 Set the HEAD in Git pull command
Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
2023-02-23 12:38:26 +01:00
Eduard Heimbuch
f28eaeca15 Fix repository resolution for ssh urls with context path
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
2023-02-23 10:57:43 +01:00
Rene Pfeuffer
0361ae3c6c Sets the default branch for a new git repository from an import to the HEAD reference of the imported repository.
Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
2023-02-23 10:10:33 +01:00
CES Marvin
1842a49c77 Prepare for next development iteration 2023-02-16 20:24:50 +00:00
CES Marvin
16572110de Release version 2.42.1 2023-02-16 20:07:00 +00:00
René Pfeuffer
b4e0404309 Merge branch 'main' into develop 2023-02-16 18:51:20 +01:00
René Pfeuffer
29a26791eb Merge tag '2.41.1'
Release version 2.41.1
2023-02-16 18:50:31 +01:00
CES Marvin
e23cb64a68 Release version 2.41.1 2023-02-16 17:41:51 +00:00
Rene Pfeuffer
90dcb713b3 Remove unconditional force push
This removes the unconditional force mode used while pushing changes made by the modify or the merge command in git repositories. The force mode led to the "deletion" of other changes on the same branch made between the creation of the working copy and the push to the core repository inside SCM-Manager.

Committed-by: Konstantin Schaper <konstantin.schaper@cloudogu.com>
2023-02-16 16:12:55 +01:00
Rene Pfeuffer
9f3519ecce Remove sshd dependency
The sshd dependency in version 2.8.0 that came with SvnKIT
1.10.10 may cause an injection failure in bouncy castle
due to incompatible sshd versions on server startup when
the ssh plugin is installed (the ssh plugin uses version
2.9.0 of apache sshd).

Committed-by: Konstantin Schaper <konstantin.schaper@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
2023-02-16 14:02:56 +01:00
CES Marvin
b595808386 Prepare for next development iteration 2023-02-15 09:33:00 +00:00
CES Marvin
57206a9d63 Release version 2.42.0 2023-02-15 08:46:54 +00:00
Rene Pfeuffer
962df5309c Update SVNKit to 1.10.10-scm1
Fix lockfiles and update slf4j



Committed-by: Matthias Thieroff <matthias.thieroff@cloudogu.com>
Co-authored-by: Florian Scholdei <florian.scholdei@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
2023-02-15 08:44:30 +01:00
Eduard Heimbuch
dc60c924ed Add copy button to codeblocks 2023-01-25 15:55:00 +01:00
Laura Gorzitze
89bcd7c099 Prepare for next development iteration 2023-01-18 15:55:59 +01:00
Laura Gorzitze
dcabdfc25a Release version 2.41.0 2023-01-18 15:26:43 +01:00
Eduard Heimbuch
ac419daa3f Add ConfigurationAdapterBase and extension points for trash bin
Adds the new abstract class ConfigurationAdapterBase to simplify the creation of global configuration views. In addition there is some cleanup, interfaces and extension points for the repository trash bin plugin.

Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
Co-authored-by: Konstantin Schaper <konstantin.schaper@cloudogu.com>
2023-01-13 13:08:51 +01:00
Rene Pfeuffer
f2f2f29791 Render images from repository correctly
This adds a markdown renderer for images, so that images
that are referenced by their repository path are resolved
correctly. In this case, the content rest endpoint is
rendered as source url. For this, two new contexts
(RepositoryContext and RepositoryRevisionContext)
have been added, that make the repository and the
current revision available, so that the content url can
be resolved properly. These new contexts may be used
by plugins like the scm-readme-plugin.

Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>

Reviewed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
2022-12-19 10:12:01 +01:00
René Pfeuffer
a5349da034 Update shiro to v1.10.0 2022-12-07 11:05:17 +01:00
CES Marvin
4db07d15f6 Prepare for next development iteration 2022-12-07 09:59:31 +00:00
CES Marvin
d1c3fd7ae9 Release version 2.40.1 2022-12-07 09:25:24 +00:00
CES Marvin
e454647975 Prepare for next development iteration 2022-11-22 16:14:42 +00:00
CES Marvin
55f75a3948 Release version 2.40.0 2022-11-22 15:17:02 +00:00
Konstantin Schaper
19938b3af8 Add accessibility settings where you can disable keyboard shortcuts (#2157)
An accessibility requirement dictates that our custom shortcut system must be allowed to be disabled. A new accessibility settings page has been added to the user profile, similar to the theme settings. It is persisted in local storage.

Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
2022-11-16 16:50:17 +01:00
René Pfeuffer
54081ccdc6 Git import with lfs support (#2133)
This adds the possibility to load files managed by lfs to the repository import of git repositories.

Co-authored-by: Konstantin Schaper <konstantin.schaper@cloudogu.com>
2022-10-25 09:14:40 +02:00
Konstantin Schaper
96ce4cb8e6 Git diff request correctly throws NotFoundException if target revision is non-existent (#2141)
Sometimes it happens that a git diff command request is performed with a non-existent target branch. This is usually fine but the underlying system might have already garbage-collected the revisions associated with that branch. In this case, the revision for that deleted branch might turn up null which currently causes a 500 error. We catch this specific corner-case and throw the correct NotFoundException instead.
2022-10-24 19:49:28 +02:00
Eduard Heimbuch
976f71b33c Add logging for git browse command (#2140)
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
2022-10-20 11:38:32 +02:00
René Pfeuffer
984b0baee8 Update smp plugin 2022-10-18 16:47:29 +02:00
René Pfeuffer
9d3a205dd7 Fix lockfiles 2022-10-18 15:31:34 +02:00
Eduard Heimbuch
b70a35c2f2 Expose jackson datatypes as api to be available by plugins 2022-10-18 14:46:31 +02:00
René Pfeuffer
16f38b49fc Fix lockfiles 2022-10-18 12:14:58 +02:00
Konstantin Schaper
e99d77cb04 Upgrade Jackson to version 2.13.4 2022-10-17 17:27:36 +02:00
René Pfeuffer
17cfbf2821 Upgrade jgit to 6.2.0.202206071550-r-scm1 (#2131)
Co-authored-by: Konstantin Schaper <konstantin.schaper@cloudogu.com>
2022-10-12 13:20:20 +02:00
René Pfeuffer
88c51f57e9 Merge hotfix release 2.39.1 into develop 2022-10-12 11:35:32 +02:00
René Pfeuffer
378c6d8ce5 Prepare for next development iteration 2022-10-12 11:35:05 +02:00
CES Marvin
c795184484 Release version 2.39.1 2022-10-12 08:31:24 +00:00
René Pfeuffer
168d708906 Fix handling of old commits as new ones in new branches
If a new branch is pushed in Git without new commits (the branch
is created on a commit that already exists in the SCM-Manager repository
and pushed without any further commit), all ancestors of the commit
the branch points to have been treated as if they were new by the
hook changeset provider. This led to severe errors like wrong
push logs (by the pushlog plugin) or re-evaluated commit messages
by the commit message checker plugin.

This fixes this wrong behaviour. If new commits are not provided by
the pack parser, no commit will be treated as a new one.
2022-10-12 09:31:55 +02:00
Eduard Heimbuch
ca047b7953 Catch SvnCatCommand exception for trying to read content from nodes which are not files. 2022-09-30 13:03:07 +02:00
CES Marvin
1e72eb52bd Prepare for next development iteration 2022-09-15 10:11:03 +00:00
CES Marvin
bb96c9e2b9 Release version 2.39.0 2022-09-15 09:47:11 +00:00
René Pfeuffer
e0a56a1369 Implement commit search features for git (#2111)
Implements the required features for the commit search plugin for git.
2022-09-01 15:31:33 +02:00