Skip to content

Commit afc5b0f

Browse files
sbuettnesbuettne
committed
CMCC 13 update
1 parent 2056a1c commit afc5b0f

14 files changed

Lines changed: 4662 additions & 3678 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,46 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v2
21-
- name: Set up JDK 17
22-
uses: actions/setup-java@v2
20+
uses: actions/checkout@v4
21+
- name: Setup Git
22+
if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main'
23+
run: |
24+
git config --global user.name 'coremedia-ci'
25+
git config --global user.email 'coremedia-ci@coremedia.com'
26+
- name: Set up JDK
27+
uses: actions/setup-java@v4
2328
with:
24-
java-version: '17'
29+
java-version: '21'
2530
distribution: 'adopt'
2631
server-id: coremedia.external.releases
2732
server-username: PLUGINS_NEXUS_USER
2833
server-password: PLUGINS_NEXUS_PASSWORD
34+
cache: 'maven'
2935
- name: Cache Maven Repo
30-
uses: actions/cache@v2
36+
uses: actions/cache@v4
3137
with:
3238
path: ~/.m2
3339
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3440
restore-keys: ${{ runner.os }}-m2
35-
41+
- name: Setup PNPM
42+
uses: pnpm/action-setup@v3
43+
with:
44+
version: 10
3645
- name: Setup NodeJS
37-
uses: actions/setup-node@v2
46+
uses: actions/setup-node@v4
3847
with:
39-
node-version: 20.x
40-
41-
- name: Setup PNPM
48+
node-version: 24
49+
cache: 'pnpm'
50+
cache-dependency-path: "studio-client/pnpm-lock.yaml"
51+
- name: Setup registry npm.coremedia.io
4252
run: |
4353
NPM_AUTH_TOKEN=$(curl -s -H "Accept: application/json" -H "Content-Type:application/json" -X PUT --data '{"name": "${{ secrets.CM_NPM_USER }}", "password": "${{ secrets.CM_NPM_READ_ONLY_PASSWORD }}"}' https://npm.coremedia.io/-/user/org.couchdb.user:${{ secrets.CM_NPM_USER }} | jq -r .token)
4454
echo "::add-mask::$NPM_AUTH_TOKEN"
45-
echo "NPM_CONFIG_//npm.coremedia.io/:_authToken=$NPM_AUTH_TOKEN" >> $GITHUB_ENV
46-
npm install -g pnpm@latest
47-
48-
- name: Setup Git
49-
if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main'
50-
run: |
51-
git config --global user.name 'coremedia-ci'
52-
git config --global user.email 'coremedia-ci@coremedia.com'
53-
55+
pnpm config set //npm.coremedia.io/:_authToken=$NPM_AUTH_TOKEN
56+
pnpm config set @coremedia:registry=https://npm.coremedia.io
57+
pnpm config set @jangaroo:registry=https://npm.coremedia.io
5458
- name: Install PNPM Dependencies
5559
working-directory: studio-client
56-
env:
57-
NPM_CONFIG_@coremedia:registry: 'https://npm.coremedia.io'
58-
NPM_CONFIG_@jangaroo:registry: 'https://npm.coremedia.io'
5960
run: pnpm install
6061

6162
- name: Set Release Version
@@ -76,8 +77,8 @@ jobs:
7677
git commit -m "set release version: ${release_version}"
7778
release_tag="v${release_version}"
7879
git tag "${release_tag}"
79-
echo "::set-output name=version::${release_version}"
80-
echo "::set-output name=tag::${release_tag}"
80+
echo "version=${release_version}" >> $GITHUB_OUTPUT
81+
echo "tag=${release_tag}" >> $GITHUB_OUTPUT
8182
8283
- name: Output Version
8384
id: output-version
@@ -86,7 +87,7 @@ jobs:
8687
PLUGINS_NEXUS_PASSWORD: ${{ secrets.PLUGINS_NEXUS_PASSWORD }}
8788
run: |
8889
version=$(mvn --batch-mode org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout)
89-
echo "::set-output name=version::${version}"
90+
echo "version=${version}" >> $GITHUB_OUTPUT
9091
9192
- name: Build with Pnpm
9293
working-directory: studio-client
@@ -98,7 +99,7 @@ jobs:
9899
env:
99100
PLUGINS_NEXUS_USER: ${{ secrets.PLUGINS_NEXUS_USER }}
100101
PLUGINS_NEXUS_PASSWORD: ${{ secrets.PLUGINS_NEXUS_PASSWORD }}
101-
run: mvn --batch-mode --update-snapshots verify
102+
run: mvn --batch-mode --update-snapshots install
102103

103104
- name: Create Bundle
104105
env:
@@ -142,18 +143,18 @@ jobs:
142143
git add .
143144
git commit -m "set next snapshot version"
144145
git push && git push --tags
145-
echo "::set-output name=version::${snapshot_version}"
146+
echo "version=${snapshot_version}" >> $GITHUB_OUTPUT
146147
147148
- name: Upload Build Artifacts
148-
uses: actions/upload-artifact@v2
149+
uses: actions/upload-artifact@v4
149150
with:
150151
name: content-hub-adapter-pixabay-${{ steps.output-version.outputs.version }}
151152
path: target/bundle
152153
if-no-files-found: error
153154

154155
- name: Upload Release Artifacts
155156
if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main'
156-
uses: softprops/action-gh-release@v1
157+
uses: softprops/action-gh-release@v2
157158
with:
158159
tag_name: v${{ steps.set-release-version.outputs.version }}
159160
files: target/bundle/*

‎CHANGELOG.md‎

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,42 @@
1-
Changelog
2-
================================================================================
3-
4-
2.0.4
5-
--------------------------------------------------------------------------------
6-
7-
### General Notes
8-
9-
* Improved search functionality
10-
11-
2.0.2
12-
--------------------------------------------------------------------------------
13-
14-
### General Notes
15-
16-
* Adding mime-type guessing for blobs
17-
18-
2.0.1
19-
--------------------------------------------------------------------------------
20-
21-
### General Notes
22-
23-
* Update to latest CM11 dependencies
24-
25-
1.0.0
26-
--------------------------------------------------------------------------------
27-
28-
### General Notes
29-
30-
* Intial release of the plugin for CMCC 11.2110.1 including all features known from latest version of CMCCv10.
1+
# Changelog
2+
3+
## 3.0.0
4+
- CMCC 13 Update
5+
- Use Java 17
6+
- Use Node 24.x
7+
- Use PNPM 10.x
8+
- Compatible CoreMedia Content Cloud version: `2512.0.0`
9+
10+
## 2.0.8
11+
- Use Java 17
12+
- Use Node 20.x
13+
- Compatible CoreMedia Content Cloud version: `2404.1`
14+
15+
## 2.0.7
16+
- Minor refactorings
17+
- Refactored thumbnail blob calculation
18+
- Compatible CoreMedia Content Cloud version: `2110.2`
19+
20+
## 2.0.6
21+
- Changed boolean setting access to `getSafeSearch` from `isSafeSearch`
22+
- Compatible CoreMedia Content Cloud version: `2110.2`
23+
24+
## 2.0.5
25+
- Updated documentation
26+
- Compatible CoreMedia Content Cloud version: `2110.2`
27+
28+
## 2.0.4
29+
- Improved search functionality
30+
- Compatible CoreMedia Content Cloud version: `2110.1`
31+
32+
## 2.0.2
33+
- Adding mime-type guessing for blobs
34+
- Compatible CoreMedia Content Cloud version: `2110.1`
35+
36+
## 2.0.1
37+
- Update to latest CM11 dependencies
38+
- Compatible CoreMedia Content Cloud version: `2110.1`
39+
40+
## 1.0.0
41+
- Initial release of the plugin for CMCC 11.2110.1 including all features known from latest version of CMCCv10.
42+
- Compatible CoreMedia Content Cloud version: `2110.1`

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
![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.
1+
![CoreMedia Content Cloud Version](https://img.shields.io/static/v1?message=11|12|13&label=CoreMedia%20Content%20Cloud&style=for-the-badge&labelColor=666666&color=672779 "This badge shows the CoreMedia version this project is compatible with.
22
Please read the versioning section of the project to see what other CoreMedia versions are supported and how to find them.")
3+
![Status](https://img.shields.io/static/v1?message=active&label=Status&style=for-the-badge&labelColor=666666&color=2FAC66
4+
"The status badge describes if the project is maintained. Possible values are active and inactive.
5+
If a project is inactive it means that the development has been discontinued and won't support future CoreMedia versions."
6+
)
37

48
# Content Hub Adapter for Pixabay
59

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.coremedia.labs.plugins</groupId>
77
<artifactId>content-hub-adapter-pixabay</artifactId>
8-
<version>2.0.9-SNAPSHOT</version>
8+
<version>3.0.0-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<modules>

‎studio-client/apps/main/content-hub-adapter-pixabay/package.json‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
{
22
"name": "@coremedia-labs/studio-client.main.content-hub-adapter-pixabay",
3-
"version": "2.0.9-SNAPSHOT",
3+
"version": "3.0.0-SNAPSHOT",
44
"author": "CoreMedia GmbH",
55
"license": "CoreMedia Open Source License",
66
"private": true,
77
"dependencies": {
8-
"@coremedia/studio-client.core-icons": "2307.1.0",
9-
"@coremedia/studio-client.main.content-hub-editor-components": "2307.1.0",
10-
"@coremedia/studio-client.main.editor-components": "2307.1.0",
11-
"@coremedia/studio-client.cap-base-models": "2307.1.0",
12-
"@coremedia/studio-client.base-models": "2307.1.0",
13-
"@jangaroo/runtime": "^1.5.0"
8+
"@coremedia/studio-client.base-models": "catalog:",
9+
"@coremedia/studio-client.cap-base-models": "catalog:",
10+
"@coremedia/studio-client.common-icons": "catalog:",
11+
"@coremedia/studio-client.main.content-hub-editor-components": "catalog:",
12+
"@coremedia/studio-client.main.editor-components": "catalog:",
13+
"@jangaroo/runtime": "catalog:"
1414
},
1515
"devDependencies": {
16-
"@jangaroo/build": "^1.5.0",
17-
"@jangaroo/core": "^1.5.0",
18-
"@jangaroo/eslint-config": "^1.5.0",
19-
"@jangaroo/publish": "^1.5.0",
20-
"@jangaroo/run": "^1.5.0",
21-
"eslint": "7.27.0",
22-
"rimraf": "^3.0.2"
16+
"@coremedia/studio-client.ext.eslint-config": "catalog:",
17+
"@jangaroo/build": "catalog:",
18+
"@jangaroo/core": "catalog:",
19+
"@jangaroo/run": "catalog:",
20+
"eslint": "catalog:",
21+
"rimraf": "catalog:"
2322
},
2423
"scripts": {
2524
"clean": "rimraf ./dist && rimraf ./build",
2625
"build": "jangaroo build",
2726
"watch": "jangaroo watch",
2827
"start": "jangaroo run",
2928
"package": "jangaroo package",
30-
"publish": "jangaroo publish",
31-
"lint": "eslint --fix \"src/**/*.ts\""
29+
"lint": "eslint"
3230
},
3331
"exports": {
3432
"./*": {

‎studio-client/apps/main/content-hub-adapter-pixabay/src/ContentHubPixabay_properties.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import SvgIconUtil from "@coremedia/studio-client.base-models/util/SvgIconUtil";
2-
import CoreIcons_properties from "@coremedia/studio-client.core-icons/CoreIcons_properties";
3-
import icon from "./icons/pixabay_16.svg";
4-
import photo from "./icons/content-hub-photo_16.svg";
5-
import video from "./icons/content-hub-video_16.svg";
2+
import icon from "./icons/pixabay.svg";
3+
import { personalFolderPicture, personalFolderVideo } from "@coremedia/studio-client.common-icons";
4+
import photo from "./icons/content-hub-photo.svg";
5+
import video from "./icons/content-hub-video.svg";
66

77
interface ContentHubPixabay_properties {
88

@@ -36,9 +36,9 @@ const ContentHubPixabay_properties: ContentHubPixabay_properties = {
3636
adapter_type_pixabay_name: "Pixabay",
3737
adapter_type_pixabay_icon: SvgIconUtil.getIconStyleClassForSvgIcon(icon),
3838
folder_type_photo_name: "Photos",
39-
folder_type_photo_icon: CoreIcons_properties.personal_folder_picture,
39+
folder_type_photo_icon: SvgIconUtil.getIconStyleClassForSvgIcon(personalFolderPicture),
4040
folder_type_video_name: "Videos",
41-
folder_type_video_icon: CoreIcons_properties.personal_folder_video,
41+
folder_type_video_icon: SvgIconUtil.getIconStyleClassForSvgIcon(personalFolderVideo),
4242
item_type_photo_name: "Photo",
4343
item_type_photo_icon: SvgIconUtil.getIconStyleClassForSvgIcon(photo),
4444
item_type_video_name: "Video",

studio-client/apps/main/content-hub-adapter-pixabay/src/icons/content-hub-photo_16.svg renamed to studio-client/apps/main/content-hub-adapter-pixabay/src/icons/content-hub-photo.svg

File renamed without changes.

studio-client/apps/main/content-hub-adapter-pixabay/src/icons/content-hub-video_16.svg renamed to studio-client/apps/main/content-hub-adapter-pixabay/src/icons/content-hub-video.svg

File renamed without changes.

studio-client/apps/main/content-hub-adapter-pixabay/src/icons/pixabay_16.svg renamed to studio-client/apps/main/content-hub-adapter-pixabay/src/icons/pixabay.svg

File renamed without changes.

‎studio-client/apps/main/content-hub-adapter-pixabay/src/tsconfig.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
"extends": "@jangaroo/build/tsconfig-jangaroo.json",
55
"compilerOptions": {
66
"rootDir": ".",
7-
"outDir": "../dist/src",
8-
"moduleResolution": "nodenext",
9-
"types": [
10-
"@coremedia/studio-client.main.editor-components"
11-
]
7+
"outDir": "../dist/src"
128
}
139
}

0 commit comments

Comments
 (0)