update from upstream #5
Merged
Conversation
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 fix the hang error when an HLS stream tries to load in the integrated version of the AT. The error was triggered because the AT only takes the files with the mimetype: "video/". This patch adds the "application/*" mimetype.
HLS Opencast integration mimetype fix
Building this project, Maven loudly complains about malformed `pom.xml`
files due to the usage of a `version` property for the bundle versions:
```
% mvn clean install (git)-[develop] [0]
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model for org.opencast:annotation-tool-frontend:jar:3-SNAPSHOT
[WARNING] 'version' contains an expression but should be a constant. @ org.opencast:annotation:${version}, /home/lars/dev/annotation-tool/pom.xml, line 8, column 12
[WARNING]
[WARNING] Some problems were encountered while building the effective model for org.opencast:annotation:pom:3-SNAPSHOT
[WARNING] 'version' contains an expression but should be a constant. @ org.opencast:annotation:${version}, /home/lars/dev/annotation-tool/pom.xml, line 8, column 12
[WARNING]
[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
[WARNING]
```
This already leads to errors if you try building a sub-project:
```
% cd opencast-backend
% mvn clean install
...
[INFO] BUILD FAILURE
...
[ERROR] Failed to execute goal on project opencast-annotation-tool:
Could not resolve dependencies for project
org.opencast:opencast-annotation-tool:bundle:3-SNAPSHOT: Failed to
collect dependencies at
org.opencast:annotation-tool-frontend:jar:3-SNAPSHOT: Failed to read
artifact descriptor for
org.opencast:annotation-tool-frontend:jar:3-SNAPSHOT: Failure to find
org.opencast:annotation:pom:${version} in
https://nexus.opencast.org/nexus/content/groups/public was cached in the
local repository, resolution will not be reattempted until the update
interval of opencast-osna has elapsed or updates are forced -> [Help 1]
```
The property is meant to easily update the version. The same can also be
achieved in a well defined way using the versions-maven-plugin:
mvn versions:set -DnewVersion=4-SNAPSHOT versions:commit
For more options, take a look at the plugin's documentation:
- http://www.mojohaus.org/versions-maven-plugin/
Fix Project Versions
- Do not cache build results - Fix some possible ownership problems - Improve Maven build logs
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/commits) Signed-off-by: dependabot[bot] <support@github.com>
…d/lodash.mergewith-4.6.2 Bump lodash.mergewith from 4.6.1 to 4.6.2 in /frontend
We did not use this anyway, and doing this now gets rid of a lot of dependencies and with that (potential) security vulnerabilities.
This change explicitly specifies the version of the Opencast bundles the tool is supposed to import. This makes it independent of the Opencast artifacts' versions used during the build.
It should not be bound to a profile that will be deactivated whenever any other profile gets activated.
`$.when` can handle these fine.
mliradelc
pushed a commit
that referenced
this pull request
Apr 12, 2022
…ries Bring series categories up to date
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.