changes for ol 24.0.0.10

Signed-off-by: Arun Venmany <[email protected]>
OpenLiberty · Oct 9, 2024 · 724a6e3 · 724a6e3
1 parent 5f3d20e
commit 724a6e3
Show file tree

Hide file tree

Showing 13 changed files with 25,791 additions and 24,052 deletions.
diff --git a/lemminx-liberty/src/it/schema-gen-ol-it/pom.xml b/lemminx-liberty/src/it/schema-gen-ol-it/pom.xml
@@ -84,7 +84,7 @@
                     <runtimeArtifact>
                         <groupId>io.openliberty</groupId>
                         <artifactId>openliberty-runtime</artifactId>
-                        <version>24.0.0.9</version>
+                        <version>24.0.0.10</version>
                     </runtimeArtifact>
                 </configuration>
                 <executions>

diff --git a/lemminx-liberty/src/it/schema-gen-ol-it/src/test/java/LibertyWorkspaceIT.java b/lemminx-liberty/src/it/schema-gen-ol-it/src/test/java/LibertyWorkspaceIT.java
@@ -39,7 +39,7 @@ public void testWorkspace() throws BadLocationException, IOException, URISyntaxE
         testWorkspaceFolders.add(testWorkspace);
         LibertyProjectsManager.getInstance().setWorkspaceFolders(testWorkspaceFolders);
 
-        String schemaFileName = "ol-24.0.0.9.xsd";
+        String schemaFileName = "ol-24.0.0.10.xsd";
         File schemaFile = new File(LibertyUtils.getTempDir(LibertyProjectsManager.getInstance().getWorkspaceFolder(serverXmlFile.toURI().toString())), schemaFileName);
         String serverGenXSDURI = schemaFile.toPath().toUri().toString().replace("///", "/");
 
@@ -79,8 +79,8 @@ public void testGetFeatures() throws BadLocationException {
 
         CompletionItem jaxrsCompletion = c("jaxrs-2.1", "jaxrs-2.1");
 
-        // would be 344 if mpConfig-1.4 was not already specified - this is using ol-24.0.0.9
-        final int TOTAL_ITEMS = 344; // total number of available completion items
+        // would be 348 if mpConfig-1.4 was not already specified - this is using ol-24.0.0.10
+        final int TOTAL_ITEMS = 348; // total number of available completion items
 
         XMLAssert.testCompletionFor(serverXML, null, serverXmlFile.toURI().toString(), TOTAL_ITEMS, jaxrsCompletion);
 
@@ -89,7 +89,7 @@ public void testGetFeatures() throws BadLocationException {
         XMLAssert.testCompletionFor(serverXML, null, serverXmlFile.toURI().toString(), TOTAL_ITEMS, websocket);
 
         // Verify that a feature list was NOT generated. It should have downloaded the features.json from Maven Central.
-        String featureListName = "featurelist-ol-24.0.0.9.xml";
+        String featureListName = "featurelist-ol-24.0.0.10.xml";
         File featurelistFile = new File(LibertyUtils.getTempDir(LibertyProjectsManager.getInstance().getWorkspaceFolder(serverXmlFile.toURI().toString())), featureListName);
 
         org.junit.jupiter.api.Assertions.assertFalse(featurelistFile.exists(), "Found unexpected generated featurelist file: "+featureListName);

diff --git a/...-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyXSDURIResolver.java b/...-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyXSDURIResolver.java
@@ -37,8 +37,8 @@ public class LibertyXSDURIResolver implements URIResolverExtension, IExternalGra
 
     // Changing this to contain the version in the file name since the file is copied to the local .lemminx cache. 
     // This is how we ensure the latest default server schema gets used in each developer environment. 
-    private static final String XSD_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/schema/xsd/liberty/server-cached-24.0.0.9.xsd";
-    private static final String XSD_CLASSPATH_LOCATION = "/schema/xsd/liberty/server-cached-24.0.0.9.xsd";
+    private static final String XSD_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/schema/xsd/liberty/server-cached-24.0.0.10.xsd";
+    private static final String XSD_CLASSPATH_LOCATION = "/schema/xsd/liberty/server-cached-24.0.0.10.xsd";
 
     /**
      * SERVER_XSD_RESOURCE is the server schema that is located at XSD_CLASSPATH_LOCATION

diff --git a/...iberty/src/main/java/io/openliberty/tools/langserver/lemminx/services/FeatureService.java b/...iberty/src/main/java/io/openliberty/tools/langserver/lemminx/services/FeatureService.java
@@ -70,8 +70,8 @@ public class FeatureService {
 
     // This file is copied to the local .lemminx cache. 
     // This is how we ensure the latest default featurelist xml gets used in each developer environment. 
-    private static final String FEATURELIST_XML_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/featurelist-cached-24.0.0.9.xml";
-    private static final String FEATURELIST_XML_CLASSPATH_LOCATION = "/featurelist-cached-24.0.0.9.xml";
+    private static final String FEATURELIST_XML_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/featurelist-cached-24.0.0.10.xml";
+    private static final String FEATURELIST_XML_CLASSPATH_LOCATION = "/featurelist-cached-24.0.0.10.xml";
 
     /**
      * FEATURELIST_XML_RESOURCE is the featurelist xml that is located at FEATURELIST_XML_CLASSPATH_LOCATION
@@ -139,7 +139,7 @@ private List<Feature> getDefaultFeatures() {
             if (defaultFeatures == null) {
                 // Changing this to contain the version in the file name since the file is copied to the local .lemminx cache. 
                 // This is how we ensure the latest default features json gets used in each developer environment. 
-                InputStream is = getClass().getClassLoader().getResourceAsStream("features-cached-24.0.0.9.json");
+                InputStream is = getClass().getClassLoader().getResourceAsStream("features-cached-24.0.0.10.json");
                 InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
 
                 // Only need the public features