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.

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

MODELIX-1030: Remove rest-api-model-ql #314

Merged
merged 2 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 2 additions & 12 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
1,963 changes: 1,960 additions & 3 deletions docs/global/modules/samples/images/system-diagram-full.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 1 addition & 17 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand All @@ -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" }
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions mps/metamodel-api-ts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mps/metamodel-api-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"dependencies": {
},
"peerDependencies": {
"@modelix/ts-model-api": "8.20.0"
"@modelix/ts-model-api": "9.1.0"
}
}
79 changes: 0 additions & 79 deletions rest-api-model-ql/build.gradle.kts

This file was deleted.

This file was deleted.

Loading
Loading