Theia 1.33.0

Disable java

Do not update vscode-uri yet, because theia does not support vscode-uri 3 currently, so we have to keep our patch.

See merge request !1315

component/theia/buildout.cfg

 [buildout]
 extends =
-  ../java-jdk/buildout.cfg
   ../libsecret/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../patchelf/buildout.cfg
@@ -144,8 +143,7 @@ content =
                       "editor.tabSize": 2,
                       "plantuml.server": "https://plantuml.host.vifib.net/svg/",
                       "plantuml.render": "PlantUMLServer",
-                      "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }],
-                      "java.home": "${java-jdk:location}"
+                      "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }]
                   },
                   "warnOnPotentiallyInsecureHostPattern": false
               }

component/theia/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 8157c22134200bd862a07c6521ebf799
 
 [yarn.lock]
 _update_hash_filename_ = yarn.lock
-md5sum = d3fae8f0a2c911611d96a5dd870674c6
+md5sum = ff5b37cac09580b885e6d269f62cdbad
 
 [ms-python-disable-jedi-buildout.patch]
 _update_hash_filename_ = ms-python-disable-jedi-buildout.patch

component/theia/generate_download_plugins_cfg.py

 import configparser
+import logging
 import requests
 import hashlib
 
 urls = []
+session = requests.Session()
+timeout = 30
+logger = logging.getLogger()
+logging.basicConfig(level=logging.DEBUG)
 
 for plugin_and_version in '''\
     vscode/bat/latest
@@ -83,9 +88,6 @@ for plugin_and_version in '''\
     ms-vscode/references-view/latest
 # golang.Go removed because it overwrites the PATH in theia shell
 # golang/Go/0.16.2
-    vscjava/vscode-java-debug/0.29.0
-    redhat/java/0.61.0
-    vscjava/vscode-java-test/0.26.0
     ms-python/python/2020.10.332292344
     perrinjerome/vscode-zc-buildout/latest
     jebbs/plantuml/2.14.0
@@ -99,8 +101,9 @@ for plugin_and_version in '''\
   publisher, extension_name, version = plugin_and_version.split('/')
 
   api_url = f'https://open-vsx.org/api/{publisher}/{extension_name}/{version}'
-  download_url = requests.get(api_url).json()['files']['download']
-  md5sum = hashlib.md5(requests.get(download_url).content).hexdigest()
+  logger.info(plugin_and_version)
+  download_url = session.get(api_url, timeout=timeout).json()['files']['download']
+  md5sum = hashlib.md5(session.get(download_url, timeout=timeout).content).hexdigest()
   urls.append(f'{publisher}-{extension_name} {download_url} {md5sum}')
 
 cfg = configparser.ConfigParser()

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = 3d00572afdd311ba8b4fc8b6ad0ac4b6
+md5sum = bd79a9e6306b321414b9f83524308e5f
 
 [instance]
 _update_hash_filename_ = instance.cfg.in

software/theia/instance-theia.cfg.jinja.in

@@ -360,7 +360,7 @@ output = $${directory:bin}/$${:_buildout_section_name_}
 inline =
   #!/bin/sh
   export HOME=$${directory:home}
-  export PATH=${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
+  export PATH=${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
   export IPV6_SLAPRUNNER={{ ipv6_random }}
 
 # Theia Backend