diff --git a/.github/workflows/reusable-demo.yml b/.github/workflows/reusable-demo.yml index e9192988..e0dbc357 100644 --- a/.github/workflows/reusable-demo.yml +++ b/.github/workflows/reusable-demo.yml @@ -26,7 +26,7 @@ on: required: true env: - VERSION: 0.9.1 + VERSION: 0.9.2 jobs: publish-next: diff --git a/.github/workflows/reusable-docker.yml b/.github/workflows/reusable-docker.yml index 46ebb9c2..d6a8e4a0 100644 --- a/.github/workflows/reusable-docker.yml +++ b/.github/workflows/reusable-docker.yml @@ -19,7 +19,7 @@ on: required: true env: - VERSION: 0.9.1 + VERSION: 0.9.2 jobs: build: diff --git a/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile b/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile index 2d88e2bd..4967280d 100644 --- a/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile +++ b/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile @@ -1,3 +1,3 @@ -FROM theiacloud/theia-cloud-demo:0.9.1 as production-stage +FROM theiacloud/theia-cloud-demo:0.9.2 as production-stage -COPY --chown=theia:theia theiacloud-monitor-0.9.1.vsix /home/theia/plugins \ No newline at end of file +COPY --chown=theia:theia theiacloud-monitor-0.9.2.vsix /home/theia/plugins \ No newline at end of file diff --git a/dockerfiles/operator/Dockerfile b/dockerfiles/operator/Dockerfile index 72d5e97c..cf4c2ed7 100644 --- a/dockerfiles/operator/Dockerfile +++ b/dockerfiles/operator/Dockerfile @@ -15,7 +15,7 @@ RUN mkdir /templates WORKDIR /log-config COPY java/operator/org.eclipse.theia.cloud.operator/log4j2.xml . WORKDIR /operator -COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.9.1-jar-with-dependencies.jar . +COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.9.2-jar-with-dependencies.jar . # to get more debug information from the kubernetes client itself, add -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG below -ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.1-jar-with-dependencies.jar" ] +ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.2-jar-with-dependencies.jar" ] CMD [ "" ] diff --git a/dockerfiles/operator/Dockerfile.withcache b/dockerfiles/operator/Dockerfile.withcache index 3d8356db..319a397e 100644 --- a/dockerfiles/operator/Dockerfile.withcache +++ b/dockerfiles/operator/Dockerfile.withcache @@ -16,7 +16,7 @@ RUN mkdir /templates WORKDIR /log-config COPY java/operator/org.eclipse.theia.cloud.operator/log4j2.xml . WORKDIR /operator -COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.9.1-jar-with-dependencies.jar . +COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.9.2-jar-with-dependencies.jar . # to get more debug information from the kubernetes client itself, add -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG below -ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.1-jar-with-dependencies.jar" ] +ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.2-jar-with-dependencies.jar" ] CMD [ "" ] diff --git a/dockerfiles/service/Dockerfile b/dockerfiles/service/Dockerfile index 67fec817..83a9cc41 100644 --- a/dockerfiles/service/Dockerfile +++ b/dockerfiles/service/Dockerfile @@ -12,7 +12,7 @@ RUN cd /service/common/maven-conf && \ FROM eclipse-temurin:17-jre-alpine WORKDIR /service -COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.1-runner.jar . +COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.2-runner.jar . ENV APPID default-app-id ENV SERVICE_PORT 8081 @@ -29,5 +29,5 @@ ENTRYPOINT java -Dtheia.cloud.app.id=${APPID} \ -Dquarkus.oidc.auth-server-url=${KEYCLOAK_SERVERURL} \ -Dquarkus.oidc.client-id=${KEYCLOAK_CLIENTID} \ -Dquarkus.oidc.credentials.secret=${KEYCLOAK_CLIENTSECRET} \ - -jar ./service-0.9.1-runner.jar + -jar ./service-0.9.2-runner.jar CMD [ "" ] \ No newline at end of file diff --git a/dockerfiles/service/Dockerfile.withcache b/dockerfiles/service/Dockerfile.withcache index 95cf2a52..cabfad85 100644 --- a/dockerfiles/service/Dockerfile.withcache +++ b/dockerfiles/service/Dockerfile.withcache @@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/root/.m2 \ FROM eclipse-temurin:17-jre-alpine WORKDIR /service -COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.1-runner.jar . +COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.2-runner.jar . ENV APPID default-app-id ENV SERVICE_PORT 8081 @@ -30,5 +30,5 @@ ENTRYPOINT java -Dtheia.cloud.app.id=${APPID} \ -Dquarkus.oidc.auth-server-url=${KEYCLOAK_SERVERURL} \ -Dquarkus.oidc.client-id=${KEYCLOAK_CLIENTID} \ -Dquarkus.oidc.credentials.secret=${KEYCLOAK_CLIENTSECRET} \ - -jar ./service-0.9.1-runner.jar + -jar ./service-0.9.2-runner.jar CMD [ "" ] \ No newline at end of file diff --git a/helm/theia.cloud/valuesGKETryNow.yaml b/helm/theia.cloud/valuesGKETryNow.yaml index 5ec29868..cc2bfc9f 100644 --- a/helm/theia.cloud/valuesGKETryNow.yaml +++ b/helm/theia.cloud/valuesGKETryNow.yaml @@ -8,7 +8,7 @@ issuer: email: jfaltermeier@eclipsesource.com image: - name: theiacloud/theia-cloud-demo:0.9.1 + name: theiacloud/theia-cloud-demo:0.9.2 pullSecret: "" timeoutStrategy: "FIXEDTIME" timeoutLimit: "30" @@ -22,7 +22,7 @@ hosts: instance: ws.theia-cloud.io landingPage: - image: theiacloud/theia-cloud-try-now-page:0.9.1 + image: theiacloud/theia-cloud-try-now-page:0.9.2 appDefinition: "theia-cloud-demo" ephemeralStorage: true additionalApps: diff --git a/helm/theia.cloud/valuesMonitor.yaml b/helm/theia.cloud/valuesMonitor.yaml index b9ed0c30..3979be33 100644 --- a/helm/theia.cloud/valuesMonitor.yaml +++ b/helm/theia.cloud/valuesMonitor.yaml @@ -5,7 +5,7 @@ app: name: Theia Blueprint image: - name: theiacloud/theia-cloud-activity-demo:0.9.1 + name: theiacloud/theia-cloud-activity-demo:0.9.2 pullSecret: "" timeoutStrategy: "FIXEDTIME" timeoutLimit: "0" @@ -19,7 +19,7 @@ hosts: instance: ws.theia-cloud.io landingPage: - image: theiacloud/theia-cloud-try-now-page:0.9.1 + image: theiacloud/theia-cloud-try-now-page:0.9.2 appDefinition: "theia-cloud-demo" ephemeralStorage: true diff --git a/helm/theia.cloud/valuesTestTrynowPage.yaml b/helm/theia.cloud/valuesTestTrynowPage.yaml index beaaa70e..1da80dc2 100644 --- a/helm/theia.cloud/valuesTestTrynowPage.yaml +++ b/helm/theia.cloud/valuesTestTrynowPage.yaml @@ -15,7 +15,7 @@ hosts: instance: ws.192.168.39.3.nip.io landingPage: - image: theiacloud/theia-cloud-try-now-page:0.9.1 + image: theiacloud/theia-cloud-try-now-page:0.9.2 imagePullPolicy: Always appDefinition: "theia-cloud-demo" ephemeralStorage: true diff --git a/java/common/maven-conf/pom.xml b/java/common/maven-conf/pom.xml index b979390f..ce51c8fe 100644 --- a/java/common/maven-conf/pom.xml +++ b/java/common/maven-conf/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.theia.cloud conf - 0.9.1 + 0.9.2 pom Theia.Cloud Maven Configuration Common properties and configuration diff --git a/java/common/org.eclipse.theia.cloud.common/.classpath b/java/common/org.eclipse.theia.cloud.common/.classpath index a4867212..ccadceaf 100644 --- a/java/common/org.eclipse.theia.cloud.common/.classpath +++ b/java/common/org.eclipse.theia.cloud.common/.classpath @@ -47,15 +47,18 @@ - + + + + + - + - diff --git a/java/common/org.eclipse.theia.cloud.common/pom.xml b/java/common/org.eclipse.theia.cloud.common/pom.xml index bbe3cf45..9fe5249e 100644 --- a/java/common/org.eclipse.theia.cloud.common/pom.xml +++ b/java/common/org.eclipse.theia.cloud.common/pom.xml @@ -11,7 +11,7 @@ org.eclipse.theia.cloud conf - 0.9.1 + 0.9.2 ../../common/maven-conf/ diff --git a/java/operator/org.eclipse.theia.cloud.operator/.classpath b/java/operator/org.eclipse.theia.cloud.operator/.classpath index 500470e2..3e003b8a 100644 --- a/java/operator/org.eclipse.theia.cloud.operator/.classpath +++ b/java/operator/org.eclipse.theia.cloud.operator/.classpath @@ -47,15 +47,18 @@ - + + + + + - + - diff --git a/java/operator/org.eclipse.theia.cloud.operator/.settings/org.eclipse.jdt.core.prefs b/java/operator/org.eclipse.theia.cloud.operator/.settings/org.eclipse.jdt.core.prefs index 9dec138c..07efbb2f 100644 --- a/java/operator/org.eclipse.theia.cloud.operator/.settings/org.eclipse.jdt.core.prefs +++ b/java/operator/org.eclipse.theia.cloud.operator/.settings/org.eclipse.jdt.core.prefs @@ -33,7 +33,7 @@ org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=javax.annotation.ParametersAreNonnullByDefault org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullable.secondary= diff --git a/java/operator/org.eclipse.theia.cloud.operator/pom.xml b/java/operator/org.eclipse.theia.cloud.operator/pom.xml index 35525e23..ee1d68be 100644 --- a/java/operator/org.eclipse.theia.cloud.operator/pom.xml +++ b/java/operator/org.eclipse.theia.cloud.operator/pom.xml @@ -11,7 +11,7 @@ org.eclipse.theia.cloud conf - 0.9.1 + 0.9.2 ../../common/maven-conf/ @@ -23,7 +23,7 @@ org.eclipse.theia.cloud common - 0.9.1 + 0.9.2 org.json diff --git a/java/service/org.eclipse.theia.cloud.service/.classpath b/java/service/org.eclipse.theia.cloud.service/.classpath index 8d5ff525..ea7819cc 100644 --- a/java/service/org.eclipse.theia.cloud.service/.classpath +++ b/java/service/org.eclipse.theia.cloud.service/.classpath @@ -40,11 +40,6 @@ - - - - - @@ -56,6 +51,14 @@ + + + + + + + + diff --git a/java/service/org.eclipse.theia.cloud.service/pom.xml b/java/service/org.eclipse.theia.cloud.service/pom.xml index 93898d69..f024c9bf 100644 --- a/java/service/org.eclipse.theia.cloud.service/pom.xml +++ b/java/service/org.eclipse.theia.cloud.service/pom.xml @@ -9,7 +9,7 @@ org.eclipse.theia.cloud conf - 0.9.1 + 0.9.2 ../../common/maven-conf/ @@ -72,7 +72,7 @@ org.eclipse.theia.cloud common - 0.9.1 + 0.9.2 io.fabric8 diff --git a/java/service/org.eclipse.theia.cloud.service/src/main/java/org/eclipse/theia/cloud/service/TheiaCloudApiApplication.java b/java/service/org.eclipse.theia.cloud.service/src/main/java/org/eclipse/theia/cloud/service/TheiaCloudApiApplication.java index 2808d602..6461ec0e 100644 --- a/java/service/org.eclipse.theia.cloud.service/src/main/java/org/eclipse/theia/cloud/service/TheiaCloudApiApplication.java +++ b/java/service/org.eclipse.theia.cloud.service/src/main/java/org/eclipse/theia/cloud/service/TheiaCloudApiApplication.java @@ -20,6 +20,6 @@ import jakarta.ws.rs.core.Application; -@OpenAPIDefinition(info = @Info(title = "Theia.cloud API", version = "0.9.1")) +@OpenAPIDefinition(info = @Info(title = "Theia.cloud API", version = "0.9.2")) public class TheiaCloudApiApplication extends Application { } diff --git a/node/common/package.json b/node/common/package.json index e5915737..ffb13d7d 100644 --- a/node/common/package.json +++ b/node/common/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-theiacloud/common", - "version": "0.9.1", + "version": "0.9.2", "description": "Common functionality for Theia.cloud", "license": "EPL-2.0", "keywords": [ diff --git a/node/landing-page/package.json b/node/landing-page/package.json index e76fd24f..d100ce4c 100644 --- a/node/landing-page/package.json +++ b/node/landing-page/package.json @@ -9,7 +9,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@eclipse-theiacloud/common": "0.9.1", + "@eclipse-theiacloud/common": "0.9.2", "@types/uuid": "^8.3.2", "axios": "^0.25.0", "core-js": "^3.6.5", diff --git a/node/monitor-theia/package.json b/node/monitor-theia/package.json index ed2a9dad..a5fdb98e 100644 --- a/node/monitor-theia/package.json +++ b/node/monitor-theia/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-theiacloud/monitor-theia", - "version": "0.9.1", + "version": "0.9.2", "keywords": [ "theia-extension" ], diff --git a/node/monitor/package.json b/node/monitor/package.json index 5532c4dd..9f3ed1d4 100644 --- a/node/monitor/package.json +++ b/node/monitor/package.json @@ -2,7 +2,7 @@ "name": "theiacloud-monitor", "displayName": "Theia.cloud Monitor extension", "description": "Monitor for Theia.cloud hosted tools", - "version": "0.9.1", + "version": "0.9.2", "license": "EPL-2.0", "author": { "name": "Theia.cloud" diff --git a/node/package-lock.json b/node/package-lock.json index 84b3f6c9..e2ee683a 100644 --- a/node/package-lock.json +++ b/node/package-lock.json @@ -36,7 +36,7 @@ }, "common": { "name": "@eclipse-theiacloud/common", - "version": "0.9.1", + "version": "0.9.2", "license": "EPL-2.0", "dependencies": { "@types/uuid": "^8.3.4", @@ -47,7 +47,7 @@ "landing-page": { "version": "0.1.0", "dependencies": { - "@eclipse-theiacloud/common": "0.9.1", + "@eclipse-theiacloud/common": "0.9.2", "@types/uuid": "^8.3.2", "axios": "^0.25.0", "core-js": "^3.6.5", @@ -181,7 +181,7 @@ }, "monitor": { "name": "theiacloud-monitor", - "version": "0.9.1", + "version": "0.9.2", "license": "EPL-2.0", "dependencies": { "express": "^4.18.1", @@ -207,7 +207,7 @@ }, "monitor-theia": { "name": "@eclipse-theiacloud/monitor-theia", - "version": "0.9.1", + "version": "0.9.2", "devDependencies": { "rimraf": "^3.0.2" }, @@ -25700,7 +25700,7 @@ "testing-page": { "version": "0.1.0", "dependencies": { - "@eclipse-theiacloud/common": "0.9.1", + "@eclipse-theiacloud/common": "0.9.2", "keycloak-js": "^17.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -25846,7 +25846,7 @@ "try-now-page": { "version": "0.1.0", "dependencies": { - "@eclipse-theiacloud/common": "0.9.1", + "@eclipse-theiacloud/common": "0.9.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^13.5.0", @@ -38204,7 +38204,7 @@ "landing-page": { "version": "file:landing-page", "requires": { - "@eclipse-theiacloud/common": "0.9.1", + "@eclipse-theiacloud/common": "0.9.2", "@types/uuid": "^8.3.2", "@vue/cli-plugin-babel": "~5.0.8", "@vue/cli-plugin-eslint": "~5.0.8", @@ -42909,7 +42909,7 @@ "testing-page": { "version": "file:testing-page", "requires": { - "@eclipse-theiacloud/common": "0.9.1", + "@eclipse-theiacloud/common": "0.9.2", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", @@ -43297,7 +43297,7 @@ "try-now-page": { "version": "file:try-now-page", "requires": { - "@eclipse-theiacloud/common": "0.9.1", + "@eclipse-theiacloud/common": "0.9.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^13.5.0", diff --git a/node/testing-page/package.json b/node/testing-page/package.json index e17bd368..b3d938b6 100644 --- a/node/testing-page/package.json +++ b/node/testing-page/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@eclipse-theiacloud/common": "0.9.1", + "@eclipse-theiacloud/common": "0.9.2", "keycloak-js": "^17.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/node/try-now-page/package.json b/node/try-now-page/package.json index 3d87dc84..14c11166 100644 --- a/node/try-now-page/package.json +++ b/node/try-now-page/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": ".", "dependencies": { - "@eclipse-theiacloud/common": "0.9.1", + "@eclipse-theiacloud/common": "0.9.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^13.5.0", diff --git a/terraform/modules/helm/main.tf b/terraform/modules/helm/main.tf index 26a3e6db..b19d6b01 100644 --- a/terraform/modules/helm/main.tf +++ b/terraform/modules/helm/main.tf @@ -130,7 +130,7 @@ resource "helm_release" "theia-cloud-base" { name = "theia-cloud-base" repository = "https://github.eclipsesource.com/theia-cloud-helm" chart = "theia-cloud-base" - version = "0.9.1" + version = "0.9.2" namespace = "theiacloud" create_namespace = true @@ -145,7 +145,7 @@ resource "helm_release" "theia-cloud-crds" { name = "theia-cloud-crds" repository = "https://github.eclipsesource.com/theia-cloud-helm" chart = "theia-cloud-crds" - version = "0.9.1" + version = "0.9.2" namespace = "theiacloud" create_namespace = true } @@ -229,7 +229,7 @@ resource "helm_release" "theia-cloud" { name = "theia-cloud" repository = "https://github.eclipsesource.com/theia-cloud-helm" chart = "theia-cloud" - version = "0.9.1" + version = "0.9.2" namespace = "theiacloud" create_namespace = true diff --git a/terraform/modules/helm/theia-cloud.yaml b/terraform/modules/helm/theia-cloud.yaml index d71aa2ad..f934799d 100644 --- a/terraform/modules/helm/theia-cloud.yaml +++ b/terraform/modules/helm/theia-cloud.yaml @@ -5,7 +5,7 @@ app: name: Theia Cloud image: - name: theiacloud/theia-cloud-demo:0.9.1 + name: theiacloud/theia-cloud-demo:0.9.2 pullSecret: "" timeoutStrategy: "FIXEDTIME" timeoutLimit: "30" @@ -19,7 +19,7 @@ hosts: instance: instances landingPage: - image: theiacloud/theia-cloud-landing-page:0.9.1 + image: theiacloud/theia-cloud-landing-page:0.9.2 appDefinition: "theia-cloud-demo" ephemeralStorage: false diff --git a/terraform/test-configurations/2-02_monitor/theia_cloud.tf b/terraform/test-configurations/2-02_monitor/theia_cloud.tf index a9cab3bb..1bc96ddd 100644 --- a/terraform/test-configurations/2-02_monitor/theia_cloud.tf +++ b/terraform/test-configurations/2-02_monitor/theia_cloud.tf @@ -77,7 +77,7 @@ resource "helm_release" "theia-cloud" { set { name = "image.name" - value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.9.1" : "theiacloud/theia-cloud-activity-demo-theia:0.9.1" + value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.9.2" : "theiacloud/theia-cloud-activity-demo-theia:0.9.2" } set {