-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Build of develop from Fri Dec 6 15:59:40 UTC 2024
- Loading branch information
1 parent
bbc5076
commit 17eea0e
Showing
3 changed files
with
27 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,26 @@ | ||
commit 17fd3702cf830ed906a633f42505a55e3f77d6b8 | ||
Author: Katrin Ihler <ihler@elan-ev.de> | ||
Date: Fri Dec 6 14:11:26 2024 +0100 | ||
commit f3df47a43f2c8d660e16ec8d864162058d36bb13 | ||
Author: Lars Kiesow <lkiesow@uos.de> | ||
Date: Fri Dec 6 16:58:56 2024 +0100 | ||
|
||
Merge branch 'r/17.x' into develop | ||
Fix pom.xml versions (#6376) | ||
|
||
The merge from `r/17.x` to `develop` (17fd370) broke the version | ||
specification of the modules in that the `graphql*` modules are | ||
specified to require `17-SNAPSHOT` while Opencast's main version is | ||
already at `18-SNAPSHOT`. | ||
|
||
### Your pull request should… | ||
|
||
* [x] have a concise title | ||
* [x] [close an accompanying | ||
issue](https://docs.opencast.org/develop/developer/#participate/development-process/#automatically-closing-issues-when-a-pr-is-merged) | ||
if one exists | ||
* [x] [be against the correct | ||
branch](https://docs.opencast.org/develop/developer/development-process#acceptance-criteria-for-patches-in-different-versions) | ||
* [x] include migration scripts and documentation, if appropriate | ||
* [x] pass automated tests | ||
* [x] have a clean commit history | ||
* [x] [have proper commit messages (title and body) for all | ||
commits](https://medium.com/@steveamaza/e028865e5791) | ||
* [x] explain why it needs to be merged into the legacy branch, if it is | ||
targeting the legacy branch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters