Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update from upstream #5

Merged
merged 29 commits into from
Jul 19, 2019
Merged

update from upstream #5

merged 29 commits into from
Jul 19, 2019

Commits on Jul 3, 2019

  1. Add mimetype application/* to AT

    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.
    mliradelc committed Jul 3, 2019
    Configuration menu
    Copy the full SHA
    b19c8cf View commit details
    Browse the repository at this point in the history
  2. Merge pull request #236 from mliradelc/hls-OC-integration-fix

    HLS Opencast integration mimetype fix
    JulianKniephoff committed Jul 3, 2019
    Configuration menu
    Copy the full SHA
    39833e3 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2019

  1. npm update

    JulianKniephoff committed Jul 4, 2019
    Configuration menu
    Copy the full SHA
    872acd4 View commit details
    Browse the repository at this point in the history
  2. Fix Project Versions

    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/
    lkiesow committed Jul 4, 2019
    Configuration menu
    Copy the full SHA
    98eac74 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2019

  1. Merge pull request #239 from lkiesow/fix-versions

    Fix Project Versions
    JulianKniephoff committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    6bb6ccf View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2019

  1. Configuration menu
    Copy the full SHA
    a68d1e7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f9079af View commit details
    Browse the repository at this point in the history
  3. Add empty .travis.yml

    JulianKniephoff committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    1c5ed79 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c24293d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3f9c138 View commit details
    Browse the repository at this point in the history
  6. Travis Optimization

    - Do not cache build results
    - Fix some possible ownership problems
    - Improve Maven build logs
    lkiesow authored and JulianKniephoff committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    38170ed View commit details
    Browse the repository at this point in the history
  7. Change the versioning

    JulianKniephoff committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    6897c7c View commit details
    Browse the repository at this point in the history
  8. Bump lodash.mergewith from 4.6.1 to 4.6.2 in /frontend

    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>
    dependabot[bot] committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    0e757c3 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2019

  1. Merge pull request #242 from opencast/dependabot/npm_and_yarn/fronten…

    …d/lodash.mergewith-4.6.2
    
    Bump lodash.mergewith from 4.6.1 to 4.6.2 in /frontend
    JulianKniephoff committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    4985c49 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5d1176a View commit details
    Browse the repository at this point in the history
  3. Remove automatic translation key extraction for now

    We did not use this anyway, and doing this now
    gets rid of a lot of dependencies
    and with that (potential) security vulnerabilities.
    JulianKniephoff committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    5efc6a4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cfb3799 View commit details
    Browse the repository at this point in the history
  5. Increase OSGi compatibility

    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.
    JulianKniephoff committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    2779d4a View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2019

  1. Configuration menu
    Copy the full SHA
    e514149 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0cff251 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b512a95 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

  1. Execute the maven frontend plugin unconditionally

    It should not be bound to a profile that will be deactivated
    whenever any other profile gets activated.
    JulianKniephoff committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    7233282 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6ac7e71 View commit details
    Browse the repository at this point in the history
  3. Stopped artificially deferring synchronous values

    `$.when` can handle these fine.
    JulianKniephoff committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    b26f75a View commit details
    Browse the repository at this point in the history
  4. Style

    JulianKniephoff committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    7352219 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    892ccbb View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    439d135 View commit details
    Browse the repository at this point in the history
  7. Remove some dead code

    JulianKniephoff committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    ca24adc View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c96f62c View commit details
    Browse the repository at this point in the history