Merge pull request #314 from modelix/fix/modelix-1030

MODELIX-1030: Remove rest-api-model-ql
modelix · Oct 28, 2024 · f270cec · f270cec
2 parents 512198a + 8f91548
commit f270cec
Show file tree

Hide file tree

Showing 21 changed files with 2,042 additions and 817 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -22,7 +22,7 @@ services:
 
   model-server-empty:
     # Keep the version in sync with the modelix version in gradle/libs.versions.toml
-    image: modelix/model-server:8.20.0
+    image: modelix/model-server:9.1.0
     container_name: ${COMPOSE_PROJECT_NAME}-model-server-empty
     profiles:
       - useCase1
@@ -32,7 +32,7 @@ services:
 
   model-server:
     # Keep the version in sync with the modelix version in gradle/libs.versions.toml
-    image: modelix/model-server:8.20.0
+    image: modelix/model-server:9.1.0
     container_name: ${COMPOSE_PROJECT_NAME}-model-server
     profiles:
       - useCase2
@@ -60,16 +60,6 @@ services:
     environment:
       - MODELIX_CLIENT_SERVER_URI=http://model-server:28101
 
-  # This use case is currently being reworked
-  #  rest-api-model-ql:
-  #    image: modelix/rest-api-model-ql:latest
-  #    container_name: rest-api-model-ql
-  #    profiles:
-  #      - useCase3b
-  #    ports:
-  #      # The dashboard expects our service to be running under 8090.
-  #      - 8090:8080
-
   spa-dashboard-angular:
     container_name: ${COMPOSE_PROJECT_NAME}-spa-dashboard-angular
     image: nginx

diff --git a/docs/global/modules/samples/images/system-diagram-full.svg b/docs/global/modules/samples/images/system-diagram-full.svg
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ mpsGradlePlugin = "1.7.288.4ea765f"
 # * mps/metamodel-api-ts/package.json
 # * spa-management-vue/package.json
 # * spa-overview-angular/package.json
-modelixCore = "8.20.0"
+modelixCore = "9.1.0"
 mpsModelServerSyncPlugin = "2021.2.157"
 
 # backend 1 / SPA
@@ -31,8 +31,6 @@ quarkusPlugin = "2.16.12.Final"
 openapi = "7.5.0"
 kotlin = "2.0.21"
 antJunit = "1.10.15"
-junit = "4.13.2"
-logback = "1.5.11"
 nodeGradle = "7.1.0"
 node = "16.18.0"
 
@@ -46,24 +44,13 @@ itemis-mps-gradle-plugin = { group = "de.itemis.mps", name="mps-gradle-plugin",
 # modelix
 modelix-syncPlugin = { group = "org.modelix.mps", name = "model-server-sync-plugin", version.ref = "mpsModelServerSyncPlugin" }
 modelix-model-server = { group = "org.modelix", name = "model-server", version.ref = "modelixCore" }
-modelix-model-server-api = { group = "org.modelix", name = "model-server-api", version.ref = "modelixCore" }
 modelix-model-client = { group = "org.modelix", name = "model-client", version.ref = "modelixCore" }
-modelix-model-api = { group = "org.modelix", name = "model-api", version.ref = "modelixCore" }
 modelix-model-api-gen-runtime = { group = "org.modelix", name = "model-api-gen-runtime", version.ref = "modelixCore" }
-modelix-light-model-client = { group = "org.modelix", name = "light-model-client", version.ref = "modelixCore" }
 
 # quarkus
 quarkus-bom = { group = "io.quarkus.platform", name = "quarkus-bom", version.ref = "quarkusPlatform" }
 
 # kotlin/ktor
-ktor-server-default-headers = { group = "io.ktor", name = "ktor-server-default-headers", version.ref = "ktor" }
-ktor-server-content-negotiation = { group = "io.ktor", name = "ktor-server-content-negotiation", version.ref = "ktor" }
-ktor-server-auto-head-response = { group = "io.ktor", name = "ktor-server-auto-head-response", version.ref = "ktor" }
-ktor-serialization-gson = { group = "io.ktor", name = "ktor-serialization-gson", version.ref = "ktor" }
-ktor-server-locations = { group = "io.ktor", name = "ktor-server-locations", version.ref = "ktor" }
-ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor" }
-ktor-server-cors = { group = "io.ktor", name = "ktor-server-cors", version.ref = "ktor" }
-ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", version.ref = "ktor" }
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
@@ -72,13 +59,10 @@ ktor-serialization-json = { group = "io.ktor", name = "ktor-serialization-kotlin
 
 # other
 ant-junit = { group = "org.apache.ant", name = "ant-junit", version.ref = "antJunit" }
-junit-junit = { group = "junit", name = "junit", version.ref = "junit" }
-logback-classic = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback" }
 
 
 [plugins]
 # MPS/modelix
-itemis-mps-gradle-common = { id = "de.itemis.mps.gradle.common", version.ref = "mpsBase" }
 modelix-model-api-gen = { id = "org.modelix.model-api-gen", version.ref = "modelixCore" }
 
 # kotlin

diff --git a/mps/metamodel-api-ts/package-lock.json b/mps/metamodel-api-ts/package-lock.json
diff --git a/mps/metamodel-api-ts/package.json b/mps/metamodel-api-ts/package.json
@@ -18,6 +18,6 @@
   "dependencies": {
   },
   "peerDependencies": {
-    "@modelix/ts-model-api": "8.20.0"
+    "@modelix/ts-model-api": "9.1.0"
   }
 }
diff --git a/rest-api-model-ql/build.gradle.kts b/rest-api-model-ql/build.gradle.kts
diff --git a/rest-api-model-ql/src/main/kotlin/org/modelix/sample/restapimodelql/Application.kt b/rest-api-model-ql/src/main/kotlin/org/modelix/sample/restapimodelql/Application.kt