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.

Sign up for GitHub

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

2404.2 CoreMedia Compatibility and Maintenance Upgrade #7

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

2404.2 CoreMedia Compatibility and Maintenance Upgrade #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c449625
upgrade to cm12
dahoeck Jun 12, 2024
9308744
add write permission for contents in build.yml
dahoeck Jun 12, 2024
3a62694
fix pnpm-lock.yaml
dahoeck Jun 12, 2024
be15602
rollback to 2404.1
dahoeck Jun 12, 2024
38d357a
fix pnpm-lock.yaml
dahoeck Jun 12, 2024
c227991
fix jangaroo versions
dahoeck Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ jobs:
name: Build
runs-on: ubuntu-latest

permissions:
contents: write

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
server-id: coremedia.external.releases
server-username: PLUGINS_NEXUS_USER
Expand All @@ -33,7 +36,7 @@ jobs:
- name: Setup NodeJS
uses: actions/setup-node@v2
with:
node-version: 16.x
node-version: 18.x

- name: Setup PNPM
run: |
Expand Down
3 changes: 1 addition & 2 deletions .run/Start Studio Plugin.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
<configuration default="false" name="Start Studio Plugin" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/studio-client/package.json" />
<command value="start" />
<arguments value="--filter ./apps/main/content-hub-adapter-coremedia/ -- --proxyTargetUri=http://localhost:3000" />
<node-interpreter value="project" />
<package-manager value="pnpm" />
<envs />
<method v="2" />
</configuration>
</component>
</component>
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Changelog
================================================================================
## 2.0.3
2401.3 CoreMedia Compatibility and Maintenance Upgrade
* Use Java 17 SDK
* Use Node 18.x

## 2.0.1
- Added Content Hub Transformer
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
![CoreMedia Labs Logo](https://documentation.coremedia.com/badges/banner_coremedia_labs_wide.png "CoreMedia Labs Logo")

![CoreMedia Content Cloud Version](https://img.shields.io/static/v1?message=2010&label=CoreMedia%20Content%20Cloud&style=for-the-badge&labelColor=666666&color=672779
![CoreMedia Content Cloud Version](https://img.shields.io/static/v1?message=2404&label=CoreMedia%20Content%20Cloud&style=for-the-badge&labelColor=666666&color=672779
"This badge shows the CoreMedia version this project is compatible with.
Please read the versioning section of the project to see what other CoreMedia versions are supported and how to find them."
)
Expand All @@ -16,7 +15,7 @@ The repository data is, after successfully configuration the content-hub-adapter

## Versioning

To find out which CoreMedia versions are supported by this project, please take look at the releases section or on the existing branches. To find the matching version of your CoreMedia system, please checkout the branch with the corresponding name. For example, if your CoreMedia version is 2007.2, checkout the branch cmcc-10-2007.
To find out which CoreMedia versions are supported by this project, please take look at the releases section or on the existing branches. To find the matching version of your CoreMedia system, please checkout the branch with the corresponding name.

## Documentation & Tutorial

Expand Down
25 changes: 13 additions & 12 deletions studio-client/apps/main/content-hub-adapter-coremedia/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,21 @@
"license": "CoreMedia Open Source License",
"private": true,
"dependencies": {
"@coremedia/studio-client.core-icons": "2110.2.0",
"@coremedia/studio-client.main.content-hub-editor-components": "2110.2.0",
"@coremedia/studio-client.main.editor-components": "2110.2.0",
"@coremedia/studio-client.cap-base-models": "2110.2.0",
"@jangaroo/runtime": "^1.0.0"
"@coremedia/studio-client.core-icons": "2404.1.0",
"@coremedia/studio-client.main.content-hub-editor-components": "2404.1.0",
"@coremedia/studio-client.main.editor-components": "2404.1.0",
"@coremedia/studio-client.cap-base-models": "2404.1.0",
"@jangaroo/runtime": "^3.0.0"
},
"devDependencies": {
"@jangaroo/build": "^1.0.0",
"@jangaroo/core": "^1.0.0",
"@jangaroo/eslint-config": "^1.0.0",
"@jangaroo/publish": "^1.0.0",
"@jangaroo/run": "^1.0.0",
"eslint": "7.27.0",
"rimraf": "^3.0.2"
"@jangaroo/build": "^3.0.0",
"@jangaroo/core": "^3.0.0",
"@jangaroo/publish": "^3.0.0",
"@jangaroo/run": "^3.0.0",
"cross-env": "^7.0.3",
"rimraf": "^5.0.5",
"@jangaroo/eslint-config": "^1.5.0",
"eslint": "7.27.0"
},
"scripts": {
"clean": "rimraf ./dist && rimraf ./build",
Expand Down
156 changes: 0 additions & 156 deletions studio-client/apps/main/content-hub-adapter-coremedia/src/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,162 +5,6 @@
"compilerOptions": {
"rootDir": ".",
"outDir": "../dist/src",
"baseUrl": ".",
"paths": {
"@coremedia/studio-client.app-context-models/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.app-context-models/src/*"
],
"@coremedia/studio-client.base-models/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.base-models/src/*"
],
"@coremedia/studio-client.cap-base-models/*": [
"../node_modules/@coremedia/studio-client.cap-base-models/src/*"
],
"@coremedia/studio-client.cap-base-services-api/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.cap-base-services-api/src/*"
],
"@coremedia/studio-client.cap-base-services-toolkit/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.cap-base-services-toolkit/src/*"
],
"@coremedia/studio-client.cap-rest-client/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.cap-rest-client/src/*"
],
"@coremedia/studio-client.cap-rest-client-impl/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.cap-rest-client-impl/src/*"
],
"@coremedia/studio-client.ckeditor-constants/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ckeditor-constants/src/*"
],
"@coremedia/studio-client.ckeditor-factory/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ckeditor-factory/src/*"
],
"@coremedia/studio-client.client-core/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.client-core/src/*"
],
"@coremedia/studio-client.client-core-impl/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.client-core-impl/src/*"
],
"@coremedia/studio-client.collaboration-icons/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.collaboration-icons/src/*"
],
"@coremedia/studio-client.content-hub-models/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.content-hub-models/src/*"
],
"@coremedia/studio-client.content-link-list-models/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.content-link-list-models/src/*"
],
"@coremedia/studio-client.core-icons/*": [
"../node_modules/@coremedia/studio-client.core-icons/src/*"
],
"@coremedia/studio-client.embed-app-services-api/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.embed-app-services-api/src/*"
],
"@coremedia/studio-client.ext.base-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.base-components/src/*"
],
"@coremedia/studio-client.ext.cap-base-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.cap-base-components/src/*"
],
"@coremedia/studio-client.ext.content-link-list-components/*": [
"../../../../node_modules/.pnpm/@coremedia+studio-client.ext.content-link-list-components@2110.2.0/node_modules/@coremedia/studio-client.ext.content-link-list-components/src/*"
],
"@coremedia/studio-client.ext.errors-validation-components/*": [
"../../../../node_modules/.pnpm/@coremedia+studio-client.ext.errors-validation-components@2110.2.0/node_modules/@coremedia/studio-client.ext.errors-validation-components/src/*"
],
"@coremedia/studio-client.ext.form-services-toolkit/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.form-services-toolkit/src/*"
],
"@coremedia/studio-client.ext.frame-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.frame-components/src/*"
],
"@coremedia/studio-client.ext.interaction-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.interaction-components/src/*"
],
"@coremedia/studio-client.ext.library-services-toolkit/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.library-services-toolkit/src/*"
],
"@coremedia/studio-client.ext.link-list-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.link-list-components/src/*"
],
"@coremedia/studio-client.ext.logger-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.logger-components/src/*"
],
"@coremedia/studio-client.ext.lottie-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.lottie-components/src/*"
],
"@coremedia/studio-client.ext.multi-site-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.multi-site-components/src/*"
],
"@coremedia/studio-client.ext.split-main-view-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.split-main-view-components/src/*"
],
"@coremedia/studio-client.ext.startup-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.startup-components/src/*"
],
"@coremedia/studio-client.ext.startup-plugins/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.startup-plugins/src/*"
],
"@coremedia/studio-client.ext.toast-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.toast-components/src/*"
],
"@coremedia/studio-client.ext.ui-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.ui-components/src/*"
],
"@coremedia/studio-client.ext.workflow-components/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.workflow-components/src/*"
],
"@coremedia/studio-client.ext.workflow-services-toolkit/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.ext.workflow-services-toolkit/src/*"
],
"@coremedia/studio-client.form-models/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.form-models/src/*"
],
"@coremedia/studio-client.form-services-api/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.form-services-api/src/*"
],
"@coremedia/studio-client.interaction-services-api/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.interaction-services-api/src/*"
],
"@coremedia/studio-client.interaction-services-impl/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.interaction-services-impl/src/*"
],
"@coremedia/studio-client.library-services-api/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.library-services-api/src/*"
],
"@coremedia/studio-client.link-list-models/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.link-list-models/src/*"
],
"@coremedia/studio-client.main.content-hub-editor-components/*": [
"../node_modules/@coremedia/studio-client.main.content-hub-editor-components/src/*"
],
"@coremedia/studio-client.main.editor-components/*": [
"../node_modules/@coremedia/studio-client.main.editor-components/src/*"
],
"@coremedia/studio-client.multi-site-models/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.multi-site-models/src/*"
],
"@coremedia/studio-client.workflow-issues-services-api/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.workflow-issues-services-api/src/*"
],
"@coremedia/studio-client.workflow-models/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.workflow-models/src/*"
],
"@coremedia/studio-client.workflow-plugin-models/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.workflow-plugin-models/src/*"
],
"@coremedia/studio-client.workflow-services-api/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@coremedia/studio-client.workflow-services-api/src/*"
],
"@jangaroo/ext-ts/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@jangaroo/ext-ts/src/*"
],
"@jangaroo/jangaroo-net/*": [
"../../../../node_modules/.pnpm/@[email protected]/node_modules/@jangaroo/jangaroo-net/src/*"
],
"@jangaroo/runtime/*": [
"../node_modules/@jangaroo/runtime/src/*"
]
},
"types": [
"@coremedia/studio-client.main.editor-components"
]
Expand Down
19 changes: 10 additions & 9 deletions studio-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@
"version": "2.0.0-SNAPSHOT",
"private": true,
"engines": {
"node": ">=16",
"pnpm": ">=6.14.6"
"node": "^18 || ^20",
"pnpm": "^9"
},
"devDependencies": {
"@coremedia/set-version": "^1.1.1",
"@typescript-eslint/eslint-plugin": "4.31.2",
"@typescript-eslint/parser": "4.31.2",
"eslint": "7.27.0",
"eslint-plugin-import": "2.25.2",
"eslint-plugin-jsdoc": "35.1.2",
"eslint-plugin-unused-imports": "1.1.5"
"@typescript-eslint/eslint-plugin": "7.9.0",
"@typescript-eslint/parser": "7.9.0",
"eslint": "^8.57.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "48.2.9",
"eslint-plugin-unused-imports": "4.0.0"
},
"scripts": {
"set-version": "set-version"
}
},
"packageManager": "[email protected]+sha256.e1f9e8d1a16607a46dd3c158b5f7a7dc7945501d1c6222d454d63d033d1d918f"
}
Loading
Loading