Use Java 11 to Build NetBeans dev Snap

classicvalues · Mar 4, 2021 · d1e363b · d1e363b
1 parent 8bb724b
commit d1e363b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml b/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml
@@ -53,18 +53,18 @@ parts:
     build-attributes: [ no-patchelf ]
     build-packages:
       - unzip
-      - openjdk-8-jdk-headless
+      - openjdk-11-jdk-headless
     plugin: ant
     source: ../../../
     filesets:
         netbeans: [ netbeans/*, -netbeans/*.built ]
     override-build: |
-        export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
+        export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
         ant -quiet -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dbuildnumber=$(date +%Y%m%d)
         mv nbbuild/netbeans $SNAPCRAFT_PART_INSTALL/netbeans
         # Make the default cache and data directory relative to Snap user directory
-        sed -i 's/${HOME}\/.netbeans/${SNAP_USER_COMMON}\/data/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
-        sed -i 's/${HOME}\/.cache\/netbeans/${SNAP_USER_COMMON}\/cache/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
+        sed -i 's/${HOME}\/.netbeans\/dev/${SNAP_USER_DATA}\/data/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
+        sed -i 's/${HOME}\/.cache\/netbeans\/dev/${SNAP_USER_DATA}\/cache/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
         sed -i 's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false/' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
     stage:
         - $netbeans