Merge branch '2404.1'

CoreMedia · May 29, 2024 · 4a82a00 · 4a82a00
2 parents 652f025 + 73b5ca1
commit 4a82a00
Show file tree

Hide file tree

Showing 13 changed files with 3,585 additions and 1,459 deletions.
diff --git a/.run/Start Studio Plugin.run.xml b/.run/Start Studio Plugin.run.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Start Studio Plugin" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/studio-client/apps/main/feedback-hub-adapter-searchmetrics/package.json" />
+    <command value="start" />
+    <node-interpreter value="project" />
+    <package-manager value="pnpm" />
+    <envs />
+    <method v="2" />
+  </configuration>
+  <configuration default="false" name="Start Studio Plugin" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/studio-client/apps/main/feedback-hub-adapter-searchmetrics/package.json" />
+    <command value="start" />
+    <node-interpreter value="project" />
+    <package-manager value="pnpm" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/Studio Server Remote Debug.run.xml b/.run/Studio Server Remote Debug.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Studio Server Remote Debug" type="Remote">
+    <option name="USE_SOCKET_TRANSPORT" value="true" />
+    <option name="SERVER_MODE" value="false" />
+    <option name="SHMEM_ADDRESS" />
+    <option name="HOST" value="localhost" />
+    <option name="PORT" value="40005" />
+    <option name="AUTO_RESTART" value="false" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="40005" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/Watch Studio Client .run.xml b/.run/Watch Studio Client .run.xml
@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Watch Studio Client " type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/studio-client/apps/main/feedback-hub-adapter-searchmetrics/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="watch" />
+    </scripts>
+    <arguments value="-- --recursive --skipInitialBuild" />
+    <node-interpreter value="project" />
+    <package-manager value="pnpm" />
+    <envs />
+    <method v="2" />
+  </configuration>
+  <configuration default="false" name="Watch Studio Client " type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/studio-client/apps/main/feedback-hub-adapter-searchmetrics/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="watch" />
+    </scripts>
+    <arguments value="-- --recursive --skipInitialBuild" />
+    <node-interpreter value="project" />
+    <package-manager value="pnpm" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,36 @@
-Changelog
-================================================================================
+# Changelog
 
-1.0.0
---------------------------------------------------------------------------------
+## 3.0.0
+- Version Upgrades
+  - Java 17
+  - Node 20
+  - PNPM 8.15
+- Compatible CoreMedia Content Cloud version: `2404.1`
 
-### Switch from Extensions to Plugin architecture
+## 2.0.4
+- fix common beans dependency
+- Compatible CoreMedia Content Cloud version: `2310.1`
 
-Suitable for CMCC 2101 and newer. 
+## 2.0.3
+- Version upgrades
+  - Node 18
+  - PNPM 8.6
+- Compatible CoreMedia Content Cloud version: `2310.1`
+
+## 2.0.2
+- Fixes for keywords section
+- Compatible CoreMedia Content Cloud version: `2307.1`
+
+## 2.0.1
+- Minor fixes and improvements
+- Compatible CoreMedia Content Cloud version: `2307.1`
+
+## 2.0.0
+- Switch from Extensions to Plugin architecture
+- Use jobs framework for backend communication
+- Compatible CoreMedia Content Cloud version: `2110.1`
+
+## 1.0.0 (2001.1-1)
+- Initial Release
+- Compatible CoreMedia Content Cloud version: `2001.1`
 
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![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=2207&label=CoreMedia%20Content%20Cloud&style=for-the-badge&labelColor=666666&color=672779 
+![CoreMedia Content Cloud Version](https://img.shields.io/static/v1?message=2401&label=CoreMedia%20Content%20Cloud&style=for-the-badge&labelColor=666666&color=672779 
 "This badge shows the CoreMedia version(s) 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."
 )

diff --git a/feedback-hub-searchmetrics-lib/pom.xml b/feedback-hub-searchmetrics-lib/pom.xml
@@ -5,19 +5,19 @@
 
   <groupId>com.coremedia.labs.plugins</groupId>
   <artifactId>feedback-hub-searchmetrics-lib</artifactId>
-  <version>2.0.5-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>Lib for Feedback Hub's Searchmetrics Adapter</description>
 
 
   <properties>
-    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <cm.studio-server.core.version>2310.1</cm.studio-server.core.version>
-    <cm.common.core.version>2310.1</cm.common.core.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <cm.studio-server.core.version>2404.1</cm.studio-server.core.version>
+    <cm.common.core.version>2404.1</cm.common.core.version>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <repositories>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>com.coremedia.labs.plugins</groupId>
   <artifactId>feedback-hub-adapter-searchmetrics</artifactId>
-  <version>2.0.5-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>attach-sources</id>

diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup
diff --git a/studio-client/apps/main/feedback-hub-adapter-searchmetrics/package.json b/studio-client/apps/main/feedback-hub-adapter-searchmetrics/package.json
@@ -2,26 +2,26 @@
   "name": "@coremedia-labs/studio-client.main.feedback-hub-adapter-searchmetrics",
   "author": "CoreMedia GmbH",
   "license": "CoreMedia Open Source License",
-  "version": "2.0.5-SNAPSHOT",
+  "version": "3.0.0-SNAPSHOT",
   "private": true,
   "dependencies": {
-    "@coremedia/studio-client.cap-rest-client": "2207.1.0",
-    "@coremedia/studio-client.cap-rest-client-impl": "2207.1.0",
-    "@coremedia/studio-client.client-core": "2207.1.0",
-    "@coremedia/studio-client.client-core-impl": "2207.1.0",
-    "@coremedia/studio-client.core-icons": "2207.1.0",
-    "@coremedia/studio-client.ext.ui-components": "2207.1.0",
-    "@coremedia/studio-client.main.editor-components": "2207.1.0",
-    "@coremedia/studio-client.main.feedback-hub-editor-components": "2207.1.0",
-    "@jangaroo/ext-ts": "^1.0.3",
-    "@jangaroo/runtime": "^1.0.3"
+    "@coremedia/studio-client.cap-rest-client": "2404.1.0",
+    "@coremedia/studio-client.cap-rest-client-impl": "2404.1.0",
+    "@coremedia/studio-client.client-core": "2404.1.0",
+    "@coremedia/studio-client.client-core-impl": "2404.1.0",
+    "@coremedia/studio-client.core-icons": "2404.1.0",
+    "@coremedia/studio-client.ext.ui-components": "2404.1.0",
+    "@coremedia/studio-client.main.editor-components": "2404.1.0",
+    "@coremedia/studio-client.main.feedback-hub-editor-components": "2404.1.0",
+    "@jangaroo/ext-ts": "^2.0.0",
+    "@jangaroo/runtime": "^3.0.0"
   },
   "devDependencies": {
-    "@jangaroo/build": "^1.1.3",
-    "@jangaroo/core": "^1.1.3",
-    "@jangaroo/publish": "^1.1.3",
-    "@jangaroo/run": "^1.1.3",
-    "eslint": "7.27.0",
+    "@jangaroo/build": "^3.0.0",
+    "@jangaroo/core": "^3.0.0",
+    "@jangaroo/publish": "^3.0.0",
+    "@jangaroo/run": "^3.0.0",
+    "eslint": "^8.56.0",
     "rimraf": "^3.0.2"
   },
   "scripts": {

diff --git a/studio-client/apps/main/feedback-hub-adapter-searchmetrics/src/tsconfig.json b/studio-client/apps/main/feedback-hub-adapter-searchmetrics/src/tsconfig.json
@@ -5,7 +5,6 @@
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "../dist/src",
-    "moduleResolution": "nodenext",
     "types": [
       "@coremedia/studio-client.client-core",
       "@coremedia/studio-client.main.editor-components",

diff --git a/studio-client/package.json b/studio-client/package.json
@@ -3,14 +3,14 @@
   "version": "1.0.0-SNAPSHOT",
   "private": true,
   "engines": {
-    "node": "18",
-    "pnpm": "^8.6"
+    "node": "20",
+    "pnpm": "^8.15"
   },
   "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": "^7.32.0",
     "eslint-plugin-import": "2.23.4",
     "eslint-plugin-jsdoc": "35.1.2",
     "eslint-plugin-unused-imports": "1.1.4"