VisualVM 2.1.2 branding

thurka · thurka · commit a3f82bdf7b82 · 2021-12-15T16:27:55.000+01:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# VisualVM (master) sources repository
+# VisualVM (2.1.2) sources repository
 
 VisualVM is a visual tool integrating commandline JDK tools and lightweight profiling capabilities. See https://visualvm.github.io for details, downloads and documentation.
 
@@ -24,6 +24,43 @@ To build VisualVM, use `ant build-zip` command in the `visualvm/visualvm` direct
 
 To build or run the plugins suite, use `ant build` or `ant run` in the `visualvm/plugins` directory. This will automatically build the zip distribution of the core VisualVM tool into `visualvm/visualvm/dist/visualvm.zip` and extract it into the `visualvm/plugins/visualvm` directory. After that the build of the plugins suite continues to build each of the individual plugins. Running the plugins suite means starting VisualVM with all the plugins installed.
 
+## Generate the Maven artifacts
+
+First prepare the binaries:
+
+  1. Build VisualVM tool as described above
+  2. Expand/decompress the generated `visualvm.zip` file in `visualvm/dist`.
+  3. Generate the NBMs by running: `ant nbms`. This will generate a folder `build/updates` containing all the NBMs.
+
+To generate the artifacts use [`org.apache.netbeans.utilities:nb-repository-plugin`](https://bits.netbeans.org/mavenutilities/nb-repository-plugin/index.html). Make sure the current directory is still `visualvm/visualvm`.
+
+To install the artifacts into your local repository use the following command:
+
+```
+mvn \
+-DnetbeansInstallDirectory=dist/visualvm   \
+-DnetbeansNbmDirectory=build/updates   \
+-DgroupIdPrefix=org.graalvm.visualvm  \
+-DforcedVersion=RELEASE212   \
+org.apache.netbeans.utilities:nb-repository-plugin:populate
+```
+
+To publish the artifacts into a remote repository use the following command:
+
+```
+mvn
+-DnetbeansInstallDirectory=dist/visualvm   \
+-DnetbeansNbmDirectory=build/updates   \
+-DgroupIdPrefix=org.graalvm.visualvm  \
+-DforcedVersion=RELEASE212   \
+-DdeployUrl=<URL to the remote repo> \
+-DdeployId=<repository id referenced in your settings.xml>   \
+-DskipInstall=true  \
+org.apache.netbeans.utilities:nb-repository-plugin:populate
+```
+
+For more information about `nb-repository-plugin` see https://bits.netbeans.org/mavenutilities/nb-repository-plugin/index.html
+
 ## Contribute
 
 We highly appreciate any feedback! Please let us know your ideas, missing features, or bugs found. Either [file a RFE/bug](https://github.com/oracle/visualvm/issues/new/choose) or [leave us a message](https://visualvm.github.io/feedback.html). For legal reasons, we cannot accept external pull requests. See 
diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java
@@ -51,7 +51,7 @@
 public final class AboutAction extends AbstractAction {
     private final static Logger LOGGER = Logger.getLogger(AboutAction.class.getName());
     
-    private String versionString = "Dev"; // Use "Dev" for development builds   // NOI18N
+    private String versionString = "2.1.2"; // Use "Dev" for development builds   // NOI18N
 
 
     public AboutAction() {
diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/Bundle.properties b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/Bundle.properties
@@ -31,7 +31,7 @@ OpenIDE-Module-Short-Description=UI customizations for VisualVM
 
 LBL_About_VisualVM=About VisualVM
 
-LBL_Version_Build=Version: {0} (Build {1})
+LBL_Version_Build=Version: {0}
 
 MSG_License=<b>VisualVM</b> has been licensed under the GNU General Public License (GPL) Version 2 with Classpath Exception. 
 
diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/image.png b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/image.png
diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/resources/welcome-topright.png b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/resources/welcome-topright.png
diff --git a/visualvm/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/visualvm/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -22,7 +22,7 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 
-currentVersion=VisualVM Dev
+currentVersion=VisualVM 2.1.2
 LBL_splash_window_title=Starting VisualVM
 SPLASH_HEIGHT=310
 SPLASH_WIDTH=530
diff --git a/visualvm/branding/core/core.jar/org/netbeans/core/startup/splash.gif b/visualvm/branding/core/core.jar/org/netbeans/core/startup/splash.gif
diff --git a/visualvm/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/visualvm/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -22,5 +22,5 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 
-CTL_MainWindow_Title=VisualVM Dev
-CTL_MainWindow_Title_No_Project=VisualVM Dev
+CTL_MainWindow_Title=VisualVM 2.1.2
+CTL_MainWindow_Title_No_Project=VisualVM 2.1.2
diff --git a/visualvm/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties b/visualvm/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties
@@ -22,4 +22,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 
-LBL_ProductInformation=VisualVM
+LBL_ProductInformation=VisualVM 2.1.2
diff --git a/visualvm/core/src/org/graalvm/visualvm/core/Bundle.properties b/visualvm/core/src/org/graalvm/visualvm/core/Bundle.properties
@@ -26,8 +26,8 @@
 OpenIDE-Module-Display-Category=Infrastructure
 OpenIDE-Module-Name=VisualVM-Core
 OpenIDE-Module-Short-Description=VisualVM main module
-com_sun_tools_visualvm_core_update_center=https://visualvm.github.io/uc/dev/updates.xml.gz?{$netbeans.hash.code}
-Services/AutoupdateType/com_sun_tools_visualvm_core_update_center.instance=VisualVM Plugins Center
+com_sun_tools_visualvm_core_update_center=https://visualvm.github.io/uc/release212/updates.xml.gz?{$netbeans.hash.code}
+Services/AutoupdateType/com_sun_tools_visualvm_core_update_center.instance=VisualVM 2.1.2 Plugins Center
 Menu/Applications=&Applications
 Toolbars/Snapshot=&Snapshot
 Toolbars/DataSource=&Data Source
diff --git a/visualvm/launcher/visualvm.conf b/visualvm/launcher/visualvm.conf
@@ -51,14 +51,14 @@
 # Cachedir must be different from userdir. The same cachedir and userdir
 # would cause problems.
 #
-visualvm_default_userdir="${DEFAULT_USERDIR_ROOT}/dev"
-visualvm_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"
+visualvm_default_userdir="${DEFAULT_USERDIR_ROOT}/2.1.2"
+visualvm_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/2.1.2"
 
 # Options used by VisualVM launcher by default:
 # (can be overridden by explicit command line switches)
 #
 
-visualvm_default_options="-J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dnetbeans.importclass=org.graalvm.visualvm.modules.startup.ImportSettings -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J-Djdk.attach.allowAttachSelf=true -J-Dorg.openide.util.ImageUtilities.level=950 -J-DTopSecurityManager.disable=true -J--add-exports=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED -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.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions -J-Dnetbeans.logger.console=true -J-Dnetbeans.exception.report.min.level=900 -J-ea"
+visualvm_default_options="-J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dnetbeans.importclass=org.graalvm.visualvm.modules.startup.ImportSettings -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J-Djdk.attach.allowAttachSelf=true -J-Dorg.openide.util.ImageUtilities.level=950 -J-DTopSecurityManager.disable=true -J--add-exports=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED -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.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
 # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-Dnetbeans.exception.report.min.level=900 -J-ea
 
 # Default location of JDK:
diff --git a/visualvm/launcher/visualvm.exe b/visualvm/launcher/visualvm.exe
diff --git a/visualvm/launcher/windows-src/nbproject/Makefile-variables.mk b/visualvm/launcher/windows-src/nbproject/Makefile-variables.mk
@@ -14,6 +14,14 @@ CND_ARTIFACT_PATH_visualvm.exe=visualvm.exe
 CND_PACKAGE_DIR_visualvm.exe=dist/visualvm.exe/Cygwin-Windows/package
 CND_PACKAGE_NAME_visualvm.exe=windows-src.tar
 CND_PACKAGE_PATH_visualvm.exe=dist/visualvm.exe/Cygwin-Windows/package/windows-src.tar
+# visualvm64.exe configuration
+CND_PLATFORM_visualvm64.exe=Cygwin64-Windows
+CND_ARTIFACT_DIR_visualvm64.exe=
+CND_ARTIFACT_NAME_visualvm64.exe=visualvm64.exe
+CND_ARTIFACT_PATH_visualvm64.exe=visualvm64.exe
+CND_PACKAGE_DIR_visualvm64.exe=dist/visualvm64.exe/Cygwin64-Windows/package
+CND_PACKAGE_NAME_visualvm64.exe=windows-src.tar
+CND_PACKAGE_PATH_visualvm64.exe=dist/visualvm64.exe/Cygwin64-Windows/package/windows-src.tar
 #
 # include compiler specific variables
 #
diff --git a/visualvm/launcher/windows-src/nbproject/project.xml b/visualvm/launcher/windows-src/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.cnd.makeproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>VisualVM Launcher Win</name>
+            <name>VisualVM 2.1.2 Launcher Win</name>
             <make-project-type>0</make-project-type>
             <c-extensions/>
             <cpp-extensions>cpp</cpp-extensions>
diff --git a/visualvm/launcher/windows-src/version.h b/visualvm/launcher/windows-src/version.h
@@ -25,11 +25,11 @@
 
 #define COMPANY "Oracle Corporation"
 #define COMPONENT "VisualVM"
-#define VER "0.0.0.0"
-#define FVER 0,0,0,0
-#define BUILD_ID "0"
+#define VER "2.1.2.0"
+#define FVER 2,1,2,0
+#define BUILD_ID "15122021"
 #define INTERNAL_NAME "visualvm"
-#define COPYRIGHT "\xA9 2007, 2014, Oracle and/or its affiliates. All rights reserved."
+#define COPYRIGHT "\xA9 2007, 2021, Oracle and/or its affiliates. All rights reserved."
 #define FNAME "visualvm.exe"
-#define NAME "VisualVM Dev. build"
+#define NAME "VisualVM"
 
diff --git a/visualvm/launcher/windows-src/visualvm.exe.manifest b/visualvm/launcher/windows-src/visualvm.exe.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="0.0.0.0"
+<assemblyIdentity version="2.1.2.0"
    processorArchitecture="X86"
    name="visualvm.exe"
    type="win32"/>
diff --git a/visualvm/nbproject/project.properties b/visualvm/nbproject/project.properties
@@ -1,6 +1,6 @@
 app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
 app.name=${branding.token}
-app.title=VisualVM
+app.title=VisualVM 2.1.2
 modules=\
     ${project.org.graalvm.visualvm.core}:\
     ${project.org.graalvm.visualvm.modules.appui}:\
diff --git a/visualvm/startup/src/org/graalvm/visualvm/modules/startup/ImportSettings.java b/visualvm/startup/src/org/graalvm/visualvm/modules/startup/ImportSettings.java
@@ -81,7 +81,8 @@ public class ImportSettings {
         "2.0.6",                                                                // NOI18N
         "2.0.7",                                                                // NOI18N
         "2.1",                                                                  // NOI18N
-        "2.1.1"                                                                 // NOI18N
+        "2.1.1",                                                                // NOI18N
+        "2.1.2"                                                                 // NOI18N
     };
     
     
