20 Release prep

albilu · Jan 4, 2024 · edb8234 · edb8234
1 parent 2d8f02d
commit edb8234
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 31 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -63,5 +63,11 @@ jobs:
     - name: Build with RELEASE190
       run: |
         mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE190 -Dnext.version=RELEASE190
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+
+    - name: Build with RELEASE200
+      run: |
+        mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE200 -Dnext.version=RELEASE200
       env:
         GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -206,6 +206,25 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ github.token }}
 
+    - name: Build with RELEASE200
+      run: |
+        mvn -B clean deploy -Dnetbeans.release.version=RELEASE200 -Dnext.version=RELEASE200-${{ env.RELEASE_VERSION }}
+        echo "SIZE_20=$(wc -c target/nbm/python-RELEASE200-${{ env.RELEASE_VERSION }}.nbm | awk '{print $1}')" >> $GITHUB_ENV
+      env:
+        MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+        MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+
+    - name: Attach RELEASE200 NBM
+      uses: actions/upload-release-asset@v1
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: target/nbm/python-RELEASE200-${{ env.RELEASE_VERSION }}.nbm
+        asset_name: python-RELEASE200-${{ env.RELEASE_VERSION }}.nbm
+        asset_content_type: application/gzip
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+
       #TODO
 #    - name: Update PPUCs
 #      id: my_string

diff --git a/pom.xml b/pom.xml
@@ -801,8 +801,8 @@
     </dependencies>
     <properties>
         <keystore>target/keystore</keystore>
-        <netbeans.release.version>RELEASE190</netbeans.release.version>
-        <next.version>1.5</next.version>
+        <netbeans.release.version>RELEASE200</netbeans.release.version>
+        <next.version>1.6</next.version>
         <git.url>https://github.com/albilu/netbeansPython</git.url>
         <git.link>https://github.com/albilu/netbeansPython.git</git.link>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/ppuc/13/updates.xml b/ppuc/13/updates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.8//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_8.dtd">
-<module_updates timestamp="00/00/00/12/11/2023">
-    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.5/python-RELEASE130-1.5.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2023/11/12">
-        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE130-1.5" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.5"/>
+<module_updates timestamp="00/00/00/04/01/2024">
+    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.6/python-RELEASE130-1.6.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2024/01/04">
+        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE130-1.6" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.6"/>
     </module>
 </module_updates>
diff --git a/ppuc/14/updates.xml b/ppuc/14/updates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.8//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_8.dtd">
-<module_updates timestamp="00/00/00/12/11/2023">
-    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.5/python-RELEASE140-1.5.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2023/11/12">
-        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE140-1.5" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.5"/>
+<module_updates timestamp="00/00/00/04/01/2024">
+    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.6/python-RELEASE140-1.6.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2024/01/04">
+        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE140-1.6" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.6"/>
     </module>
 </module_updates>
diff --git a/ppuc/15/updates.xml b/ppuc/15/updates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.8//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_8.dtd">
-<module_updates timestamp="00/00/00/12/11/2023">
-    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.5/python-RELEASE150-1.5.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2023/11/12">
-        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE150-1.5" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.5"/>
+<module_updates timestamp="00/00/00/04/01/2024">
+    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.6/python-RELEASE150-1.6.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2024/01/04">
+        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE150-1.6" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.6"/>
     </module>
 </module_updates>
diff --git a/ppuc/16/updates.xml b/ppuc/16/updates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.8//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_8.dtd">
-<module_updates timestamp="00/00/00/12/11/2023">
-    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.5/python-RELEASE160-1.5.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2023/11/12">
-        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE160-1.5" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.5"/>
+<module_updates timestamp="00/00/00/04/01/2024">
+    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.6/python-RELEASE160-1.6.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2024/01/04">
+        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE160-1.6" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.6"/>
     </module>
 </module_updates>
diff --git a/ppuc/17/updates.xml b/ppuc/17/updates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.8//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_8.dtd">
-<module_updates timestamp="00/00/00/12/11/2023">
-    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.5/python-RELEASE170-1.5.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2023/11/12">
-        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE170-1.5" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.5"/>
+<module_updates timestamp="00/00/00/04/01/2024">
+    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.6/python-RELEASE170-1.6.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2024/01/04">
+        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE170-1.6" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.6"/>
     </module>
 </module_updates>
diff --git a/ppuc/18/updates.xml b/ppuc/18/updates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.8//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_8.dtd">
-<module_updates timestamp="00/00/00/12/11/2023">
-    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.5/python-RELEASE180-1.5.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2023/11/12">
-        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE180-1.5" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.5"/>
+<module_updates timestamp="00/00/00/04/01/2024">
+    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.6/python-RELEASE180-1.6.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2024/01/04">
+        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE180-1.6" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.6"/>
     </module>
 </module_updates>
diff --git a/ppuc/19/updates.xml b/ppuc/19/updates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.8//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_8.dtd">
-<module_updates timestamp="00/00/00/12/11/2023">
-    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.5/python-RELEASE190-1.5.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2023/11/12">
-        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE190-1.5" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.5"/>
+<module_updates timestamp="00/00/00/04/01/2024">
+    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.6/python-RELEASE190-1.6.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2024/01/04">
+        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE190-1.6" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.6"/>
     </module>
 </module_updates>
diff --git a/ppuc/20/updates.xml b/ppuc/20/updates.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.8//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_8.dtd">
+<module_updates timestamp="00/00/00/04/01/2024">
+    <module codenamebase="io.github.albilu.python" distribution="https://github.com/albilu/netbeansPython/releases/download/1.6/python-RELEASE200-1.6.nbm" downloadsize="133405377" homepage="https://github.com/albilu/netbeansPython" moduleauthor="albilu" needsrestart="true" releasedate="2024/01/04">
+        <manifest OpenIDE-Module="io.github.albilu.python" AutoUpdate-Show-In-Client="true" OpenIDE-Module-Display-Category="Editing" OpenIDE-Module-Implementation-Version="RELEASE200-1.6" OpenIDE-Module-Name="Python" OpenIDE-Module-Requires="org.openide.windows.WindowManager" OpenIDE-Module-Short-Description="Netbeans Support for Python" OpenIDE-Module-Specification-Version="1.6"/>
+    </module>
+</module_updates>
diff --git a/src/main/java/org/netbeans/modules/python/options/PythonLspServerConfigsPanel.java b/src/main/java/org/netbeans/modules/python/options/PythonLspServerConfigsPanel.java
@@ -13,6 +13,7 @@
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
@@ -23,6 +24,7 @@
 import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import org.apache.commons.io.IOUtils;
 import org.eclipse.lsp4j.DidChangeConfigurationParams;
 import org.netbeans.modules.lsp.client.LSPBindings;
 import org.netbeans.modules.python.PythonUtility;
@@ -228,6 +230,9 @@ private void lspListMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
     }//GEN-LAST:event_lspListMouseClicked
 
     void load() {
+        if (errors != null && !errors.isEmpty()) {
+            return;
+        }
         try {
             lspServerCheckBox.setSelected(NbPreferences.root().getBoolean("autoUpdate", false));
             lspServerLabel.setText(String.format("%s%s", "Current Version: ", PythonUtility.getServerVersion()));
@@ -257,21 +262,26 @@ void load() {
 
     static final File settingsSchema = PythonUtility.SETTINGS_SCHEMA;
     static final JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
+    static Set<ValidationMessage> errors;
 
     void store() {
         if (controller.isChanged()) {
             errroLabel.setText("");
             try {
                 String jsonSettings = lspEditorPane.getText();
 
-                if (settingsSchema.exists()) {
-                    JsonSchema jsonSchema = factory.getSchema(Files.readString(settingsSchema.toPath()));
-                    JsonNode jsonNode = new ObjectMapper().readTree(jsonSettings);
-                    Set<ValidationMessage> errors = jsonSchema.validate(jsonNode);
-                    if (!errors.isEmpty()) {
-                        errroLabel.setText(errors.iterator().next().getMessage());
-                        return;
-                    }
+                if (!settingsSchema.exists()) {
+                    Files.writeString(settingsSchema.toPath(),
+                            IOUtils.resourceToString("org/netbeans/modules/python/schema.json",
+                                    StandardCharsets.UTF_8)
+                    );
+                }
+                JsonSchema jsonSchema = factory.getSchema(Files.readString(settingsSchema.toPath()));
+                JsonNode jsonNode = new ObjectMapper().readTree(jsonSettings);
+                errors = jsonSchema.validate(jsonNode);
+                if (!errors.isEmpty()) {
+                    errroLabel.setText(errors.iterator().next().getMessage());
+                    return;
                 }
 
                 NbPreferences.root().putBoolean("autoUpdate", lspServerCheckBox.isSelected());