Merge pull request #1374 from apache/master
Sync master to release branch for NB 11.1-beta4
diff --git a/enterprise/j2ee.kit/nbproject/project.xml b/enterprise/j2ee.kit/nbproject/project.xml
index 31f5911..4f248ab 100644
--- a/enterprise/j2ee.kit/nbproject/project.xml
+++ b/enterprise/j2ee.kit/nbproject/project.xml
@@ -95,6 +95,12 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.modules.payara.micro</code-name-base>
+ <run-dependency>
+ <release-version>0-1</release-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.web.kit</code-name-base>
<run-dependency>
<specification-version>1.0</specification-version>
diff --git a/javafx/javafx2.kit/nbproject/project.xml b/javafx/javafx2.kit/nbproject/project.xml
index 572a74b..51deab7 100644
--- a/javafx/javafx2.kit/nbproject/project.xml
+++ b/javafx/javafx2.kit/nbproject/project.xml
@@ -80,6 +80,12 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.modules.openjfx.samples</code-name-base>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.maven.kit</code-name-base>
<run-dependency>
<release-version>1</release-version>
diff --git a/javafx/openjfx.samples/nbproject/project.properties b/javafx/openjfx.samples/nbproject/project.properties
index ce61fd4..c0af75f 100644
--- a/javafx/openjfx.samples/nbproject/project.properties
+++ b/javafx/openjfx.samples/nbproject/project.properties
@@ -1 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties
index f1f3334..74d3288 100644
--- a/nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties
+++ b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties
@@ -62,7 +62,7 @@
###################
LBL_splash_window_title=Starting Apache NetBeans IDE
-currentVersion=Apache NetBeans IDE Dev (Build {0})
+currentVersion=Apache NetBeans IDE 11.1
MSG_warning=NetBeans IDE - Warning
MSG_info=NetBeans IDE - Information
diff --git a/nb/ide.branding/core.windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties b/nb/ide.branding/core.windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties
index 02d3790..434d610 100644
--- a/nb/ide.branding/core.windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties
+++ b/nb/ide.branding/core.windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties
@@ -17,5 +17,5 @@
# {0} build number
# {1} project name
-CTL_MainWindow_Title={1} - Apache NetBeans IDE Dev {0}
-CTL_MainWindow_Title_No_Project=Apache NetBeans IDE Dev {0}
+CTL_MainWindow_Title={1} - Apache NetBeans IDE 11.1
+CTL_MainWindow_Title_No_Project=Apache NetBeans 11.1
diff --git a/nb/ide.launcher/netbeans.conf b/nb/ide.launcher/netbeans.conf
index 171d19f..90b5637 100644
--- a/nb/ide.launcher/netbeans.conf
+++ b/nb/ide.launcher/netbeans.conf
@@ -45,8 +45,8 @@
# Cachedir must be different from userdir. The same cachedir and userdir
# would cause problems.
#
-netbeans_default_userdir="${DEFAULT_USERDIR_ROOT}/dev"
-netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"
+netbeans_default_userdir="${DEFAULT_USERDIR_ROOT}/11.1"
+netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/11.1"
# Options used by NetBeans launcher by default:
# (can be overridden by explicit command line switches)
@@ -62,7 +62,7 @@
# default command line arguments.
# (see: https://issues.apache.org/jira/browse/NETBEANS-1344)
#
-netbeans_default_options="-J-XX:+UseStringDeduplication -J-Xss2m -J-Dnetbeans.logger.console=true -J-ea -J-Djdk.gtk.version=2.2 -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.base/java.security=ALL-UNNAMED -J--add-opens=java.base/java.util=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/java.awt=ALL-UNNAMED -J--add-opens=java.desktop/java.awt.event=ALL-UNNAMED -J--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED -J--add-opens=jdk.jshell/jdk.jshell=ALL-UNNAMED -J--add-modules=jdk.jshell -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=java.desktop/java.awt.peer=ALL-UNNAMED -J--add-exports=java.desktop/com.sun.beans.editors=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt.im=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.management/sun.management=ALL-UNNAMED -J--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED -J--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
+netbeans_default_options="-J-XX:+UseStringDeduplication -J-Xss2m -J-Djdk.gtk.version=2.2 -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.base/java.security=ALL-UNNAMED -J--add-opens=java.base/java.util=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/java.awt=ALL-UNNAMED -J--add-opens=java.desktop/java.awt.event=ALL-UNNAMED -J--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED -J--add-opens=jdk.jshell/jdk.jshell=ALL-UNNAMED -J--add-modules=jdk.jshell -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=java.desktop/java.awt.peer=ALL-UNNAMED -J--add-exports=java.desktop/com.sun.beans.editors=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt.im=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.management/sun.management=ALL-UNNAMED -J--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED -J--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
# Default location of JDK:
# (set by installer or commented out if launcher should decide)
diff --git a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
index 29e6fb4..024eecc 100644
--- a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
+++ b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
@@ -25,7 +25,15 @@
Services/AutoupdateType/distribution-update-provider.instance=NetBeans Distribution
Services/AutoupdateType/pluginportal-update-provider.instance=NetBeans Plugin Portal
+Services/AutoupdateType/82pluginportal-update-provider.instance=NetBeans 8.2 Plugin Portal
+
#NOI18N
-URL_Distribution=https://builds.apache.org/job/netbeans-linux/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz?{$netbeans.hash.code}
+URL_Distribution=https://netbeans.apache.org/nb/updates/11.1/updates.xml.gz?{$netbeans.hash.code}
#NOI18N
-URL_PluginPortal=http://netbeans-vm.apache.org/pluginportal/data/latest/catalog-experimental.xml.gz
\ No newline at end of file
+URL_PluginPortal=https://netbeans.apache.org/nb/plugins/11.1/catalog.xml.gz
+#NOI18N
+URL_82PluginPortal=http://updates.netbeans.org/netbeans/updates/8.2/uc/final/distribution/catalog.xml.gz
+
+3rdparty=Third Party Libraries
+#NOI18N
+URL_3rdparty=nbresloc:/org/netbeans/modules/updatecenters/resources/3rdparty-catalog.xml
diff --git a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
index 23e66e4..de190a3 100644
--- a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
+++ b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
@@ -45,6 +45,26 @@
<attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
</file>
+ <file name="82pluginportal-update-provider.instance">
+ <attr name="displayName" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/82pluginportal-update-provider.instance"/>
+ <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
+ <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_82PluginPortal"/>
+ <attr name="category" stringvalue="STANDARD"/>
+ <attr name="enabled" boolvalue="false"/>
+ <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
+ <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
+ </file>
+
+ <file name="3rdparty.instance">
+ <attr name="displayName" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#3rdparty"/>
+ <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
+ <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_3rdparty"/>
+ <attr name="category" stringvalue="STANDARD"/>
+ <attr name="enabled" boolvalue="true"/>
+ <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
+ <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
+ </file>
+
</folder>
</folder> <!-- Services -->
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
index fc22502..dc36ea3 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
@@ -40,13 +40,13 @@
setBackground( Utils.getBottomBarColor() );
add( Logo.createApacheLogo(), new GridBagConstraints(0,0,1,1,0.0,0.0,
- GridBagConstraints.WEST,GridBagConstraints.NONE,new Insets(0,12,0,5),0,0 ) );
+ GridBagConstraints.WEST,GridBagConstraints.NONE,new Insets(5,12,5,5),0,0 ) );
add( new JLabel(), new GridBagConstraints(1,0,1,1,1.0,0.0,
GridBagConstraints.CENTER,GridBagConstraints.NONE,new Insets(0,0,0,0),0,0 ) );
- add( Logo.createIncubatorLogo(), new GridBagConstraints(4,0,1,1,0.0,0.0,
- GridBagConstraints.EAST,GridBagConstraints.NONE,new Insets(5,5,5,12),0,0 ) );
+ //add( Logo.createIncubatorLogo(), new GridBagConstraints(4,0,1,1,0.0,0.0,
+ // GridBagConstraints.EAST,GridBagConstraints.NONE,new Insets(5,5,5,12),0,0 ) );
}
}
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
index 14d8aae..95273f9 100644
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -225,10 +225,7 @@
# is composed from the javadocs split by stability
# categories, for release it shall contain just stable ones
config.javadoc.all=\
- ${config.javadoc.stable},\
- ${config.javadoc.devel},\
- ${config.javadoc.friend},\
- ${config.javadoc.deprecated}
+ ${config.javadoc.stable}
# list of modules for jnlp:
config.jnlp.stable=\
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index d16330a..5a2071f 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -1565,7 +1565,8 @@
javafx2.platform,\
javafx2.project,\
javafx2.samples,\
- javafx2.scenebuilder
+ javafx2.scenebuilder,\
+ openjfx.samples
nb.cluster.remote.dir=extra
nb.cluster.remote.depends=\
diff --git a/nbbuild/javadoctools/export2allclasses.xsl b/nbbuild/javadoctools/export2allclasses.xsl
index 367d4ff..c69e494 100644
--- a/nbbuild/javadoctools/export2allclasses.xsl
+++ b/nbbuild/javadoctools/export2allclasses.xsl
@@ -27,13 +27,13 @@
<head>
<!-- projects.netbeans.org -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>All Apache NetBeans (incubating) Classes</title>
+ <title>All Apache NetBeans Classes</title>
<link rel="stylesheet" href="org-openide-util/javadoc.css" type="text/css" title="style" />
</head>
<body>
<font size="+1" CLASS="FrameHeadingFont">
- <b>Apache NetBeans (incubating) API Classes</b>
+ <b>Apache NetBeans API Classes</b>
</font>
<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
diff --git a/nbbuild/javadoctools/export2allmodules.xsl b/nbbuild/javadoctools/export2allmodules.xsl
index f949039..de0bc77 100644
--- a/nbbuild/javadoctools/export2allmodules.xsl
+++ b/nbbuild/javadoctools/export2allmodules.xsl
@@ -27,7 +27,7 @@
<head>
<!-- projects.netbeans.org -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>All Apache NetBeans (incubating) Classes</title>
+ <title>All Apache NetBeans Classes</title>
<link rel="stylesheet" href="org-openide-util/javadoc.css" type="text/css"/>
</head>
diff --git a/nbbuild/javadoctools/export2apichanges-atom.xsl b/nbbuild/javadoctools/export2apichanges-atom.xsl
index 633b0c0..619630c 100644
--- a/nbbuild/javadoctools/export2apichanges-atom.xsl
+++ b/nbbuild/javadoctools/export2apichanges-atom.xsl
@@ -28,7 +28,7 @@
<xsl:template match="/" >
<atom:feed>
<atom:id>urn:netbeans-org:apichanges</atom:id>
- <atom:title>Apache NetBeans (incubating) API Changes</atom:title>
+ <atom:title>Apache NetBeans API Changes</atom:title>
<atom:author><atom:name>netbeans.org</atom:name></atom:author>
<atom:link rel="alternate" type="text/html" href="apichanges.html"/>
<atom:link rel="self" type="application/xml+atom" href="http://deadlock.netbeans.org/job/nbms-and-javadoc/javadoc/apichanges.atom"/>
diff --git a/nbbuild/javadoctools/export2apichanges.xsl b/nbbuild/javadoctools/export2apichanges.xsl
index 304ae3a..206ca3d 100644
--- a/nbbuild/javadoctools/export2apichanges.xsl
+++ b/nbbuild/javadoctools/export2apichanges.xsl
@@ -37,7 +37,7 @@
<head>
<!-- projects.netbeans.org -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>Apache NetBeans (incubating) API Changes since Last Release</title>
+ <title>Apache NetBeans API Changes since Last Release</title>
<link rel="stylesheet" href="netbeans.css" type="text/css"/>
<link REL="icon" href="http://www.netbeans.org/favicon.ico" type="image/ico" />
@@ -50,8 +50,8 @@
<center>
- <h1>Apache NetBeans (incubating) API Changes since Last Release</h1>
- <h3>Current Development Version</h3>
+ <h1>Apache NetBeans API Changes since Last Release</h1>
+ <h3>Apache NetBeans 11.1</h3>
<xsl:if test="$date" >
<xsl:value-of select="$date" />
<p/>
diff --git a/nbbuild/javadoctools/export2branding.xsl b/nbbuild/javadoctools/export2branding.xsl
index 254dc3d..5c96548 100644
--- a/nbbuild/javadoctools/export2branding.xsl
+++ b/nbbuild/javadoctools/export2branding.xsl
@@ -28,7 +28,7 @@
<head>
<!-- projects.netbeans.org -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>Description Layer Registration in Apache NetBeans (incubating) APIs</title>
+ <title>Description Layer Registration in Apache NetBeans APIs</title>
<link rel="stylesheet" href="netbeans.css" type="text/css"/>
<link REL="icon" href="http://www.netbeans.org/favicon.ico" type="image/ico" />
@@ -37,7 +37,7 @@
</head>
<body>
- <center><h1>Description of Branding APIs for Apache NetBeans (incubating) Platform Applications</h1></center>
+ <center><h1>Description of Branding APIs for Apache NetBeans Platform Applications</h1></center>
<p>
Applications built on top of NetBeans Platform may change configuration
diff --git a/nbbuild/javadoctools/export2html.xsl b/nbbuild/javadoctools/export2html.xsl
index 231f8269..a774911 100644
--- a/nbbuild/javadoctools/export2html.xsl
+++ b/nbbuild/javadoctools/export2html.xsl
@@ -34,7 +34,7 @@
<head>
<!-- projects.netbeans.org -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>Apache NetBeans (incubating) API List</title>
+ <title>Apache NetBeans API List</title>
<link rel="stylesheet" href="netbeans.css" type="text/css"/>
<link REL="icon" href="http://www.netbeans.org/favicon.ico" type="image/ico" />
@@ -45,8 +45,8 @@
<body>
<center>
- <h1>Apache NetBeans (incubating) API List</h1>
- <h3>Current Development Version</h3>
+ <h1>Apache NetBeans API List</h1>
+ <h3>Apache NetBeans 11.1</h3>
<xsl:if test="$date" >
<xsl:value-of select="$date" />
<p/>
@@ -80,7 +80,7 @@
<em>NetBeans</em> one is free to choose the set of modules and their APIs
to satisfy one's needs.
<p>
- This is a list of APIs for development version, if you want to see
+ This is a list of APIs for Apache NetBeans 11.1. If you want to see
a list of APIs for a particular version, you may want to go to:
</p>
<ul>
@@ -130,7 +130,7 @@
<h4>FAQ and Mailing List</h4>
- <p>Can't find what you're looking for? Try the <a href="https://netbeans.apache.org" target="_top">Apache NetBeans (incubating) website</a>.</p>
+ <p>Can't find what you're looking for? Try the <a href="https://netbeans.apache.org" target="_top">Apache NetBeans website</a>.</p>
<hr/>
<xsl:call-template name="list-modules" />
diff --git a/nbbuild/javadoctools/export2layer.xsl b/nbbuild/javadoctools/export2layer.xsl
index 6ed39e3..16c9949 100644
--- a/nbbuild/javadoctools/export2layer.xsl
+++ b/nbbuild/javadoctools/export2layer.xsl
@@ -28,7 +28,7 @@
<head>
<!-- projects.netbeans.org -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>Description Layer Registration in Apache NetBeans (incubating) APIs</title>
+ <title>Description Layer Registration in Apache NetBeans APIs</title>
<link rel="stylesheet" href="netbeans.css" type="text/css"/>
<link REL="icon" href="http://www.netbeans.org/favicon.ico" type="image/ico" />
@@ -37,7 +37,7 @@
</head>
<body>
- <center><h1>Description of Layer Registrations in Apache NetBeans (incubating) APIs</h1></center>
+ <center><h1>Description of Layer Registrations in Apache NetBeans APIs</h1></center>
<p>
Registration of various objects, files and hints into layer is
diff --git a/nbbuild/javadoctools/export2property.xsl b/nbbuild/javadoctools/export2property.xsl
index 2ffb601..7b9d171 100644
--- a/nbbuild/javadoctools/export2property.xsl
+++ b/nbbuild/javadoctools/export2property.xsl
@@ -28,7 +28,7 @@
<head>
<!-- projects.netbeans.org -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>Description Layer Registration in Apache NetBeans (incubating) APIs</title>
+ <title>Description Layer Registration in Apache NetBeans APIs</title>
<link rel="stylesheet" href="netbeans.css" type="text/css"/>
<link REL="icon" href="http://www.netbeans.org/favicon.ico" type="image/ico" />
@@ -37,7 +37,7 @@
</head>
<body>
- <center><h1>Description of Property APIs in Apache NetBeans (incubating) APIs</h1></center>
+ <center><h1>Description of Property APIs in Apache NetBeans APIs</h1></center>
<p>
System properties can influence the behaviour of the running IDE in various
diff --git a/nbbuild/javadoctools/export2usecases.xsl b/nbbuild/javadoctools/export2usecases.xsl
index 2a43ee1..ebe36a6 100644
--- a/nbbuild/javadoctools/export2usecases.xsl
+++ b/nbbuild/javadoctools/export2usecases.xsl
@@ -28,7 +28,7 @@
<head>
<!-- projects.netbeans.org -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>How to use certain Apache NetBeans (incubating) APIs</title>
+ <title>How to use certain Apache NetBeans APIs</title>
<link rel="stylesheet" href="netbeans.css" type="text/css"/>
<link REL="icon" href="http://www.netbeans.org/favicon.ico" type="image/ico" />
@@ -37,7 +37,7 @@
</head>
<body>
- <center><h1>How to use certain Apache NetBeans (incubating) APIs</h1></center>
+ <center><h1>How to use certain Apache NetBeans APIs</h1></center>
This page contains extracted usecases for some of the NetBeans modules
that <a href="overview-summary.html">offer an API</a>.
diff --git a/nbbuild/packaging/snap/gui/netbeans.desktop b/nbbuild/packaging/snap/gui/netbeans.desktop
index ad720d3..3fc953f 100644
--- a/nbbuild/packaging/snap/gui/netbeans.desktop
+++ b/nbbuild/packaging/snap/gui/netbeans.desktop
@@ -17,9 +17,9 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
-Name=Apache NetBeans (development)
+Name=Apache NetBeans
Comment=Apache NetBeans, The Smarter Way to Code
-Exec=netbeans-dev.netbeans %F
+Exec=netbeans %F
Categories=Development;IDE
Icon=${SNAP}/meta/gui/icon.png
Terminal=false
diff --git a/nbbuild/packaging/snap/snapcraft.yaml b/nbbuild/packaging/snap/snapcraft.yaml
index 5907760..d72db8c 100644
--- a/nbbuild/packaging/snap/snapcraft.yaml
+++ b/nbbuild/packaging/snap/snapcraft.yaml
@@ -14,18 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: netbeans-dev
+name: netbeans
-summary: Apache NetBeans IDE (Development Build)
+version: "11.1"
+summary: Apache NetBeans IDE
description: |
- Disclaimer:
- This is an in Development Build of Apache NetBeans IDE , this is for sole
- testing purposes and shall be not considered as a release.
-
- This package is refreshed weekly automatically from the NetBeans master
- repository. Take it as it is, there are no additional testing is being
- made on these builds.
-
Apache NetBeans IDE lets you quickly and easily develop Java
desktop, enterprise, and web applications, as well as HTML5 applications
with HTML, JavaScript, and CSS. The IDE also provides a great set of tools for
@@ -37,9 +30,8 @@
icon: ../../platform/core.startup/src/org/netbeans/core/startup/frame512.png
confinement: classic
-grade: devel
+grade: stable
architectures: [ amd64 ]
-adopt-info: netbeans-version
parts:
netbeans-version:
@@ -47,7 +39,6 @@
source: .
override-pull: |
snapcraftctl pull
- snapcraftctl set-version "$(date +%Y%m%d)"
build:
build-attributes: [ no-patchelf ]
@@ -65,7 +56,7 @@
# 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/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false/' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
+ sed -i 's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false -J-Dawt.useSystemAAFontSettings=on/' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
stage:
- $netbeans
diff --git a/platform/core.startup/src/org/netbeans/core/startup/Bundle.properties b/platform/core.startup/src/org/netbeans/core/startup/Bundle.properties
index 597aa19..5743311 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/Bundle.properties
+++ b/platform/core.startup/src/org/netbeans/core/startup/Bundle.properties
@@ -26,7 +26,7 @@
# VERSIONING (TopLogging, MainWindow)
# {0} - build number
-currentVersion=Apache NetBeans Platform Dev (Build {0})
+currentVersion=Apache NetBeans Platform 11.1
ERR_no_user_directory=netbeans.user is not set.\nPlease check your NetBeans startup script.
# {0} - userdir full path
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/Bundle.properties b/platform/core.windows/src/org/netbeans/core/windows/view/ui/Bundle.properties
index 47cec6e..6406e17 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -23,8 +23,8 @@
ACSD_MainWindow=Main Window
# {0} build number
# {1} project name
-CTL_MainWindow_Title=Apache NetBeans Platform {0}
-CTL_MainWindow_Title_No_Project=Apache NetBeans Platform {0}
+CTL_MainWindow_Title=Apache NetBeans Platform 11.1
+CTL_MainWindow_Title_No_Project=Apache NetBeans Platform 11.1
# DocumentsDlg
LBL_Documents=&Documents:
