Merge remote-tracking branch 'upstream/develop' into t/remove-paella-6

.github/workflows/auto-update-npm-libraries.yml

@@ -24,7 +24,7 @@ jobs:
       - name: use node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       - name: update engage-ui test libraries
         working-directory: modules/engage-ui

.github/workflows/dependabot-batcher.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
   # Batches Dependabot PRs into one by merging them into a combined branch, then raising a new PR
       - name: 'Dependabot Batcher'
-        uses: Legal-and-General/[email protected].3
+        uses: Legal-and-General/[email protected].4
         with:
           token: ${{ secrets.GITHUB_TOKEN }} #required
           baseBranchName: 'r/13.x' #optional

.github/workflows/test-admin-interface-frontend.yml

@@ -24,7 +24,7 @@ jobs:
     - name: use node.js
       uses: actions/setup-node@v4
       with:
-        node-version: 16.x
+        node-version: 20.x
 
     # Ubuntu 22.04 lies wrt to firefox in its repo
     # the 'firefox' package is just a script which tells you to use snap

.github/workflows/test-paella-7.yml

@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 16
+        node-version: 20
     - name: Install dependencies
       run: npm ci
     - name: Install Playwright Browsers

assemblies/karaf-features/src/main/feature/feature.xml

@@ -38,6 +38,7 @@
     <bundle>mvn:com.entwinemedia.common/functional/${functional.version}</bundle>
     <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
     <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.version}</bundle>
+    <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version}</bundle>
     <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle>
     <bundle>mvn:org.yaml/snakeyaml/2.2</bundle>
     <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
@@ -149,7 +150,6 @@
     <feature>opencast-services-processing-light-load</feature>
 
     <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui/${project.version}</bundle>
-    <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui-frontend/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui-interface/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-analyze-mediapackage-workflowoperation/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-animate-workflowoperation/${project.version}</bundle>
@@ -258,7 +258,6 @@
     <feature>opencast-core</feature>
 
     <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui/${project.version}</bundle>
-    <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui-frontend/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui-interface/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-animate-workflowoperation/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-analyze-mediapackage-workflowoperation/${project.version}</bundle>
@@ -390,7 +389,6 @@
     <feature>opencast-core</feature>
 
     <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui/${project.version}</bundle>
-    <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui-frontend/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui-interface/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-analyze-mediapackage-workflowoperation/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-animate-api/${project.version}</bundle>
@@ -632,7 +630,7 @@
     <bundle start-level="82">mvn:org.opencastproject/opencast-oaipmh/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-oaipmh-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-oaipmh-persistence/${project.version}</bundle>
-    <bundle start-level="82">mvn:org.opencastproject/opencast-playlists/16-SNAPSHOT</bundle>
+    <bundle start-level="82">mvn:org.opencastproject/opencast-playlists/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-publication-service-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-publication-service-configurable/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-publication-service-oaipmh/${project.version}</bundle>
@@ -725,6 +723,15 @@
     <bundle start-level="82">mvn:org.opencastproject/opencast-annotation-impl/${project.version}</bundle>
   </feature>
 
+  <feature name="opencast-plugin-admin-ng" version="${project.version}">
+    <conditional>
+      <condition>opencast-allinone</condition>
+      <condition>opencast-admin</condition>
+      <condition>opencast-adminpresentation</condition>
+    </conditional>
+    <bundle start-level="82">mvn:org.opencastproject/opencast-admin-ui-frontend/${project.version}</bundle>
+  </feature>
+
   <feature name="opencast-pluginmanager" version="${project.version}">
     <feature>opencast-core</feature>
     <bundle start-level="86">mvn:org.opencastproject/opencast-plugin-manager/${project.version}</bundle>

assemblies/pom.xml

@@ -121,6 +121,7 @@
             <installedFeatures>
               <feature>opencast-security-cas</feature>
               <feature>opencast-security-jwt</feature>
+              <feature>opencast-plugin-admin-ng</feature>
               <feature>opencast-plugin-legacy-annotation</feature>
               <feature>opencast-plugin-paella-player-6</feature>
               <feature>opencast-plugin-transcription-services</feature>

docs/guides/admin/docs/configuration/admin-ui/about.md

@@ -0,0 +1,20 @@
+# Imprint and Privacy Statement
+
+Opencast allows you to provide imprint and a privacy statements for the admin-ui. Both documents are linked in the footer.
+
+Simply edit the default files in `/etc/ui-config/mh_default_org/admin-ui/`. The filenames follow these rules:
+
+```
+imprint.%{language_code}.html
+privacy.%{language_code}.html
+```
+
+The corresponding language codes can be found here: https://github.com/opencast/opencast-admin-interface/blob/admin-ui-picard/app/src/i18n/i18n.ts#L44
+
+If a language is not provided, the english version will be displayed.
+
+To display both links in the footer, set the following in `etc/org.opencastproject.organization-mh_default_org.cfg`:
+
+```
+prop.org.opencastproject.admin.display_about=true
+```

docs/guides/admin/docs/releasenotes/admin-ng-plugin.txt

@@ -0,0 +1 @@
+The old admin interface is now a plugin and needs to be specifically enabled before it can be used.

docs/guides/admin/docs/releasenotes/imprint-and-privacy-statement-added.txt

@@ -0,0 +1 @@
+With this release you can now provide an imprint and a privacy statement to the admin-ui. For configuration see [the respective docs](../configuration/admin-ui/about.md)

docs/guides/admin/mkdocs.yml

@@ -77,6 +77,7 @@ nav:
         - Role-based Visibility: 'configuration/admin-ui/role-based-visibility.md'
         - Statistics: 'configuration/admin-ui/statistics.md'
         - Thumbnails: 'configuration/admin-ui/thumbnails.md'
+        - Imprint and Privacy Statement: 'configuration/admin-ui/about.md'
    - Amazon Services:
         - Amazon S3 Archive Storage: 'configuration/awss3archive.md'
         - Amazon S3 Distribution: 'configuration/awss3distribution.md'

docs/guides/developer/docs/architecture/api/playlists-api.md

@@ -237,35 +237,3 @@ __Response__
 `200 (OK)`: The removed playlist.
 `403 (FORBIDDEN)`: The user doesn't have the rights to make this request.  
 `404 (NOT FOUND)`: The specified playlist does not exist.
-
-
-### POST /api/playlists/{id}/entries
-
-Updates the entries of a playlist.
-
-__Response__
-
-`200 (OK)`: The updated playlist.
-`400 (BAD REQUEST)`: The request is invalid or inconsistent.  
-`403 (FORBIDDEN)`: The user doesn't have the rights to make this request.  
-`404 (NOT FOUND)`: The specified playlist does not exist.
-
-| Field             | Type                                            | Description             |
-|-------------------|-------------------------------------------------|-------------------------|
-| `playlistEntries` | [`List<PlaylistEntry>`](types.md#PlaylistEntry) | Playlist in JSON format |
-
-
-__Example__
-
-```json
-[
-    {
-        "contentId": "ID-about-opencast",
-        "type": "EVENT"
-    },
-    {
-        "contentId": "ID-3d-print",
-        "type": "EVENT"
-    }
-]
-```

docs/guides/developer/docs/develop/setup-opencast-for-develop.md

@@ -6,6 +6,10 @@ This is meant for developers.
 For the installation of a production cluster, take a look at the admin guides.
 
 
+Warning: This probably won´t work with Windows.
+
+
+
 ## TL;DR