0.8.1.MS2

eclipse-theia · Aug 30, 2023 · a6b6388 · a6b6388
1 parent d38952e
commit a6b6388
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 14 deletions.
diff --git a/demo/dockerfiles/demo-theia-monitor-theia/package.json b/demo/dockerfiles/demo-theia-monitor-theia/package.json
@@ -56,7 +56,7 @@
         "@theia/variable-resolver": "^1.34.0",
         "@theia/vsx-registry": "^1.34.0",
         "@theia/workspace": "^1.34.0",
-        "@eclipse-theiacloud/monitor-theia": "0.8.1-alpha.1"
+        "@eclipse-theiacloud/monitor-theia": "0.8.1-alpha.2"
     },
     "devDependencies": {
         "@theia/cli": "^1.34.0"

diff --git a/demo/k8s/appdefinitions/theia.yaml b/demo/k8s/appdefinitions/theia.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: theiacloud
 spec:
   downlinkLimit: 30000
-  image: theiacloud/theia-cloud-demo:0.8.1.OSWeek23-v3
+  image: theiacloud/theia-cloud-demo:0.8.1.MS2
   imagePullPolicy: IfNotPresent
   ingressname: theia-cloud-demo-ws-ingress
   limitsCpu: "2"

diff --git a/doc/docs/Building-Internal.md b/doc/docs/Building-Internal.md
@@ -39,15 +39,13 @@ Build and push the Landing page with:
 ```bash
 docker build -t theiacloud/theia-cloud-landing-page:latest -f dockerfiles/landing-page/Dockerfile .
 docker push theiacloud/theia-cloud-landing-page:latest
-
 ```
 
 Build and push the Try Now page with:
 
 ```bash
 docker build -t theiacloud/theia-cloud-try-now-page:latest -f dockerfiles/try-now-page/Dockerfile .
 docker push theiacloud/theia-cloud-try-now-page:latest
-
 ```
 
 Build and push the Theia.cloud REST service with:

diff --git a/helm/theia.cloud/valuesGKETryNow.yaml b/helm/theia.cloud/valuesGKETryNow.yaml
@@ -8,7 +8,7 @@ issuer:
   email: [email protected]
 
 image:
-  name: theiacloud/theia-cloud-demo:0.8.1.OSWeek23-v3
+  name: theiacloud/theia-cloud-demo:0.8.1.MS2
   pullSecret: ""
   timeoutStrategy: "FIXEDTIME"
   timeoutLimit: "30"
@@ -22,7 +22,7 @@ hosts:
   instance: ws.theia-cloud.io
 
 landingPage:
-  image: theiacloud/theia-cloud-try-now-page:0.8.1.OSWeek23-v3
+  image: theiacloud/theia-cloud-try-now-page:0.8.1.MS2
   appDefinition: "theia-cloud-demo"
   ephemeralStorage: true
   additionalApps:

diff --git 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.8.1.OSWeek23-v3
+  name: theiacloud/theia-cloud-activity-demo:0.8.1.MS2
   pullSecret: ""
   timeoutStrategy: "FIXEDTIME"
   timeoutLimit: "0"
@@ -19,7 +19,7 @@ hosts:
   instance: ws.theia-cloud.io
 
 landingPage:
-  image: theiacloud/theia-cloud-try-now-page:0.8.1.OSWeek23-v3
+  image: theiacloud/theia-cloud-try-now-page:0.8.1.MS2
   appDefinition: "theia-cloud-demo"
   ephemeralStorage: true
 

diff --git 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.8.1.OSWeek23-v3
+  image: theiacloud/theia-cloud-try-now-page:0.8.1.MS2
   imagePullPolicy: Always
   appDefinition: "theia-cloud-demo"
   ephemeralStorage: true

diff --git a/java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.core.resources.prefs b/java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,4 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/java/operator/org.eclipse.theia.cloud.operator/.classpath b/java/operator/org.eclipse.theia.cloud.operator/.classpath
@@ -9,6 +9,7 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
@@ -39,6 +40,13 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="target/generated-sources/annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>

diff --git a/node/monitor-theia/package.json b/node/monitor-theia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-theiacloud/monitor-theia",
-  "version": "0.8.1-alpha.1",
+  "version": "0.8.1-alpha.2",
   "keywords": [
     "theia-extension"
   ],

diff --git 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.8.1.OSWeek23-v3
+  name: theiacloud/theia-cloud-demo:0.8.1.MS2
   pullSecret: ""
   timeoutStrategy: "FIXEDTIME"
   timeoutLimit: "30"
@@ -19,7 +19,7 @@ hosts:
     instance: instances
 
 landingPage:
-  image: theiacloud/theia-cloud-landing-page:0.8.1.OSWeek23-v3
+  image: theiacloud/theia-cloud-landing-page:0.8.1.MS2
   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
@@ -77,7 +77,7 @@ resource "helm_release" "theia-cloud" {
 
   set {
     name  = "image.name"
-    value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.8.1.OSWeek23-v1" : "theiacloud/theia-cloud-activity-demo-theia:0.8.1.OSWeek23-v1"
+    value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.8.1.MS2" : "theiacloud/theia-cloud-activity-demo-theia:0.8.1.MS2"
   }
 
   set {
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,7 +77,7 @@ resource "helm_release" "theia-cloud" { @@
       set {
         name  = "image.name"
-        value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.8.1.OSWeek23-v1" : "theiacloud/theia-cloud-activity-demo-theia:0.8.1.OSWeek23-v1"
+        value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.8.1.MS2" : "theiacloud/theia-cloud-activity-demo-theia:0.8.1.MS2"
       }
       set {
@@ Expand Down @@