Update plugin for CMCC 13 2512

.github/workflows/build.yml

@@ -16,47 +16,41 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Setup Git
+        if: github.ref == 'refs/heads/main' && (github.event_name == 'workflow_dispatch' || github.event_name == 'push')
+        run: |
+          git config --global user.name 'coremedia-ci'
+          git config --global user.email 'coremedia-ci@coremedia.com'
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
           server-id: coremedia.external.releases
           server-username: PLUGINS_NEXUS_USER
           server-password: PLUGINS_NEXUS_PASSWORD
-      - name: Cache Maven Repo
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-
-      - name: Setup NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20.x
+          cache: 'maven'
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v3
         with:
-          version: 9.3
+          version: 10
 
-      - name: Setup Git
-        if: github.ref == 'refs/heads/main' && (github.event_name == 'workflow_dispatch' || github.event_name == 'push')
-        run: |
-          git config --global user.name 'coremedia-ci'
-          git config --global user.email 'coremedia-ci@coremedia.com'
+      - name: Setup NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          cache: 'pnpm'
+          cache-dependency-path: "apps/studio-client/pnpm-lock.yaml"
 
       - name: Setup registry npm.coremedia.io
         run: |
-          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)
+          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)
           echo "::add-mask::$NPM_AUTH_TOKEN"
-          echo "Token: $NPM_AUTH_TOKEN"
           pnpm config set //npm.coremedia.io/:_authToken=$NPM_AUTH_TOKEN
           pnpm config set @coremedia:registry=https://npm.coremedia.io
           pnpm config set @jangaroo:registry=https://npm.coremedia.io
 
-
       - name: Install PNPM Dependencies
         working-directory: apps/studio-client
         run: pnpm install
@@ -68,7 +62,7 @@ jobs:
           PLUGINS_NEXUS_PASSWORD: ${{ secrets.PLUGINS_NEXUS_PASSWORD }}
         run: |
           version=$(mvn --batch-mode org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout)
-          echo "::set-output name=version::${version}"
+          echo "version=${version}" >> $GITHUB_OUTPUT
 
       - name: Build with Pnpm
         working-directory: apps/studio-client
@@ -80,7 +74,7 @@ jobs:
         env:
           PLUGINS_NEXUS_USER: ${{ secrets.PLUGINS_NEXUS_USER }}
           PLUGINS_NEXUS_PASSWORD: ${{ secrets.PLUGINS_NEXUS_PASSWORD }}
-        run: mvn --batch-mode --update-snapshots verify
+        run: mvn --batch-mode --update-snapshots install
 
       - name: Create Bundle
         env:
@@ -99,7 +93,6 @@ jobs:
           done
           echo "${RESULT}" > "target/bundle/$(echo ${DESCRIPTOR_TEMPLATE} | sed 's#.*/##g' | cut -d '.' -f1)-${VERSION}.json"
 
-
       - name: Upload Build Artifacts
         uses: actions/upload-artifact@v4
         with:

.github/workflows/release.yml

@@ -29,29 +29,31 @@ jobs:
           git config --global user.name 'coremedia-ci'
           git config --global user.email 'coremedia-ci@coremedia.com'
 
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
           server-id: coremedia.external.releases
           server-username: PLUGINS_NEXUS_USER
           server-password: PLUGINS_NEXUS_PASSWORD
           cache: 'maven'
 
-      - name: Setup NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20.x
-
       - name: Setup PNPM
         uses: pnpm/action-setup@v3
         with:
-          version: 9.3
+          version: 10
+
+      - name: Setup NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          cache: 'pnpm'
+          cache-dependency-path: "apps/studio-client/pnpm-lock.yaml"
 
       - name: Setup registry npm.coremedia.io
         run: |
-          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)
+          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)
           echo "::add-mask::$NPM_AUTH_TOKEN"
           pnpm config set //npm.coremedia.io/:_authToken=$NPM_AUTH_TOKEN
           pnpm config set @coremedia:registry=https://npm.coremedia.io
@@ -76,9 +78,10 @@ jobs:
 
           git add .
           git commit -m "set release version: ${release_version}"
-          git tag "v${release_version}"
+          release_tag="v${release_version}"
+          git tag "${release_tag}"
           echo "version=${release_version}" >> $GITHUB_OUTPUT
-          echo "tag=v${release_version}" >> $GITHUB_OUTPUT
+          echo "tag=${release_tag}" >> $GITHUB_OUTPUT
 
       - name: Build with Pnpm
         working-directory: apps/studio-client
@@ -90,7 +93,7 @@ jobs:
         env:
           PLUGINS_NEXUS_USER: ${{ secrets.PLUGINS_NEXUS_USER }}
           PLUGINS_NEXUS_PASSWORD: ${{ secrets.PLUGINS_NEXUS_PASSWORD }}
-        run: mvn --batch-mode --update-snapshots verify
+        run: mvn --batch-mode --update-snapshots install
 
       - name: Push Release Tag
         if: ${{ github.event.inputs.dry_run == 'false' }}

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 3.0.0
+
+* Update to CMCC 13 2512.0.0
+* Use Java 21 SDK
+* Use Node 24.x
+
+## 2.0.0
+* Update to CMCC 12 2406.1.1
+
 ## 1.0.0
 
 * T-Systems extension implementation

apps/studio-client/apps/main/query-studio-plugin/package.json

@@ -1,46 +1,43 @@
 {
   "name": "@coremedia-blueprint/studio-client.main.query-studio-plugin",
-  "author": "Blueprint",
-  "version": "2.0.5-SNAPSHOT",
+  "version": "3.0.0-SNAPSHOT",
+  "author": "CoreMedia GmbH",
+  "license": "CoreMedia Open Source License",
   "private": true,
   "dependencies": {
-    "@coremedia/studio-client.app-context-models": "^2406.1.1",
-    "@coremedia/studio-client.base-models": "^2406.1.1",
-    "@coremedia/studio-client.cap-base-models": "^2406.1.1",
-    "@coremedia/studio-client.cap-rest-client": "^2406.1.1",
-    "@coremedia/studio-client.cap-rest-client-impl": "^2406.1.1",
-    "@coremedia/studio-client.client-core": "^2406.1.1",
-    "@coremedia/studio-client.client-core-impl": "^2406.1.1",
-    "@coremedia/studio-client.ext.cap-base-components": "^2406.1.1",
-    "@coremedia/studio-client.ext.errors-validation-components": "^2406.1.1",
-    "@coremedia/studio-client.ext.form-services-toolkit": "^2406.1.1",
-    "@coremedia/studio-client.ext.library-services-toolkit": "^2406.1.1",
-    "@coremedia/studio-client.ext.link-list-components": "^2406.1.1",
-    "@coremedia/studio-client.ext.ui-components": "^2406.1.1",
-    "@coremedia/studio-client.link-list-models": "^2406.1.1",
-    "@coremedia/studio-client.main.editor-components": "^2406.1.1",
-    "@coremedia/studio-client.multi-site-models": "^2406.1.1",
-    "@jangaroo/ext-ts": "^2.0.0",
-    "@jangaroo/runtime": "^3.2.0",
-    "rxjs": "^7.8.1"
+    "@coremedia/studio-client.app-context-models": "catalog:",
+    "@coremedia/studio-client.base-models": "catalog:",
+    "@coremedia/studio-client.cap-base-models": "catalog:",
+    "@coremedia/studio-client.cap-rest-client": "catalog:",
+    "@coremedia/studio-client.client-core": "catalog:",
+    "@coremedia/studio-client.ext.cap-base-components": "catalog:",
+    "@coremedia/studio-client.ext.errors-validation-components": "catalog:",
+    "@coremedia/studio-client.ext.form-services-toolkit": "catalog:",
+    "@coremedia/studio-client.ext.library-services-toolkit": "catalog:",
+    "@coremedia/studio-client.ext.link-list-components": "catalog:",
+    "@coremedia/studio-client.ext.ui-components": "catalog:",
+    "@coremedia/studio-client.link-list-models": "catalog:",
+    "@coremedia/studio-client.main.editor-components": "catalog:",
+    "@coremedia/studio-client.multi-site-models": "catalog:",
+    "@jangaroo/ext-ts": "catalog:",
+    "@jangaroo/runtime": "catalog:",
+    "rxjs": "catalog:"
   },
   "devDependencies": {
-    "@jangaroo/run": "^3.2.0",
-    "@jangaroo/build": "^3.2.0",
-    "@jangaroo/core": "^3.2.0",
-    "@jangaroo/eslint-config": "^2.0.3",
-    "@jangaroo/publish": "^3.2.0",
-    "eslint": "^8.56.0",
-    "rimraf": "^5.0.7"
+    "@coremedia/studio-client.ext.eslint-config": "catalog:",
+    "@jangaroo/build": "catalog:",
+    "@jangaroo/core": "catalog:",
+    "@jangaroo/run": "catalog:",
+    "eslint": "catalog:",
+    "rimraf": "catalog:"
   },
   "scripts": {
     "clean": "rimraf ./dist && rimraf ./build",
     "build": "jangaroo build",
     "watch": "jangaroo watch",
     "start": "jangaroo run",
     "package": "jangaroo package",
-    "publish": "jangaroo publish",
-    "lint": "eslint --fix \"src/**/*.ts\""
+    "lint": "eslint"
   },
   "exports": {
     "./*": {

apps/studio-client/apps/main/query-studio-plugin/src/app/QueryPanelBase.ts

@@ -12,14 +12,13 @@ import ContentType from "@coremedia/studio-client.cap-rest-client/content/Conten
 import IssuesDetectedError from "@coremedia/studio-client.cap-rest-client/content/IssuesDetectedError";
 import Struct from "@coremedia/studio-client.cap-rest-client/struct/Struct";
 import User from "@coremedia/studio-client.cap-rest-client/user/User";
-import StructSubBean from "@coremedia/studio-client.cap-rest-client-impl/common/impl/StructSubBean";
+import StructSubBean from "@coremedia/studio-client.cap-rest-client/common/impl/StructSubBean";
 import RemoteBean from "@coremedia/studio-client.client-core/data/RemoteBean";
 import ValueExpression from "@coremedia/studio-client.client-core/data/ValueExpression";
 import ValueExpressionFactory from "@coremedia/studio-client.client-core/data/ValueExpressionFactory";
 import RemoteError from "@coremedia/studio-client.client-core/data/error/RemoteError";
-import RemoteServiceMethod from "@coremedia/studio-client.client-core-impl/data/impl/RemoteServiceMethod";
-import RemoteServiceMethodResponse from "@coremedia/studio-client.client-core-impl/data/impl/RemoteServiceMethodResponse";
-import ContentTypeSelectorBase from "@coremedia/studio-client.ext.cap-base-components/contenttypes/ContentTypeSelectorBase";
+import RemoteServiceMethod from "@coremedia/studio-client.client-core/data/impl/RemoteServiceMethod";
+import RemoteServiceMethodResponse from "@coremedia/studio-client.client-core/data/impl/RemoteServiceMethodResponse";
 import EditorErrors_properties from "@coremedia/studio-client.ext.errors-validation-components/error/EditorErrors_properties";
 import RemoteErrorHandlers from "@coremedia/studio-client.ext.errors-validation-components/error/RemoteErrorHandlers";
 import IconButton from "@coremedia/studio-client.ext.ui-components/components/IconButton";
@@ -41,6 +40,7 @@ import QueryTool_properties from "../properties/QueryTool_properties";
 import QueryCondition from "./QueryCondition";
 import QueryPanel from "./QueryPanel";
 import QueryToolTab from "./QueryToolTab";
+import { getAllContentTypeEntries } from "@coremedia/studio-client.cap-base-models/contenttypes/contentTypes";
 
 interface QueryPanelBaseConfig extends Config<Panel> {
 }
@@ -572,7 +572,7 @@ class QueryPanelBase extends Panel {
   }
 
   protected getContentTypeData(): Array<any> {
-    const data: Array<any> = ContentTypeSelectorBase.getAllContentTypeEntries();
+    const data: Array<any> = getAllContentTypeEntries();
     return QueryPanelBase.docTypes.concat(data);
   }
 

apps/studio-client/apps/main/query-studio-plugin/src/app/QueryResultGridPanelBase.ts

@@ -1,8 +1,8 @@
 import UndocContentUtil from "@coremedia/studio-client.cap-rest-client/content/UndocContentUtil";
 import User from "@coremedia/studio-client.cap-rest-client/user/User";
 import ValueExpression from "@coremedia/studio-client.client-core/data/ValueExpression";
-import RemoteService from "@coremedia/studio-client.client-core-impl/data/impl/RemoteService";
-import Logger from "@coremedia/studio-client.client-core-impl/logging/Logger";
+import RemoteService from "@coremedia/studio-client.client-core/data/impl/RemoteService";
+import Logger from "@coremedia/studio-client.client-core/logging/Logger";
 import Ext from "@jangaroo/ext-ts";
 import XTemplate from "@jangaroo/ext-ts/XTemplate";
 import AjaxProxy from "@jangaroo/ext-ts/data/proxy/Ajax";

apps/studio-client/apps/main/query-studio-plugin/src/app/QueryToolTabBase.ts

@@ -9,8 +9,8 @@ import ContentType from "@coremedia/studio-client.cap-rest-client/content/Conten
 import ValueExpression from "@coremedia/studio-client.client-core/data/ValueExpression";
 import ValueExpressionFactory from "@coremedia/studio-client.client-core/data/ValueExpressionFactory";
 import beanFactory from "@coremedia/studio-client.client-core/data/beanFactory";
-import RemoteService from "@coremedia/studio-client.client-core-impl/data/impl/RemoteService";
-import RemoteServiceMethod from "@coremedia/studio-client.client-core-impl/data/impl/RemoteServiceMethod";
+import RemoteService from "@coremedia/studio-client.client-core/data/impl/RemoteService";
+import RemoteServiceMethod from "@coremedia/studio-client.client-core/data/impl/RemoteServiceMethod";
 import Ext from "@jangaroo/ext-ts";
 import ObjectUtil from "@jangaroo/ext-ts/Object";
 import Store from "@jangaroo/ext-ts/data/Store";

apps/studio-client/eslint.config.mjs

@@ -0,0 +1,3 @@
+import { createEslintConfig } from "@coremedia/studio-client.ext.eslint-config";
+
+export default createEslintConfig();