Merge branch 'master' into release14

integrations/eclipse/org.eclipse.visualvm.launcher.common/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,12 @@
-#Thu Oct 13 12:08:17 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.5

integrations/eclipse/org.eclipse.visualvm.launcher.common/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VisualVM Launcher Plug-in
 Bundle-SymbolicName: org.eclipse.visualvm.launcher.common;singleton:=true
-Bundle-Version: 1.1.1
+Bundle-Version: 1.1.2
 Bundle-Activator: org.eclipse.visualvm.launcher.Activator
 Bundle-Vendor: Oracle Corporation
 Require-Bundle: org.eclipse.ui,

integrations/eclipse/org.eclipse.visualvm.launcher.pde/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,12 @@
-#Thu Oct 13 12:08:17 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.5

integrations/eclipse/org.eclipse.visualvm.launcher.update/site.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/VisualVM_Launcher_1.1.1.jar" id="VisualVM_Launcher" version="1.1.1"/>
+   <feature url="features/VisualVM_Launcher_1.1.2.jar" id="VisualVM_Launcher" version="1.1.2"/>
 </site>

integrations/eclipse/org.eclipse.visualvm.launcher/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="VisualVM_Launcher"
       label="VisualVM Launcher Feature"
-      version="1.1.1"
+      version="1.1.2"
       provider-name="Oracle Corporation">
 
    <description>
@@ -16,7 +16,7 @@ as easy as launching them from the IDE.
    </description>
 
    <copyright>
-      Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
@@ -406,7 +406,7 @@ as provided by Sun in the LICENSE file that accompanied this code.&quot;
          id="org.eclipse.visualvm.launcher.common"
          download-size="0"
          install-size="0"
-         version="1.1.1"/>
+         version="1.1.2"/>
 
    <plugin
          id="org.eclipse.visualvm.launcher.java"