Browse Source

Merge pull request #358 from tonihele/issue-328

Upgrade to Netbeans 14
Toni Helenius 3 years ago
parent
commit
8097616406
4 changed files with 8 additions and 11 deletions
  1. 2 2
      build.gradle
  2. 1 1
      gradle.properties
  3. 4 4
      harness-override/override.properties
  4. 1 4
      nbproject/platform.properties

+ 2 - 2
build.gradle

@@ -3,7 +3,7 @@ import groovy.xml.MarkupBuilder
 import java.util.zip.ZipFile
 import java.util.zip.ZipFile
 
 
 plugins {
 plugins {
-    id "de.undercouch.download" version "3.4.3"
+    id "de.undercouch.download" version "5.1.0"
 }
 }
 
 
 apply from: 'gradle/libs/digest.gradle'
 apply from: 'gradle/libs/digest.gradle'
@@ -82,7 +82,7 @@ task checkPlatformConfig {
              * def f = file("netbeans.zip")
              * def f = file("netbeans.zip")
              * new URL(netbeansUrl).withInputStream{ i -> f.withOutputStream{ it << i }}
              * new URL(netbeansUrl).withInputStream{ i -> f.withOutputStream{ it << i }}
              */
              */
-            download {
+            download.run {
                 src netbeansUrl
                 src netbeansUrl
                 dest "netbeans.zip"
                 dest "netbeans.zip"
                 overwrite false // however if overwrite matters the build failed anyway
                 overwrite false // however if overwrite matters the build failed anyway

+ 1 - 1
gradle.properties

@@ -14,4 +14,4 @@ buildJavaDoc = true
 buildSdkProject = true
 buildSdkProject = true
 
 
 # Path for downloading NetBeans Base
 # Path for downloading NetBeans Base
-netbeansUrl = https://archive.apache.org/dist/netbeans/netbeans/12.6/netbeans-12.6-bin.zip
+netbeansUrl = https://dlcdn.apache.org/netbeans/netbeans/14/netbeans-14-bin.zip

+ 4 - 4
harness-override/override.properties

@@ -1,6 +1,6 @@
-app.exe.hashBefore=0f33727f20bc36f24345da0d1b586e47ce0ade0596df7c2a6d3a7dcae1c19374
-app.exe.hashAfter=fe6b4a2d7aaddb9c0a84c94e1553b43bd11fa468b1079cabdca82e7dea731755
-app64.exe.hashBefore=fe9c568a5ddf34944f11b820f7d3fa9c6448b14b825a49301697b4bd080de279
-app64.exe.hashAfter=f60bc962278fb5b407a7cbe86281185117b76a84e00576496d2559175843bd50
+app.exe.hashBefore=fe6b4a2d7aaddb9c0a84c94e1553b43bd11fa468b1079cabdca82e7dea731755
+app.exe.hashAfter=08568a9ece42e67685df6f20a0383e70248bb0e41c1ab2ec45883bbe001b6326
+app64.exe.hashBefore=f60bc962278fb5b407a7cbe86281185117b76a84e00576496d2559175843bd50
+app64.exe.hashAfter=ee790adfcf8436d7b128ddb43d6f6df1a8404df7612972b2bef7022b4f27bf69
 pre7_app.exe.hashBefore=f4ea42a1ec2572b2a65a6d9baef0dd1f7293980c44c5d031c5b2ea5752352e49
 pre7_app.exe.hashBefore=f4ea42a1ec2572b2a65a6d9baef0dd1f7293980c44c5d031c5b2ea5752352e49
 pre7_app.exe.hashAfter=fa8ae6457dad70a65cecb623ef0f60a86c92e856705eaeb2f22e43310fa9226f
 pre7_app.exe.hashAfter=fa8ae6457dad70a65cecb623ef0f60a86c92e856705eaeb2f22e43310fa9226f

+ 1 - 4
nbproject/platform.properties

@@ -59,11 +59,9 @@ disabled.modules=\
     org.netbeans.modules.form.nb,\
     org.netbeans.modules.form.nb,\
     org.netbeans.modules.form.refactoring,\
     org.netbeans.modules.form.refactoring,\
     org.netbeans.modules.gradle.htmlui,\
     org.netbeans.modules.gradle.htmlui,\
-    org.netbeans.modules.gradle.javaee,\
     org.netbeans.modules.gradle.persistence,\
     org.netbeans.modules.gradle.persistence,\
     org.netbeans.modules.gradle.spring,\
     org.netbeans.modules.gradle.spring,\
     org.netbeans.modules.gradle.test,\
     org.netbeans.modules.gradle.test,\
-    org.netbeans.modules.groovy.and.gradle.kit,\
     org.netbeans.modules.hudson,\
     org.netbeans.modules.hudson,\
     org.netbeans.modules.hudson.ant,\
     org.netbeans.modules.hudson.ant,\
     org.netbeans.modules.hudson.git,\
     org.netbeans.modules.hudson.git,\
@@ -82,6 +80,7 @@ disabled.modules=\
     org.netbeans.modules.j2ee.jpa.verification,\
     org.netbeans.modules.j2ee.jpa.verification,\
     org.netbeans.modules.j2ee.persistence,\
     org.netbeans.modules.j2ee.persistence,\
     org.netbeans.modules.j2ee.persistence.kit,\
     org.netbeans.modules.j2ee.persistence.kit,\
+    org.netbeans.modules.java.lsp.server,\
     org.netbeans.modules.javaee.injection,\
     org.netbeans.modules.javaee.injection,\
     org.netbeans.modules.jellytools.ide,\
     org.netbeans.modules.jellytools.ide,\
     org.netbeans.modules.jellytools.java,\
     org.netbeans.modules.jellytools.java,\
@@ -104,7 +103,6 @@ disabled.modules=\
     org.netbeans.modules.maven.spring,\
     org.netbeans.modules.maven.spring,\
     org.netbeans.modules.mercurial,\
     org.netbeans.modules.mercurial,\
     org.netbeans.modules.mylyn.util,\
     org.netbeans.modules.mylyn.util,\
-    org.netbeans.modules.performance,\
     org.netbeans.modules.projectimport.eclipse.j2se,\
     org.netbeans.modules.projectimport.eclipse.j2se,\
     org.netbeans.modules.schema2beans,\
     org.netbeans.modules.schema2beans,\
     org.netbeans.modules.server,\
     org.netbeans.modules.server,\
@@ -124,7 +122,6 @@ disabled.modules=\
     org.netbeans.upgrader,\
     org.netbeans.upgrader,\
     org.openide.compat,\
     org.openide.compat,\
     org.openide.options,\
     org.openide.options,\
-    org.openide.util.enumerations,\
     org.openidex.util
     org.openidex.util
 nbjdk.active=default
 nbjdk.active=default
 nbplatform.active=default
 nbplatform.active=default