diff --git a/.github/workflows/publish-demos.yml b/.github/workflows/publish-demos.yml index 5016011b..62bc2c89 100644 --- a/.github/workflows/publish-demos.yml +++ b/.github/workflows/publish-demos.yml @@ -17,7 +17,7 @@ on: required: true env: - VERSION: 1.0.0 + VERSION: 1.1.0-next jobs: check-version: diff --git a/.github/workflows/reusable-docker.yml b/.github/workflows/reusable-docker.yml index 67368e57..7f5dfd03 100644 --- a/.github/workflows/reusable-docker.yml +++ b/.github/workflows/reusable-docker.yml @@ -19,7 +19,7 @@ on: required: true env: - VERSION: 1.0.0 + VERSION: 1.1.0-next jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index 318ce24d..29a362cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog - +## [1.1.0] - estimated 2025-02 ## [1.0.0] - 2024-11-29 diff --git a/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile b/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile index b4e168f1..454d8f73 100644 --- a/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile +++ b/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile @@ -2,9 +2,9 @@ FROM node:18-bullseye-slim as build-stage # Copy and unzip the vsix file RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* -COPY theia-cloud-monitor-1.0.0.vsix /tmp/theia-cloud-monitor.vsix +COPY theia-cloud-monitor-1.1.0-next.vsix /tmp/theia-cloud-monitor.vsix RUN mkdir /tmp/extracted && unzip /tmp/theia-cloud-monitor.vsix -d /tmp/extracted -FROM theiacloud/theia-cloud-demo:1.0.0 as production-stage +FROM theiacloud/theia-cloud-demo:1.1.0-next as production-stage COPY --chown=theia:theia --from=build-stage /tmp/extracted /home/theia/plugins \ No newline at end of file diff --git a/demo/dockerfiles/demo-theia-monitor-vscode/theia-cloud-monitor-1.0.0.vsix b/demo/dockerfiles/demo-theia-monitor-vscode/theia-cloud-monitor-1.1.0-next.vsix similarity index 99% rename from demo/dockerfiles/demo-theia-monitor-vscode/theia-cloud-monitor-1.0.0.vsix rename to demo/dockerfiles/demo-theia-monitor-vscode/theia-cloud-monitor-1.1.0-next.vsix index 88720d20..80f934a7 100644 Binary files a/demo/dockerfiles/demo-theia-monitor-vscode/theia-cloud-monitor-1.0.0.vsix and b/demo/dockerfiles/demo-theia-monitor-vscode/theia-cloud-monitor-1.1.0-next.vsix differ diff --git a/dockerfiles/conversion-webhook/Dockerfile b/dockerfiles/conversion-webhook/Dockerfile index 709c2ac6..a5b8cc2b 100644 --- a/dockerfiles/conversion-webhook/Dockerfile +++ b/dockerfiles/conversion-webhook/Dockerfile @@ -12,7 +12,7 @@ RUN cd /conversion/common/maven-conf && \ FROM eclipse-temurin:17-jre-alpine WORKDIR /conversion -COPY --from=builder /conversion/conversion/org.eclipse.theia.cloud.conversion/target/conversion-webhook-1.0.0-runner.jar . +COPY --from=builder /conversion/conversion/org.eclipse.theia.cloud.conversion/target/conversion-webhook-1.1.0-SNAPSHOT-runner.jar . -ENTRYPOINT java -jar ./conversion-webhook-1.0.0-runner.jar +ENTRYPOINT java -jar ./conversion-webhook-1.1.0-SNAPSHOT-runner.jar CMD [ "" ] \ No newline at end of file diff --git a/dockerfiles/operator/Dockerfile b/dockerfiles/operator/Dockerfile index aa4fd991..2437407d 100644 --- a/dockerfiles/operator/Dockerfile +++ b/dockerfiles/operator/Dockerfile @@ -17,7 +17,7 @@ RUN mkdir /templates WORKDIR /log-config COPY java/operator/org.eclipse.theia.cloud.defaultoperator/log4j2.xml . WORKDIR /operator -COPY --from=builder /operator/operator/org.eclipse.theia.cloud.defaultoperator/target/defaultoperator-1.0.0-jar-with-dependencies.jar . +COPY --from=builder /operator/operator/org.eclipse.theia.cloud.defaultoperator/target/defaultoperator-1.1.0-SNAPSHOT-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", "./defaultoperator-1.0.0-jar-with-dependencies.jar" ] +ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./defaultoperator-1.1.0-SNAPSHOT-jar-with-dependencies.jar" ] CMD [ "" ] diff --git a/dockerfiles/operator/Dockerfile.withcache b/dockerfiles/operator/Dockerfile.withcache index c389ea85..ec3d4e5f 100644 --- a/dockerfiles/operator/Dockerfile.withcache +++ b/dockerfiles/operator/Dockerfile.withcache @@ -18,7 +18,7 @@ RUN mkdir /templates WORKDIR /log-config COPY java/operator/org.eclipse.theia.cloud.defaultoperator/log4j2.xml . WORKDIR /operator -COPY --from=builder /operator/operator/org.eclipse.theia.cloud.defaultoperator/target/defaultoperator-1.0.0-jar-with-dependencies.jar . +COPY --from=builder /operator/operator/org.eclipse.theia.cloud.defaultoperator/target/defaultoperator-1.1.0-SNAPSHOT-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", "./defaultoperator-1.0.0-jar-with-dependencies.jar" ] +ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./defaultoperator-1.1.0-SNAPSHOT-jar-with-dependencies.jar" ] CMD [ "" ] diff --git a/dockerfiles/service/Dockerfile b/dockerfiles/service/Dockerfile index b4d05e29..d0dd2d96 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-1.0.0-runner.jar . +COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-1.1.0-SNAPSHOT-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-1.0.0-runner.jar + -jar ./service-1.1.0-SNAPSHOT-runner.jar CMD [ "" ] \ No newline at end of file diff --git a/dockerfiles/service/Dockerfile.withcache b/dockerfiles/service/Dockerfile.withcache index 330f6623..baf4887a 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-1.0.0-runner.jar . +COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-1.1.0-SNAPSHOT-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-1.0.0-runner.jar + -jar ./service-1.1.0-SNAPSHOT-runner.jar CMD [ "" ] \ No newline at end of file diff --git a/documentation/openapi.json b/documentation/openapi.json index 84b5b94e..c310e801 100644 --- a/documentation/openapi.json +++ b/documentation/openapi.json @@ -2,7 +2,7 @@ "openapi": "3.0.3", "info": { "title": "Theia Cloud API", - "version": "1.0.0" + "version": "1.1.0" }, "paths": { "/service": { diff --git a/java/common/maven-conf/pom.xml b/java/common/maven-conf/pom.xml index 8dff5374..1a07f2e1 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 - 1.0.0 + 1.1.0-SNAPSHOT pom Theia Cloud Maven Configuration Common properties and configuration diff --git a/java/common/org.eclipse.theia.cloud.common/pom.xml b/java/common/org.eclipse.theia.cloud.common/pom.xml index 1fb06342..1ce06d4e 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 - 1.0.0 + 1.1.0-SNAPSHOT ../../common/maven-conf/ diff --git a/java/conversion/org.eclipse.theia.cloud.conversion/README.md b/java/conversion/org.eclipse.theia.cloud.conversion/README.md index 2aec4f5e..749188e9 100644 --- a/java/conversion/org.eclipse.theia.cloud.conversion/README.md +++ b/java/conversion/org.eclipse.theia.cloud.conversion/README.md @@ -49,7 +49,7 @@ Or, if you don't have GraalVM installed, you can run the native executable build ./mvnw package -Pnative -Dquarkus.native.container-build=true ``` -You can then execute your native executable with: `./target/conversion-webhook-1.0.0-runner` +You can then execute your native executable with: `./target/conversion-webhook-1.1.0-SNAPSHOT-runner` If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling. diff --git a/java/conversion/org.eclipse.theia.cloud.conversion/pom.xml b/java/conversion/org.eclipse.theia.cloud.conversion/pom.xml index c3309395..e6d399c2 100644 --- a/java/conversion/org.eclipse.theia.cloud.conversion/pom.xml +++ b/java/conversion/org.eclipse.theia.cloud.conversion/pom.xml @@ -9,7 +9,7 @@ org.eclipse.theia.cloud conf - 1.0.0 + 1.1.0-SNAPSHOT ../../common/maven-conf/ @@ -45,7 +45,7 @@ org.eclipse.theia.cloud common - 1.0.0 + 1.1.0-SNAPSHOT diff --git a/java/operator/README.md b/java/operator/README.md index 778d094f..f1e7c88c 100644 --- a/java/operator/README.md +++ b/java/operator/README.md @@ -15,7 +15,7 @@ This project implements the default Kubernetes Operator for Theia Cloud. ```sh mvn clean install -java -jar target/defaultoperator-1.0.0-jar-with-dependencies.jar +java -jar target/defaultoperator-1.1.0-SNAPSHOT-jar-with-dependencies.jar ``` #### Debugging the Default Theia Cloud Operator diff --git a/java/operator/org.eclipse.theia.cloud.defaultoperator/pom.xml b/java/operator/org.eclipse.theia.cloud.defaultoperator/pom.xml index f72a494e..8f00dafc 100644 --- a/java/operator/org.eclipse.theia.cloud.defaultoperator/pom.xml +++ b/java/operator/org.eclipse.theia.cloud.defaultoperator/pom.xml @@ -11,7 +11,7 @@ org.eclipse.theia.cloud conf - 1.0.0 + 1.1.0-SNAPSHOT ../../common/maven-conf/ @@ -19,12 +19,12 @@ org.eclipse.theia.cloud operator - 1.0.0 + 1.1.0-SNAPSHOT org.eclipse.theia.cloud common - 1.0.0 + 1.1.0-SNAPSHOT org.json diff --git a/java/operator/org.eclipse.theia.cloud.operator/pom.xml b/java/operator/org.eclipse.theia.cloud.operator/pom.xml index b9104d92..82019da9 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 - 1.0.0 + 1.1.0-SNAPSHOT ../../common/maven-conf/ @@ -19,7 +19,7 @@ org.eclipse.theia.cloud common - 1.0.0 + 1.1.0-SNAPSHOT org.json diff --git a/java/service/org.eclipse.theia.cloud.service/README.md b/java/service/org.eclipse.theia.cloud.service/README.md index 292e70db..27227c2c 100644 --- a/java/service/org.eclipse.theia.cloud.service/README.md +++ b/java/service/org.eclipse.theia.cloud.service/README.md @@ -58,7 +58,7 @@ Or, if you don't have GraalVM installed, you can run the native executable build ./mvnw package -Pnative -Dquarkus.native.container-build=true ``` -You can then execute your native executable with: `./target/service-1.0.0-runner` +You can then execute your native executable with: `./target/service-1.1.0-SNAPSHOT-runner` If you want to learn more about building native executables, please consult . diff --git a/java/service/org.eclipse.theia.cloud.service/pom.xml b/java/service/org.eclipse.theia.cloud.service/pom.xml index d39f1b7a..07119746 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 - 1.0.0 + 1.1.0-SNAPSHOT ../../common/maven-conf/ @@ -72,7 +72,7 @@ org.eclipse.theia.cloud common - 1.0.0 + 1.1.0-SNAPSHOT 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 8de0f6e1..224a65d4 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 = "1.0.0")) +@OpenAPIDefinition(info = @Info(title = "Theia Cloud API", version = "1.1.0")) public class TheiaCloudApiApplication extends Application { } diff --git a/java/service/org.eclipse.theia.cloud.service/src/main/resources/META-INF/resources/index.html b/java/service/org.eclipse.theia.cloud.service/src/main/resources/META-INF/resources/index.html index 4417388a..ee54eb6e 100644 --- a/java/service/org.eclipse.theia.cloud.service/src/main/resources/META-INF/resources/index.html +++ b/java/service/org.eclipse.theia.cloud.service/src/main/resources/META-INF/resources/index.html @@ -2,7 +2,7 @@ - service - 1.0.0 + service - 1.1.0-SNAPSHOT