diff --git a/core/src/main/java/hudson/AbstractMarkupText.java b/core/src/main/java/hudson/AbstractMarkupText.java
index 1e78b3e10c..2398f6f744 100644
--- a/core/src/main/java/hudson/AbstractMarkupText.java
+++ b/core/src/main/java/hudson/AbstractMarkupText.java
@@ -141,7 +141,7 @@ public abstract class AbstractMarkupText {
     public List<MarkupText.SubText> findTokens(Pattern pattern) {
         String text = getText();
         Matcher m = pattern.matcher(text);
-        List<SubText> r = new ArrayList<SubText>();
+        List<SubText> r = new ArrayList<>();
 
         while(m.find()) {
             int idx = m.start();
diff --git a/core/src/main/java/hudson/BulkChange.java b/core/src/main/java/hudson/BulkChange.java
index 28b9fde426..e65fa4d3ac 100644
--- a/core/src/main/java/hudson/BulkChange.java
+++ b/core/src/main/java/hudson/BulkChange.java
@@ -132,7 +132,7 @@ public class BulkChange implements Closeable {
     /**
      * {@link BulkChange}s that are effective currently.
      */
-    private static final ThreadLocal<BulkChange> INSCOPE = new ThreadLocal<BulkChange>();
+    private static final ThreadLocal<BulkChange> INSCOPE = new ThreadLocal<>();
 
     /**
      * Gets the {@link BulkChange} instance currently in scope for the current thread.
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index fdd2e88dd1..1d93d3fb24 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -192,7 +192,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
         // TODO: define a mechanism to hide classes
         // String export = manifest.getMainAttributes().getValue("Export");
 
-        List<File> paths = new ArrayList<File>();
+        List<File> paths = new ArrayList<>();
         if (isLinked) {
             parseClassPath(manifest, archive, paths, "Libraries", ",");
             parseClassPath(manifest, archive, paths, "Class-Path", " +"); // backward compatibility
@@ -218,8 +218,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
         }
 
         // compute dependencies
-        List<PluginWrapper.Dependency> dependencies = new ArrayList<PluginWrapper.Dependency>();
-        List<PluginWrapper.Dependency> optionalDependencies = new ArrayList<PluginWrapper.Dependency>();
+        List<PluginWrapper.Dependency> dependencies = new ArrayList<>();
+        List<PluginWrapper.Dependency> optionalDependencies = new ArrayList<>();
         String v = atts.getValue("Plugin-Dependencies");
         if (v != null) {
             for (String s : v.split(",")) {
@@ -336,7 +336,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
             } catch (AbstractMethodError e) {
                 // backward compatibility
                 for (T t : finder.findExtensions(type, hudson))
-                    r.add(new ExtensionComponent<T>(t));
+                    r.add(new ExtensionComponent<>(t));
             }
         }
 
@@ -578,7 +578,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
                 CyclicGraphDetector<PluginWrapper> cgd = new CyclicGraphDetector<PluginWrapper>() {
                     @Override
                     protected List<PluginWrapper> getEdges(PluginWrapper pw) {
-                        List<PluginWrapper> dep = new ArrayList<PluginWrapper>();
+                        List<PluginWrapper> dep = new ArrayList<>();
                         for (Dependency d : pw.getDependencies()) {
                             PluginWrapper p = pluginManager.getPlugin(d.shortName);
                             if (p!=null && p.isActive())
@@ -644,7 +644,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
         @SuppressFBWarnings(value = "DMI_COLLECTION_OF_URLS",
                             justification = "Should not produce network overheads since the URL is local. JENKINS-53793 is a follow-up")
         protected Enumeration<URL> findResources(String name) throws IOException {
-            HashSet<URL> result = new HashSet<URL>();
+            HashSet<URL> result = new HashSet<>();
 
             if (PluginManager.FAST_LOOKUP) {
                     for (PluginWrapper pw : getTransitiveDependencies()) {
diff --git a/core/src/main/java/hudson/DNSMultiCast.java b/core/src/main/java/hudson/DNSMultiCast.java
index aa71b2e23b..fcb3fe33bb 100644
--- a/core/src/main/java/hudson/DNSMultiCast.java
+++ b/core/src/main/java/hudson/DNSMultiCast.java
@@ -32,7 +32,7 @@ public class DNSMultiCast implements Closeable {
                 try {
                     jmdns = JmDNS.create();
 
-                    Map<String,String> props = new HashMap<String, String>();
+                    Map<String,String> props = new HashMap<>();
                     String rootURL = jenkins.getRootUrl();
                     if (rootURL==null)  return null;
 
diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java
index 8452227e5e..5e9d35f7ec 100644
--- a/core/src/main/java/hudson/DescriptorExtensionList.java
+++ b/core/src/main/java/hudson/DescriptorExtensionList.java
@@ -76,7 +76,7 @@ public class DescriptorExtensionList<T extends Describable<T>, D extends Descrip
         if (describableType == (Class) Publisher.class) {
             return (DescriptorExtensionList) new Publisher.DescriptorExtensionListImpl(jenkins);
         }
-        return new DescriptorExtensionList<T,D>(jenkins,describableType);
+        return new DescriptorExtensionList<>(jenkins, describableType);
     }
 
     /**
@@ -199,7 +199,7 @@ public class DescriptorExtensionList<T extends Describable<T>, D extends Descrip
     }
 
     private List<ExtensionComponent<D>> _load(Iterable<ExtensionComponent<Descriptor>> set) {
-        List<ExtensionComponent<D>> r = new ArrayList<ExtensionComponent<D>>();
+        List<ExtensionComponent<D>> r = new ArrayList<>();
         for( ExtensionComponent<Descriptor> c : set ) {
             Descriptor d = c.getInstance();
             try {
diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java
index 6d2f451071..8caaebf312 100644
--- a/core/src/main/java/hudson/EnvVars.java
+++ b/core/src/main/java/hudson/EnvVars.java
@@ -200,7 +200,7 @@ public class EnvVars extends TreeMap<String,String> {
             }
             
             public void clear() {
-                referredVariables = new TreeSet<String>(comparator);
+                referredVariables = new TreeSet<>(comparator);
             }
             
             public String resolve(String name) {
@@ -288,8 +288,8 @@ public class EnvVars extends TreeMap<String,String> {
          * Scan all variables and list all referring variables.
          */
         public void scan() {
-            refereeSetMap = new TreeMap<String, Set<String>>(comparator);
-            List<String> extendingVariableNames = new ArrayList<String>();
+            refereeSetMap = new TreeMap<>(comparator);
+            List<String> extendingVariableNames = new ArrayList<>();
             
             TraceResolver resolver = new TraceResolver(comparator);
             
@@ -327,10 +327,10 @@ public class EnvVars extends TreeMap<String,String> {
             
             // When A refers B, the last appearance of B always comes after
             // the last appearance of A.
-            List<String> reversedDuplicatedOrder = new ArrayList<String>(sorter.getSorted());
+            List<String> reversedDuplicatedOrder = new ArrayList<>(sorter.getSorted());
             Collections.reverse(reversedDuplicatedOrder);
             
-            orderedVariableNames = new ArrayList<String>(overrides.size());
+            orderedVariableNames = new ArrayList<>(overrides.size());
             for(String key: reversedDuplicatedOrder) {
                 if(overrides.containsKey(key) && !orderedVariableNames.contains(key)) {
                     orderedVariableNames.add(key);
diff --git a/core/src/main/java/hudson/ExpressionFactory2.java b/core/src/main/java/hudson/ExpressionFactory2.java
index 277858c933..c8704fccfd 100644
--- a/core/src/main/java/hudson/ExpressionFactory2.java
+++ b/core/src/main/java/hudson/ExpressionFactory2.java
@@ -168,5 +168,5 @@ final class ExpressionFactory2 implements ExpressionFactory {
      *
      * @see Functions#getCurrentJellyContext()
      */
-    protected static final ThreadLocal<JellyContext> CURRENT_CONTEXT = new ThreadLocal<JellyContext>();
+    protected static final ThreadLocal<JellyContext> CURRENT_CONTEXT = new ThreadLocal<>();
 }
diff --git a/core/src/main/java/hudson/ExtensionComponent.java b/core/src/main/java/hudson/ExtensionComponent.java
index 136d52f81a..98e03969f3 100644
--- a/core/src/main/java/hudson/ExtensionComponent.java
+++ b/core/src/main/java/hudson/ExtensionComponent.java
@@ -95,9 +95,7 @@ public class ExtensionComponent<T> implements Comparable<ExtensionComponent<T>>
         if (this.instance instanceof Descriptor && that.instance instanceof Descriptor) {
             try {
                 return Util.fixNull(((Descriptor)this.instance).getDisplayName()).compareTo(Util.fixNull(((Descriptor)that.instance).getDisplayName()));
-            } catch (RuntimeException x) {
-                LOG.log(Level.WARNING, null, x);
-            } catch (LinkageError x) {
+            } catch (RuntimeException | LinkageError x) {
                 LOG.log(Level.WARNING, null, x);
             }
         }
diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java
index b4d32bd06d..0417f1674c 100644
--- a/core/src/main/java/hudson/ExtensionList.java
+++ b/core/src/main/java/hudson/ExtensionList.java
@@ -86,7 +86,7 @@ public class ExtensionList<T> extends AbstractList<T> implements OnMaster {
     @CopyOnWrite
     private volatile List<ExtensionComponent<T>> extensions;
 
-    private final List<ExtensionListListener> listeners = new CopyOnWriteArrayList<ExtensionListListener>();
+    private final List<ExtensionListListener> listeners = new CopyOnWriteArrayList<>();
 
     /**
      * Place to store manually registered instances with the per-Hudson scope.
@@ -104,7 +104,7 @@ public class ExtensionList<T> extends AbstractList<T> implements OnMaster {
     }
 
     protected ExtensionList(Jenkins jenkins, Class<T> extensionType) {
-        this(jenkins,extensionType,new CopyOnWriteArrayList<ExtensionComponent<T>>());
+        this(jenkins,extensionType, new CopyOnWriteArrayList<>());
     }
 
     /**
@@ -237,7 +237,7 @@ public class ExtensionList<T> extends AbstractList<T> implements OnMaster {
     private synchronized boolean removeSync(Object o) {
         boolean removed = removeComponent(legacyInstances, o);
         if(extensions!=null) {
-            List<ExtensionComponent<T>> r = new ArrayList<ExtensionComponent<T>>(extensions);
+            List<ExtensionComponent<T>> r = new ArrayList<>(extensions);
             removed |= removeComponent(r,o);
             extensions = sort(r);
         }
@@ -279,11 +279,11 @@ public class ExtensionList<T> extends AbstractList<T> implements OnMaster {
     }
 
     private synchronized boolean addSync(T t) {
-        legacyInstances.add(new ExtensionComponent<T>(t));
+        legacyInstances.add(new ExtensionComponent<>(t));
         // if we've already filled extensions, add it
         if(extensions!=null) {
-            List<ExtensionComponent<T>> r = new ArrayList<ExtensionComponent<T>>(extensions);
-            r.add(new ExtensionComponent<T>(t));
+            List<ExtensionComponent<T>> r = new ArrayList<>(extensions);
+            r.add(new ExtensionComponent<>(t));
             extensions = sort(r);
         }
         return true;
@@ -395,7 +395,7 @@ public class ExtensionList<T> extends AbstractList<T> implements OnMaster {
      * The implementation should copy a list, do a sort, and return the new instance.
      */
     protected List<ExtensionComponent<T>> sort(List<ExtensionComponent<T>> r) {
-        r = new ArrayList<ExtensionComponent<T>>(r);
+        r = new ArrayList<>(r);
         Collections.sort(r);
         return r;
     }
@@ -412,7 +412,7 @@ public class ExtensionList<T> extends AbstractList<T> implements OnMaster {
     @SuppressWarnings({"unchecked", "rawtypes"})
     public static <T> ExtensionList<T> create(Jenkins jenkins, Class<T> type) {
         if(type.getAnnotation(LegacyInstancesAreScopedToHudson.class)!=null)
-            return new ExtensionList<T>(jenkins,type);
+            return new ExtensionList<>(jenkins, type);
         else {
             return new ExtensionList(jenkins, type, staticLegacyInstances.computeIfAbsent(type, key -> new CopyOnWriteArrayList()));
         }
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 66d2ea9aae..13311e72b5 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -325,7 +325,7 @@ public final class FilePath implements Serializable {
         }
         boolean isAbsolute = buf.length() > 0;
         // Split remaining path into tokens, trimming any duplicate or trailing separators
-        List<String> tokens = new ArrayList<String>();
+        List<String> tokens = new ArrayList<>();
         int s = 0, end = path.length();
         for (int i = 0; i < end; i++) {
             char c = path.charAt(i);
@@ -1061,7 +1061,7 @@ public final class FilePath implements Serializable {
         if(channel!=null) {
             // run this on a remote system
             try {
-                DelegatingCallable<T,IOException> wrapper = new FileCallableWrapper<T>(callable, cl);
+                DelegatingCallable<T,IOException> wrapper = new FileCallableWrapper<>(callable, cl);
                 for (FileCallableWrapperFactory factory : ExtensionList.lookup(FileCallableWrapperFactory.class)) {
                     wrapper = factory.wrap(wrapper);
                 }
@@ -1136,7 +1136,7 @@ public final class FilePath implements Serializable {
      */
     public <T> Future<T> actAsync(final FileCallable<T> callable) throws IOException, InterruptedException {
         try {
-            DelegatingCallable<T,IOException> wrapper = new FileCallableWrapper<T>(callable);
+            DelegatingCallable<T,IOException> wrapper = new FileCallableWrapper<>(callable);
             for (FileCallableWrapperFactory factory : ExtensionList.lookup(FileCallableWrapperFactory.class)) {
                 wrapper = factory.wrap(wrapper);
             }
@@ -1839,7 +1839,7 @@ public final class FilePath implements Serializable {
                     return Collections.emptyList();
                 }
 
-                ArrayList<FilePath> r = new ArrayList<FilePath>(children.length);
+                ArrayList<FilePath> r = new ArrayList<>(children.length);
                 for (File child : children)
                     r.add(new FilePath(child));
 
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 118a1f70fa..76fdf2f813 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -465,7 +465,7 @@ public class Functions {
     }
 
     public static Map getSystemProperties() {
-        return new TreeMap<Object,Object>(System.getProperties());
+        return new TreeMap<>(System.getProperties());
     }
 
     /**
@@ -479,7 +479,7 @@ public class Functions {
     }
 
     public static Map getEnvVars() {
-        return new TreeMap<String,String>(EnvVars.masterEnvVars);
+        return new TreeMap<>(EnvVars.masterEnvVars);
     }
 
     public static boolean isWindows() {
@@ -544,7 +544,7 @@ public class Functions {
      * @since 1.525
      */
     public static <T> Iterable<T> reverse(Collection<T> collection) {
-        List<T> list = new ArrayList<T>(collection);
+        List<T> list = new ArrayList<>(collection);
         Collections.reverse(list);
         return list;
     }
diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java
index f0f18b4f81..c6e39a27d3 100644
--- a/core/src/main/java/hudson/Launcher.java
+++ b/core/src/main/java/hudson/Launcher.java
@@ -197,14 +197,14 @@ public abstract class Launcher {
         }
 
         public ProcStarter cmds(File program, String... args) {
-            commands = new ArrayList<String>(args.length+1);
+            commands = new ArrayList<>(args.length + 1);
             commands.add(program.getPath());
             commands.addAll(Arrays.asList(args));
             return this;
         }
 
         public ProcStarter cmds(List<String> args) {
-            commands = new ArrayList<String>(args);
+            commands = new ArrayList<>(args);
             return this;
         }
 
@@ -774,7 +774,7 @@ public abstract class Launcher {
      */
     protected final void maskedPrintCommandLine(@Nonnull List<String> cmd, @CheckForNull boolean[] mask, @CheckForNull FilePath workDir) {
         if(mask==null) {
-            printCommandLine(cmd.toArray(new String[cmd.size()]),workDir);
+            printCommandLine(cmd.toArray(new String[0]),workDir);
             return;
         }
         
diff --git a/core/src/main/java/hudson/Lookup.java b/core/src/main/java/hudson/Lookup.java
index 090f3eb284..b0b40ba891 100644
--- a/core/src/main/java/hudson/Lookup.java
+++ b/core/src/main/java/hudson/Lookup.java
@@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @author Kohsuke Kawaguchi
  */
 public class Lookup {
-    private final ConcurrentHashMap<Class,Object> data = new ConcurrentHashMap<Class,Object>();
+    private final ConcurrentHashMap<Class,Object> data = new ConcurrentHashMap<>();
 
     public <T> T get(Class<T> type) {
         return type.cast(data.get(type));
diff --git a/core/src/main/java/hudson/Main.java b/core/src/main/java/hudson/Main.java
index c4aa942755..14ae9ee38f 100644
--- a/core/src/main/java/hudson/Main.java
+++ b/core/src/main/java/hudson/Main.java
@@ -42,6 +42,7 @@ import java.net.HttpRetryException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.nio.charset.Charset;
 
@@ -152,9 +153,8 @@ public class Main {
                 // run the command
                 long start = System.currentTimeMillis();
 
-                List<String> cmd = new ArrayList<String>();
-                for( int i=1; i<args.length; i++ )
-                    cmd.add(args[i]);
+                List<String> cmd = new ArrayList<>();
+                cmd.addAll(Arrays.asList(args).subList(1, args.length));
                 Proc proc = new Proc.LocalProc(cmd.toArray(new String[0]),(String[])null,System.in,
                     new DualOutputStream(System.out,new EncodingStream(os)));
 
diff --git a/core/src/main/java/hudson/MarkupText.java b/core/src/main/java/hudson/MarkupText.java
index 12a9b3b848..107c8fbdfc 100644
--- a/core/src/main/java/hudson/MarkupText.java
+++ b/core/src/main/java/hudson/MarkupText.java
@@ -45,7 +45,7 @@ public class MarkupText extends AbstractMarkupText {
     /**
      * Added mark up tags.
      */
-    private final List<Tag> tags = new ArrayList<Tag>();
+    private final List<Tag> tags = new ArrayList<>();
 
     /**
      * Represents one mark up inserted into text.
diff --git a/core/src/main/java/hudson/PermalinkList.java b/core/src/main/java/hudson/PermalinkList.java
index 0c4a3085a6..caffd8baf0 100644
--- a/core/src/main/java/hudson/PermalinkList.java
+++ b/core/src/main/java/hudson/PermalinkList.java
@@ -60,7 +60,7 @@ public final class PermalinkList extends ArrayList<Permalink> {
      * Finds the closest name match by its ID.
      */
     public Permalink findNearest(String id) {
-        List<String> ids = new ArrayList<String>();
+        List<String> ids = new ArrayList<>();
         for (Permalink p : this)
             ids.add(p.getId());
         String nearest = EditDistance.findNearest(id, ids);
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index c26ca2439d..62c21991b3 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -284,9 +284,9 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
     /**
      * All active plugins, topologically sorted so that when X depends on Y, Y appears in the list before X does.
      */
-    protected final List<PluginWrapper> activePlugins = new CopyOnWriteArrayList<PluginWrapper>();
+    protected final List<PluginWrapper> activePlugins = new CopyOnWriteArrayList<>();
 
-    protected final List<FailedPlugin> failedPlugins = new ArrayList<FailedPlugin>();
+    protected final List<FailedPlugin> failedPlugins = new ArrayList<>();
 
     /**
      * Plug-in root directory.
@@ -422,7 +422,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
                             // once we've listed plugins, we can fill in the reactor with plugin-specific initialization tasks
                             TaskGraphBuilder g = new TaskGraphBuilder();
 
-                            final Map<String,File> inspectedShortNames = new HashMap<String,File>();
+                            final Map<String,File> inspectedShortNames = new HashMap<>();
 
                             for( final File arc : archives ) {
                                 g.followedBy().notFatal().attains(PLUGINS_LISTED).add("Inspecting plugin " + arc, new Executable() {
@@ -465,7 +465,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
                                         CyclicGraphDetector<PluginWrapper> cgd = new CyclicGraphDetector<PluginWrapper>() {
                                             @Override
                                             protected List<PluginWrapper> getEdges(PluginWrapper p) {
-                                                List<PluginWrapper> next = new ArrayList<PluginWrapper>();
+                                                List<PluginWrapper> next = new ArrayList<>();
                                                 addTo(p.getDependencies(), next);
                                                 addTo(p.getOptionalDependencies(), next);
                                                 return next;
@@ -537,7 +537,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
                     TaskGraphBuilder g = new TaskGraphBuilder();
 
                     // schedule execution of loading plugins
-                    for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[activePlugins.size()])) {
+                    for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[0])) {
                         g.followedBy().notFatal().attains(PLUGINS_PREPARED).add(String.format("Loading plugin %s v%s (%s)", p.getLongName(), p.getVersion(), p.getShortName()), new Executable() {
                             public void run(Reactor session) throws Exception {
                                 try {
@@ -560,7 +560,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
                     }
 
                     // schedule execution of initializing plugins
-                    for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[activePlugins.size()])) {
+                    for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[0])) {
                         g.followedBy().notFatal().attains(PLUGINS_STARTED).add("Initializing plugin " + p.getShortName(), new Executable() {
                             public void run(Reactor session) throws Exception {
                                 if (!activePlugins.contains(p)) {
@@ -1241,7 +1241,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
      * @return The list of plugins implementing the specified class.
      */
     public List<PluginWrapper> getPlugins(Class<? extends Plugin> pluginSuperclass) {
-        List<PluginWrapper> result = new ArrayList<PluginWrapper>();
+        List<PluginWrapper> result = new ArrayList<>();
         for (PluginWrapper p : getPlugins()) {
             if(pluginSuperclass.isInstance(p.getPlugin()))
                 result.add(p);
@@ -1264,7 +1264,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
      */
     @Deprecated
     public <T> Collection<Class<? extends T>> discover( Class<T> spi ) {
-        Set<Class<? extends T>> result = new HashSet<Class<? extends T>>();
+        Set<Class<? extends T>> result = new HashSet<>();
 
         for (PluginWrapper p : activePlugins) {
             Service.load(spi, p.classLoader, result);
@@ -1770,12 +1770,9 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
 
     protected String identifyPluginShortName(File t) {
         try {
-            JarFile j = new JarFile(t);
-            try {
+            try (JarFile j = new JarFile(t)) {
                 String name = j.getManifest().getMainAttributes().getValue("Short-Name");
-                if (name!=null) return name;
-            } finally {
-                j.close();
+                if (name != null) return name;
             }
         } catch (IOException e) {
             LOGGER.log(WARNING, "Failed to identify the short name from "+t,e);
@@ -1807,7 +1804,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
      */
     public List<Future<UpdateCenter.UpdateCenterJob>> prevalidateConfig(InputStream configXml) throws IOException {
         Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
-        List<Future<UpdateCenter.UpdateCenterJob>> jobs = new ArrayList<Future<UpdateCenter.UpdateCenterJob>>();
+        List<Future<UpdateCenter.UpdateCenterJob>> jobs = new ArrayList<>();
         UpdateCenter uc = Jenkins.getInstance().getUpdateCenter();
         // TODO call uc.updateAllSites() when available? perhaps not, since we should not block on network here
         for (Map.Entry<String,VersionNumber> requestedPlugin : parseRequestedPlugins(configXml).entrySet()) {
@@ -1901,7 +1898,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
      * Parses configuration XML files and picks up references to XML files.
      */
     public Map<String,VersionNumber> parseRequestedPlugins(InputStream configXml) throws IOException {
-        final Map<String,VersionNumber> requestedPlugins = new TreeMap<String,VersionNumber>();
+        final Map<String,VersionNumber> requestedPlugins = new TreeMap<>();
         try {
             SAXParserFactory.newInstance().newSAXParser().parse(configXml, new DefaultHandler() {
                 @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
@@ -1981,16 +1978,16 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
          * Make generated types visible.
          * Keyed by the generated class name.
          */
-        private ConcurrentMap<String, WeakReference<Class>> generatedClasses = new ConcurrentHashMap<String, WeakReference<Class>>();
+        private ConcurrentMap<String, WeakReference<Class>> generatedClasses = new ConcurrentHashMap<>();
         /** Cache of loaded, or known to be unloadable, classes. */
-        private final Map<String,Class<?>> loaded = new HashMap<String,Class<?>>();
+        private final Map<String,Class<?>> loaded = new HashMap<>();
 
         public UberClassLoader() {
             super(PluginManager.class.getClassLoader());
         }
 
         public void addNamedClass(String className, Class c) {
-            generatedClasses.put(className,new WeakReference<Class>(c));
+            generatedClasses.put(className, new WeakReference<>(c));
         }
 
         @Override
@@ -2071,7 +2068,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
 
         @Override
         protected Enumeration<URL> findResources(String name) throws IOException {
-            List<URL> resources = new ArrayList<URL>();
+            List<URL> resources = new ArrayList<>();
             if (FAST_LOOKUP) {
                     for (PluginWrapper p : activePlugins) {
                         resources.addAll(Collections.list(ClassLoaderReflectionToolkit._findResources(p.classLoader, name)));
diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java
index bd2b8a1581..62f66b5471 100644
--- a/core/src/main/java/hudson/TcpSlaveAgentListener.java
+++ b/core/src/main/java/hudson/TcpSlaveAgentListener.java
@@ -33,6 +33,7 @@ import java.security.interfaces.RSAPublicKey;
 import javax.annotation.Nullable;
 
 import hudson.model.AperiodicWork;
+import hudson.util.VersionNumber;
 import jenkins.model.Jenkins;
 import jenkins.model.identity.InstanceIdentityProvider;
 import jenkins.security.stapler.StaplerAccessibleType;
@@ -153,6 +154,14 @@ public final class TcpSlaveAgentListener extends Thread {
         return StringUtils.join(Jenkins.getInstance().getAgentProtocols(), ", ");
     }
 
+    /**
+     * Gets Remoting minimum supported version to prevent unsupported agents from connecting
+     * @since 2.171
+     */
+    public VersionNumber getRemotingMinimumVersion() {
+        return RemotingVersionInfo.getMinimumSupportedVersion();
+    }
+
     @Override
     public void run() {
         try {
@@ -293,8 +302,7 @@ public final class TcpSlaveAgentListener extends Thread {
         private void respondHello(String header, Socket s) throws IOException {
             try {
                 Writer o = new OutputStreamWriter(s.getOutputStream(), StandardCharsets.UTF_8);
-
-                //TODO: expose version about minimum supported Remoting version (JENKINS-48766)
+                
                 if (header.startsWith("GET / ")) {
                     o.write("HTTP/1.0 200 OK\r\n");
                     o.write("Content-Type: text/plain;charset=UTF-8\r\n");
@@ -304,7 +312,7 @@ public final class TcpSlaveAgentListener extends Thread {
                     o.write("Jenkins-Session: " + Jenkins.SESSION_HASH + "\r\n");
                     o.write("Client: " + s.getInetAddress().getHostAddress() + "\r\n");
                     o.write("Server: " + s.getLocalAddress().getHostAddress() + "\r\n");
-                    o.write("Remoting-Minimum-Version: " + RemotingVersionInfo.getMinimumSupportedVersion() + "\r\n");
+                    o.write("Remoting-Minimum-Version: " + getRemotingMinimumVersion() + "\r\n");
                     o.flush();
                     s.shutdownOutput();
                 } else {
diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 9699df02c8..dc3de475bf 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -114,7 +114,7 @@ public class Util {
      */
     @Nonnull
     public static <T> List<T> filter( @Nonnull Iterable<?> base, @Nonnull Class<T> type ) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         for (Object i : base) {
             if(type.isInstance(i))
                 r.add(type.cast(i));
@@ -144,7 +144,7 @@ public class Util {
      */
     @Nullable
     public static String replaceMacro( @CheckForNull String s, @Nonnull Map<String,String> properties) {
-        return replaceMacro(s,new VariableResolver.ByMap<String>(properties));
+        return replaceMacro(s, new VariableResolver.ByMap<>(properties));
     }
 
     /**
@@ -783,7 +783,7 @@ public class Util {
      */
     @Nonnull
     public static <T> List<T> createSubList(@Nonnull Collection<?> source, @Nonnull Class<T> type ) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         for (Object item : source) {
             if(type.isInstance(item))
                 r.add(type.cast(item));
@@ -1117,7 +1117,7 @@ public class Util {
         int size = 0;
         for (Collection<? extends T> item : items)
             size += item.size();
-        List<T> r = new ArrayList<T>(size);
+        List<T> r = new ArrayList<>(size);
         for (Collection<? extends T> item : items)
             r.addAll(item);
         return r;
diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java
index 738c738a63..e9c8f5765f 100644
--- a/core/src/main/java/hudson/cli/CLICommand.java
+++ b/core/src/main/java/hudson/cli/CLICommand.java
@@ -243,7 +243,7 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable {
 
             if (!(this instanceof HelpCommand || this instanceof WhoAmICommand))
                 Jenkins.getActiveInstance().checkPermission(Jenkins.READ);
-            p.parseArgument(args.toArray(new String[args.size()]));
+            p.parseArgument(args.toArray(new String[0]));
             if (!(this instanceof HelpCommand || this instanceof WhoAmICommand))
                 Jenkins.getActiveInstance().checkPermission(Jenkins.READ);
             LOGGER.log(Level.FINE, "Invoking CLI command {0}, with {1} arguments, as user {2}.",
@@ -530,7 +530,7 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable {
 
     private static final Logger LOGGER = Logger.getLogger(CLICommand.class.getName());
 
-    private static final ThreadLocal<CLICommand> CURRENT_COMMAND = new ThreadLocal<CLICommand>();
+    private static final ThreadLocal<CLICommand> CURRENT_COMMAND = new ThreadLocal<>();
 
     /*package*/ static CLICommand setCurrent(CLICommand cmd) {
         CLICommand old = getCurrent();
diff --git a/core/src/main/java/hudson/cli/GroovyCommand.java b/core/src/main/java/hudson/cli/GroovyCommand.java
index ea05dca912..f87ba80abc 100644
--- a/core/src/main/java/hudson/cli/GroovyCommand.java
+++ b/core/src/main/java/hudson/cli/GroovyCommand.java
@@ -68,7 +68,7 @@ public class GroovyCommand extends CLICommand {
         binding.setProperty("stderr",stderr);
 
         GroovyShell groovy = new GroovyShell(Jenkins.getActiveInstance().getPluginManager().uberClassLoader, binding);
-        groovy.run(loadScript(),"RemoteClass",remaining.toArray(new String[remaining.size()]));
+        groovy.run(loadScript(),"RemoteClass",remaining.toArray(new String[0]));
         return 0;
     }
 
diff --git a/core/src/main/java/hudson/cli/InstallPluginCommand.java b/core/src/main/java/hudson/cli/InstallPluginCommand.java
index 2bbabe09c6..5279a7fd3a 100644
--- a/core/src/main/java/hudson/cli/InstallPluginCommand.java
+++ b/core/src/main/java/hudson/cli/InstallPluginCommand.java
@@ -63,7 +63,7 @@ public class InstallPluginCommand extends CLICommand {
             "and the plugin will be installed from the update center. If the short name includes a minimum version number " +
             "(like ‘findbugs:1.4’), and there are multiple update centers publishing different versions, the update centers " +
             "will be searched in order for the first one publishing a version that is at least the specified version.")
-    public List<String> sources = new ArrayList<String>();
+    public List<String> sources = new ArrayList<>();
 
     @Option(name="-name",usage="If specified, the plugin will be installed as this short name (whereas normally the name is inferred from the source name automatically).")
     public String name; // TODO better to parse out Short-Name from the manifest and deprecate this option
diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java
index 2cd2988ede..f29430b1b2 100644
--- a/core/src/main/java/hudson/console/AnnotatedLargeText.java
+++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java
@@ -54,6 +54,7 @@ import com.jcraft.jzlib.GZIPInputStream;
 import com.jcraft.jzlib.GZIPOutputStream;
 
 import static java.lang.Math.abs;
+import javax.annotation.CheckReturnValue;
 import org.jenkinsci.remoting.util.AnonymousClassWarnings;
 
 /**
@@ -139,6 +140,7 @@ public class AnnotatedLargeText<T> extends LargeText {
         return ConsoleAnnotator.initial(context);
     }
 
+    @CheckReturnValue
     @Override
     public long writeLogTo(long start, Writer w) throws IOException {
         if (isHtml())
@@ -151,6 +153,7 @@ public class AnnotatedLargeText<T> extends LargeText {
      * Strips annotations using a {@link PlainTextConsoleOutputStream}.
      * {@inheritDoc}
      */
+    @CheckReturnValue
     @Override
     public long writeLogTo(long start, OutputStream out) throws IOException {
         return super.writeLogTo(start, new PlainTextConsoleOutputStream(out));
@@ -160,10 +163,12 @@ public class AnnotatedLargeText<T> extends LargeText {
      * Calls {@link LargeText#writeLogTo(long, OutputStream)} without stripping annotations as {@link #writeLogTo(long, OutputStream)} would.
      * @since 1.577
      */
+    @CheckReturnValue
     public long writeRawLogTo(long start, OutputStream out) throws IOException {
         return super.writeLogTo(start, out);
     }
 
+    @CheckReturnValue
     public long writeHtmlTo(long start, Writer w) throws IOException {
         ConsoleAnnotationOutputStream<T> caw = new ConsoleAnnotationOutputStream<>(
                 w, createAnnotator(Stapler.getCurrentRequest()), context, charset);
diff --git a/core/src/main/java/hudson/console/ConsoleAnnotationOutputStream.java b/core/src/main/java/hudson/console/ConsoleAnnotationOutputStream.java
index f3a22c875c..5c731a17dd 100644
--- a/core/src/main/java/hudson/console/ConsoleAnnotationOutputStream.java
+++ b/core/src/main/java/hudson/console/ConsoleAnnotationOutputStream.java
@@ -24,9 +24,6 @@
 package hudson.console;
 
 import hudson.MarkupText;
-import org.apache.commons.io.output.ProxyWriter;
-import org.kohsuke.stapler.framework.io.WriterOutputStream;
-
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -38,6 +35,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.apache.commons.io.output.ProxyWriter;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.kohsuke.stapler.framework.io.WriterOutputStream;
 
 /**
  * Used to convert plain text console output (as byte sequence) + embedded annotations into HTML (as char sequence),
@@ -119,11 +119,9 @@ public class ConsoleAnnotationOutputStream<T> extends LineTransformationOutputSt
                             }
                         });
                     }
-                } catch (IOException e) {
+                } catch (IOException | ClassNotFoundException e) {
                     // if we failed to resurrect an annotation, ignore it.
-                    LOGGER.log(Level.FINE,"Failed to resurrect annotation",e);
-                } catch (ClassNotFoundException e) {
-                    LOGGER.log(Level.FINE,"Failed to resurrect annotation",e);
+                    LOGGER.log(Level.FINE, "Failed to resurrect annotation from \"" + StringEscapeUtils.escapeJava(new String(in, next, rest)) + "\"", e);
                 }
 
                 int bytesUsed = rest - b.available(); // bytes consumed by annotations
diff --git a/core/src/main/java/hudson/console/ConsoleLogFilter.java b/core/src/main/java/hudson/console/ConsoleLogFilter.java
index ec1b0c0592..99fe50eca3 100644
--- a/core/src/main/java/hudson/console/ConsoleLogFilter.java
+++ b/core/src/main/java/hudson/console/ConsoleLogFilter.java
@@ -36,6 +36,8 @@ import hudson.util.ArgumentListBuilder;
 import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.Serializable;
+import jenkins.util.JenkinsJVM;
 
 /**
  * A hook to allow filtering of information that is written to the console log.
@@ -43,6 +45,10 @@ import java.io.OutputStream;
  * direct access to the underlying {@link OutputStream} so it's possible to suppress
  * data, which isn't possible from the other interfaces.
  * ({@link ArgumentListBuilder#add(String, boolean)} is a simpler way to suppress a single password.)
+ * <p>Implementations which are {@link Serializable} may be sent to an agent JVM for processing.
+ * In particular, this happens under <a href="https://jenkins.io/jep/210">JEP-210</a>.
+ * In this case, the implementation should not assume that {@link JenkinsJVM#isJenkinsJVM},
+ * and if generating {@link ConsoleNote}s will need to encode them on the master side first.
  * @author dty
  * @since 1.383
  * @see BuildWrapper#decorateLogger
diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java
index b4f67cf3d6..2b646cab4b 100644
--- a/core/src/main/java/hudson/console/ConsoleNote.java
+++ b/core/src/main/java/hudson/console/ConsoleNote.java
@@ -110,6 +110,17 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
  * is also important, although {@link ConsoleNote}s that failed to deserialize will be simply ignored, so the
  * worst thing that can happen is that you just lose some notes.
  *
+ * <p>
+ * Note that {@link #encode}, {@link #encodeTo(OutputStream)}, and {@link #encodeTo(Writer)}
+ * should be called on the Jenkins master.
+ * If called from an agent JVM, a signature will be missing and so as per
+ * <a href="https://jenkins.io/security/advisory/2017-02-01/#persisted-cross-site-scripting-vulnerability-in-console-notes">SECURITY-382</a>
+ * the console note will be ignored.
+ * This may happen, in particular, if the note was generated by a {@link ConsoleLogFilter} sent to the agent.
+ * Alternative solutions include using a {@link ConsoleAnnotatorFactory} where practical;
+ * or generating the encoded form of the note on the master side and sending it to the agent,
+ * for example by saving that form as instance fields in a {@link ConsoleLogFilter} implementation.
+ *
  * <h2>Behaviour, JavaScript, and CSS</h2>
  * <p>
  * {@link ConsoleNote} can have associated {@code script.js} and {@code style.css} (put them
@@ -192,18 +203,15 @@ public abstract class ConsoleNote<T> implements Serializable, Describable<Consol
 
         ByteArrayOutputStream buf2 = new ByteArrayOutputStream();
 
-        DataOutputStream dos = new DataOutputStream(new Base64OutputStream(buf2,true,-1,null));
-        try {
+        try (DataOutputStream dos = new DataOutputStream(new Base64OutputStream(buf2, true, -1, null))) {
             buf2.write(PREAMBLE);
             if (JenkinsJVM.isJenkinsJVM()) { // else we are in another JVM and cannot sign; result will be ignored unless INSECURE
                 byte[] mac = MAC.mac(buf.toByteArray());
-                dos.writeInt(- mac.length); // negative to differentiate from older form
+                dos.writeInt(-mac.length); // negative to differentiate from older form
                 dos.write(mac);
             }
             dos.writeInt(buf.size());
             buf.writeTo(dos);
-        } finally {
-            dos.close();
         }
         buf2.write(POSTAMBLE);
         return buf2;
@@ -239,6 +247,9 @@ public abstract class ConsoleNote<T> implements Serializable, Describable<Consol
                 mac = new byte[macSz];
                 decoded.readFully(mac);
                 sz = decoded.readInt();
+                if (sz < 0) {
+                    throw new IOException("Corrupt stream");
+                }
             } else {
                 mac = null;
                 sz = - macSz;
@@ -251,12 +262,12 @@ public abstract class ConsoleNote<T> implements Serializable, Describable<Consol
             if (!Arrays.equals(postamble,POSTAMBLE))
                 return null;    // not a valid postamble
 
-            if (mac == null) {
-                if (!INSECURE) {
+            if (!INSECURE) {
+                if (mac == null) {
                     throw new IOException("Refusing to deserialize unsigned note from an old log.");
+                } else if (!MAC.checkMac(buf, mac)) {
+                    throw new IOException("MAC mismatch");
                 }
-            } else if (!MAC.checkMac(buf, mac)) {
-                throw new IOException("MAC mismatch");
             }
 
             Jenkins jenkins = Jenkins.getInstance();
@@ -337,7 +348,7 @@ public abstract class ConsoleNote<T> implements Serializable, Describable<Consol
      * @since 1.350
      */
     public static List<String> removeNotes(Collection<String> logLines) {
-        List<String> r = new ArrayList<String>(logLines.size());
+        List<String> r = new ArrayList<>(logLines.size());
         for (String l : logLines)
             r.add(removeNotes(l));
         return r;
diff --git a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java
index 1ba648eb38..eba9991aff 100644
--- a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java
@@ -53,7 +53,7 @@ public final class MemoryUsageMonitor extends PeriodicWork {
      * A memory group is conceptually a set of memory pools. 
      */
     public final class MemoryGroup {
-        private final List<MemoryPoolMXBean> pools = new ArrayList<MemoryPoolMXBean>();
+        private final List<MemoryPoolMXBean> pools = new ArrayList<>();
 
         /**
          * Trend of the memory usage, after GCs.
diff --git a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
index 8b3778262e..27a5685f1d 100644
--- a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
@@ -55,7 +55,7 @@ public class NullIdDescriptorMonitor extends AdministrativeMonitor {
         return Messages.NullIdDescriptorMonitor_DisplayName();
     }
 
-    private final List<Descriptor> problems = new ArrayList<Descriptor>();
+    private final List<Descriptor> problems = new ArrayList<>();
 
     @Override
     public boolean isActivated() {
diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
index 7fc185737c..c4317b4816 100644
--- a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
@@ -78,7 +78,7 @@ import org.kohsuke.stapler.interceptor.RequirePOST;
 public class OldDataMonitor extends AdministrativeMonitor {
     private static final Logger LOGGER = Logger.getLogger(OldDataMonitor.class.getName());
 
-    private ConcurrentMap<SaveableReference,VersionRange> data = new ConcurrentHashMap<SaveableReference,VersionRange>();
+    private ConcurrentMap<SaveableReference,VersionRange> data = new ConcurrentHashMap<>();
 
     /**
      * Gets instance of the monitor.
@@ -106,7 +106,7 @@ public class OldDataMonitor extends AdministrativeMonitor {
     }
 
     public Map<Saveable,VersionRange> getData() {
-        Map<Saveable,VersionRange> r = new HashMap<Saveable,VersionRange>();
+        Map<Saveable,VersionRange> r = new HashMap<>();
         for (Map.Entry<SaveableReference,VersionRange> entry : this.data.entrySet()) {
             Saveable s = entry.getKey().get();
             if (s != null) {
diff --git a/core/src/main/java/hudson/init/InitStrategy.java b/core/src/main/java/hudson/init/InitStrategy.java
index 9d7d287c43..c6c5795e54 100644
--- a/core/src/main/java/hudson/init/InitStrategy.java
+++ b/core/src/main/java/hudson/init/InitStrategy.java
@@ -45,7 +45,7 @@ public class InitStrategy {
      *      and when that happens, Jenkins will ignore all but the first one in the list.
      */
     public List<File> listPluginArchives(PluginManager pm) throws IOException {
-        List<File> r = new ArrayList<File>();
+        List<File> r = new ArrayList<>();
 
         // the ordering makes sure that during the debugging we get proper precedence among duplicates.
         // for example, while doing "mvn jpi:run" or "mvn hpi:run" on a plugin that's bundled with Jenkins, we want to the
diff --git a/core/src/main/java/hudson/init/TaskMethodFinder.java b/core/src/main/java/hudson/init/TaskMethodFinder.java
index 0e09bfe267..bbd60a61bf 100644
--- a/core/src/main/java/hudson/init/TaskMethodFinder.java
+++ b/core/src/main/java/hudson/init/TaskMethodFinder.java
@@ -32,7 +32,7 @@ import static java.util.logging.Level.WARNING;
 abstract class TaskMethodFinder<T extends Annotation> extends TaskBuilder {
     private static final Logger LOGGER = Logger.getLogger(TaskMethodFinder.class.getName());
     protected final ClassLoader cl;
-    private final Set<Method> discovered = new HashSet<Method>();
+    private final Set<Method> discovered = new HashSet<>();
 
     private final Class<T> type;
     private final Class<? extends Enum> milestoneType;
@@ -52,7 +52,7 @@ abstract class TaskMethodFinder<T extends Annotation> extends TaskBuilder {
     protected abstract boolean fatalOf(T i);
 
     public Collection<Task> discoverTasks(Reactor session) throws IOException {
-        List<Task> result = new ArrayList<Task>();
+        List<Task> result = new ArrayList<>();
         for (Method e : Index.list(type, cl, Method.class)) {
             if (filter(e)) continue;   // already reported once
 
@@ -180,7 +180,7 @@ abstract class TaskMethodFinder<T extends Annotation> extends TaskBuilder {
         }
 
         private Collection<Milestone> toMilestones(String[] tokens, Milestone m) {
-            List<Milestone> r = new ArrayList<Milestone>();
+            List<Milestone> r = new ArrayList<>();
             for (String s : tokens) {
                 try {
                     r.add((Milestone)Enum.valueOf(milestoneType,s));
diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java
index 1af9c13155..a17c898ab3 100644
--- a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java
+++ b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java
@@ -56,11 +56,8 @@ public class UnixLifecycle extends Lifecycle {
 
             // if we are running as daemon, don't fork into background one more time during restart
             args.remove("--daemon");
-        } catch (UnsupportedOperationException e) {
-            // can't restart
-            failedToObtainArgs = e;
-        } catch (LinkageError e) {
-            // see HUDSON-3875
+        } catch (UnsupportedOperationException | LinkageError e) {
+            // can't restart / see HUDSON-3875
             failedToObtainArgs = e;
         }
     }
@@ -86,7 +83,7 @@ public class UnixLifecycle extends Lifecycle {
 
         // exec to self
         String exe = args.get(0);
-        LIBC.execvp(exe, new StringArray(args.toArray(new String[args.size()])));
+        LIBC.execvp(exe, new StringArray(args.toArray(new String[0])));
         throw new IOException("Failed to exec '"+exe+"' "+LIBC.strerror(Native.getLastError()));
     }
 
diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
index 64bd857be7..414d39b4e6 100644
--- a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
+++ b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
@@ -215,9 +215,7 @@ public class WindowsInstallerLink extends ManagementLink {
                                 int r = runElevated(
                                         new File(installationDir, "jenkins.exe"), "start", task, installationDir);
                                 task.getLogger().println(r==0?"Successfully started":"start service failed. Exit code="+r);
-                            } catch (IOException e) {
-                                e.printStackTrace();
-                            } catch (InterruptedException e) {
+                            } catch (IOException | InterruptedException e) {
                                 e.printStackTrace();
                             }
                         }
diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java
index 0ca0d57196..85de032387 100644
--- a/core/src/main/java/hudson/logging/LogRecorder.java
+++ b/core/src/main/java/hudson/logging/LogRecorder.java
@@ -75,7 +75,7 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
 public class LogRecorder extends AbstractModelObject implements Saveable {
     private volatile String name;
 
-    public final CopyOnWriteList<Target> targets = new CopyOnWriteList<Target>();
+    public final CopyOnWriteList<Target> targets = new CopyOnWriteList<>();
     private final static TargetComparator TARGET_COMPARATOR = new TargetComparator();
     
     @Restricted(NoExternalUse.class)
diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java
index 78c24c2a2e..a572900a55 100644
--- a/core/src/main/java/hudson/logging/LogRecorderManager.java
+++ b/core/src/main/java/hudson/logging/LogRecorderManager.java
@@ -68,7 +68,7 @@ public class LogRecorderManager extends AbstractModelObject implements ModelObje
     /**
      * {@link LogRecorder}s keyed by their {@linkplain LogRecorder#name name}.
      */
-    public transient final Map<String,LogRecorder> logRecorders = new CopyOnWriteMap.Tree<String,LogRecorder>();
+    public transient final Map<String,LogRecorder> logRecorders = new CopyOnWriteMap.Tree<>();
 
     public String getDisplayName() {
         return Messages.LogRecorderManager_DisplayName();
@@ -160,7 +160,7 @@ public class LogRecorderManager extends AbstractModelObject implements ModelObje
         String level = req.getParameter("level");
         if(level!=null) {
             Level threshold = Level.parse(level);
-            List<LogRecord> filtered = new ArrayList<LogRecord>();
+            List<LogRecord> filtered = new ArrayList<>();
             for (LogRecord r : logs) {
                 if(r.getLevel().intValue() >= threshold.intValue())
                     filtered.add(r);
diff --git a/core/src/main/java/hudson/logging/WeakLogHandler.java b/core/src/main/java/hudson/logging/WeakLogHandler.java
index 339c50ef64..9a51f279de 100644
--- a/core/src/main/java/hudson/logging/WeakLogHandler.java
+++ b/core/src/main/java/hudson/logging/WeakLogHandler.java
@@ -44,7 +44,7 @@ public final class WeakLogHandler extends Handler {
     public WeakLogHandler(Handler target, Logger logger) {
         this.logger = logger;
         logger.addHandler(this);
-        this.target = new WeakReference<Handler>(target);
+        this.target = new WeakReference<>(target);
     }
 
     public void publish(LogRecord record) {
diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 2268f3dd99..3c2c1b4412 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -465,7 +465,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                     listener.getLogger().print(Messages.AbstractBuild_BuildingOnMaster());
                 } else {
                     listener.getLogger().print(Messages.AbstractBuild_BuildingRemotely(ModelHyperlinkNote.encodeTo("/computer/" + builtOn, node.getDisplayName())));
-                    Set<LabelAtom> assignedLabels = new HashSet<LabelAtom>(node.getAssignedLabels());
+                    Set<LabelAtom> assignedLabels = new HashSet<>(node.getAssignedLabels());
                     assignedLabels.remove(node.getSelfLabel());
                     if (!assignedLabels.isEmpty()) {
                         boolean first = true;
@@ -536,7 +536,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                     l = bw.decorateLauncher(AbstractBuild.this,l,listener);
             }
 
-            buildEnvironments = new ArrayList<Environment>();
+            buildEnvironments = new ArrayList<>();
 
             for (RunListener rl: RunListener.all()) {
                 Environment environment = rl.setUpEnvironment(AbstractBuild.this, l, listener);
@@ -583,7 +583,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                         }
 
                         build.scm = scm.createChangeLogParser();
-                        build.changeSet = new WeakReference<ChangeLogSet<? extends Entry>>(build.calcChangeSet());
+                        build.changeSet = new WeakReference<>(build.calcChangeSet());
 
                         for (SCMListener l : SCMListener.all())
                             try {
@@ -635,7 +635,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                 post2(listener);
             } finally {
                 // update the culprit list
-                HashSet<String> r = new HashSet<String>();
+                HashSet<String> r = new HashSet<>();
                 for (User u : getCulprits())
                     r.add(u.getId());
                 culprits = ImmutableSortedSet.copyOf(r);
@@ -694,10 +694,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                                 setResult(Result.FAILURE);
                             }
                         }
-                    } catch (Exception e) {
-                        reportError(bs, e, listener, phase);
-                        r = false;
-                    } catch (LinkageError e) {
+                    } catch (Exception | LinkageError e) {
                         reportError(bs, e, listener, phase);
                         r = false;
                     }
@@ -742,10 +739,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
             try {
 
                 canContinue = mon.perform(bs, AbstractBuild.this, launcher, listener);
-            } catch (RequestAbortedException ex) {
-                // Channel is closed, do not continue
-                reportBrokenChannel(listener);
-            } catch (ChannelClosedException ex) {
+            } catch (RequestAbortedException | ChannelClosedException ex) {
                 // Channel is closed, do not continue
                 reportBrokenChannel(listener);
             } catch (RuntimeException ex) {
@@ -834,7 +828,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
         if (cs==null)
             cs = ChangeLogSet.createEmpty(this);
 
-        changeSet = new WeakReference<ChangeLogSet<? extends Entry>>(cs);
+        changeSet = new WeakReference<>(cs);
         return cs;
     }
 
@@ -859,9 +853,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
 
         try {
             return scm.parse(this,changelogFile);
-        } catch (IOException e) {
-            LOGGER.log(WARNING, "Failed to parse "+changelogFile,e);
-        } catch (SAXException e) {
+        } catch (IOException | SAXException e) {
             LOGGER.log(WARNING, "Failed to parse "+changelogFile,e);
         }
         return ChangeLogSet.createEmpty(this);
@@ -903,7 +895,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
     public EnvironmentList getEnvironments() {
         Executor e = Executor.currentExecutor();
         if (e!=null && e.getCurrentExecutable()==this) {
-            if (buildEnvironments==null)    buildEnvironments = new ArrayList<Environment>();
+            if (buildEnvironments==null)    buildEnvironments = new ArrayList<>();
             return new EnvironmentList(buildEnvironments); 
         }
         
@@ -936,7 +928,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
      * @since 1.378
      */
     public Set<String> getSensitiveBuildVariables() {
-        Set<String> s = new HashSet<String>();
+        Set<String> s = new HashSet<>();
 
         ParametersAction parameters = getAction(ParametersAction.class);
         if (parameters != null) {
@@ -973,7 +965,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
      *      The returned map is mutable so that subtypes can put more values.
      */
     public Map<String,String> getBuildVariables() {
-        Map<String,String> r = new HashMap<String, String>();
+        Map<String,String> r = new HashMap<>();
 
         ParametersAction parameters = getAction(ParametersAction.class);
         if (parameters!=null) {
@@ -1000,7 +992,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
      * Creates {@link VariableResolver} backed by {@link #getBuildVariables()}.
      */
     public final VariableResolver<String> getBuildVariableResolver() {
-        return new VariableResolver.ByMap<String>(getBuildVariables());
+        return new VariableResolver.ByMap<>(getBuildVariables());
     }
 
     /**
@@ -1173,7 +1165,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
      *      of builds (which can be empty if no build uses the artifact from this build or downstream is not {@link AbstractProject#isFingerprintConfigured}.)
      */
     public Map<AbstractProject,RangeSet> getDownstreamBuilds() {
-        Map<AbstractProject,RangeSet> r = new HashMap<AbstractProject,RangeSet>();
+        Map<AbstractProject,RangeSet> r = new HashMap<>();
         for (AbstractProject p : getParent().getDownstreamProjects()) {
             if (p.isFingerprintConfigured())
                 r.put(p,getDownstreamRelationship(p));
@@ -1200,7 +1192,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
     }
 
     private Map<AbstractProject, Integer> _getUpstreamBuilds(Collection<AbstractProject> projects) {
-        Map<AbstractProject,Integer> r = new HashMap<AbstractProject,Integer>();
+        Map<AbstractProject,Integer> r = new HashMap<>();
         for (AbstractProject p : projects) {
             int n = getUpstreamRelationship(p);
             if (n>=0)
@@ -1222,7 +1214,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
         Map<AbstractProject,Integer> ndep = n.getDependencies(true);
         Map<AbstractProject,Integer> odep = o.getDependencies(true);
 
-        Map<AbstractProject,DependencyChange> r = new HashMap<AbstractProject,DependencyChange>();
+        Map<AbstractProject,DependencyChange> r = new HashMap<>();
 
         for (Map.Entry<AbstractProject,Integer> entry : odep.entrySet()) {
             AbstractProject p = entry.getKey();
@@ -1274,7 +1266,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
          * of IDs, but due to log rotations, some builds may be already unavailable.
          */
         public List<AbstractBuild> getBuilds() {
-            List<AbstractBuild> r = new ArrayList<AbstractBuild>();
+            List<AbstractBuild> r = new ArrayList<>();
 
             AbstractBuild<?,?> b = project.getNearestBuild(fromId);
             if (b!=null && b.getNumber()==fromId)
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 2f91394f20..f86aed606d 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -822,7 +822,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
         if (c != null) {
             queueActions.add(new CauseAction(c));
         }
-        return scheduleBuild2(quietPeriod, queueActions.toArray(new Action[queueActions.size()]));
+        return scheduleBuild2(quietPeriod, queueActions.toArray(new Action[0]));
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/Actionable.java b/core/src/main/java/hudson/model/Actionable.java
index 96eeda813a..496c2de286 100644
--- a/core/src/main/java/hudson/model/Actionable.java
+++ b/core/src/main/java/hudson/model/Actionable.java
@@ -78,7 +78,7 @@ public abstract class Actionable extends AbstractModelObject implements ModelObj
         if (actions == null) {
             synchronized (this) {
                 if (actions == null) {
-                    actions = new CopyOnWriteArrayList<Action>();
+                    actions = new CopyOnWriteArrayList<>();
                 }
             }
         }
@@ -196,7 +196,7 @@ public abstract class Actionable extends AbstractModelObject implements ModelObj
             throw new IllegalArgumentException("Action must be non-null");
         }
         // CopyOnWriteArrayList does not support Iterator.remove, so need to do it this way:
-        List<Action> old = new ArrayList<Action>(1);
+        List<Action> old = new ArrayList<>(1);
         List<Action> current = getActions();
         boolean found = false;
         for (Action a2 : current) {
@@ -255,7 +255,7 @@ public abstract class Actionable extends AbstractModelObject implements ModelObj
             throw new IllegalArgumentException("Action type must be non-null");
         }
         // CopyOnWriteArrayList does not support Iterator.remove, so need to do it this way:
-        List<Action> old = new ArrayList<Action>();
+        List<Action> old = new ArrayList<>();
         List<Action> current = getActions();
         for (Action a : current) {
             if (clazz.isInstance(a)) {
@@ -290,7 +290,7 @@ public abstract class Actionable extends AbstractModelObject implements ModelObj
             throw new IllegalArgumentException("Action must be non-null");
         }
         // CopyOnWriteArrayList does not support Iterator.remove, so need to do it this way:
-        List<Action> old = new ArrayList<Action>();
+        List<Action> old = new ArrayList<>();
         List<Action> current = getActions();
         boolean found = false;
         for (Action a1 : current) {
diff --git a/core/src/main/java/hudson/model/AperiodicWork.java b/core/src/main/java/hudson/model/AperiodicWork.java
index 3c5385c077..dad7bbe573 100644
--- a/core/src/main/java/hudson/model/AperiodicWork.java
+++ b/core/src/main/java/hudson/model/AperiodicWork.java
@@ -126,9 +126,7 @@ public abstract class AperiodicWork extends SafeTimerTask implements ExtensionPo
         private final Set<AperiodicWork> registered = new HashSet<>();
 
         AperiodicWorkExtensionListListener(ExtensionList<AperiodicWork> initiallyRegistered) {
-            for (AperiodicWork p : initiallyRegistered) {
-                registered.add(p);
-            }
+            registered.addAll(initiallyRegistered);
         }
 
         @Override
diff --git a/core/src/main/java/hudson/model/AutoCompletionCandidates.java b/core/src/main/java/hudson/model/AutoCompletionCandidates.java
index 29ce16f4ca..e8e64b8e48 100644
--- a/core/src/main/java/hudson/model/AutoCompletionCandidates.java
+++ b/core/src/main/java/hudson/model/AutoCompletionCandidates.java
@@ -48,7 +48,7 @@ import org.apache.commons.lang.StringUtils;
  * @author Kohsuke Kawaguchi
  */
 public class AutoCompletionCandidates implements HttpResponse {
-    private final List<String> values = new ArrayList<String>();
+    private final List<String> values = new ArrayList<>();
 
     public AutoCompletionCandidates add(String v) {
         values.add(v);
diff --git a/core/src/main/java/hudson/model/Build.java b/core/src/main/java/hudson/model/Build.java
index 15aed23050..00f9c21d4e 100644
--- a/core/src/main/java/hudson/model/Build.java
+++ b/core/src/main/java/hudson/model/Build.java
@@ -147,7 +147,7 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
 
             Result r = null;
             try {
-                List<BuildWrapper> wrappers = new ArrayList<BuildWrapper>(project.getBuildWrappers().values());
+                List<BuildWrapper> wrappers = new ArrayList<>(project.getBuildWrappers().values());
                 
                 ParametersAction parameters = getAction(ParametersAction.class);
                 if (parameters != null)
diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java
index d05cd867b5..4758f17dd0 100644
--- a/core/src/main/java/hudson/model/Cause.java
+++ b/core/src/main/java/hudson/model/Cause.java
@@ -175,8 +175,8 @@ public abstract class Cause {
             upstreamBuild = up.getNumber();
             upstreamProject = up.getParent().getFullName();
             upstreamUrl = up.getParent().getUrl();
-            upstreamCauses = new ArrayList<Cause>();
-            Set<String> traversed = new HashSet<String>();
+            upstreamCauses = new ArrayList<>();
+            Set<String> traversed = new HashSet<>();
             for (Cause c : up.getCauses()) {
                 upstreamCauses.add(trim(c, MAX_DEPTH, traversed));
             }
@@ -234,7 +234,7 @@ public abstract class Cause {
                 return c;
             }
             UpstreamCause uc = (UpstreamCause) c;
-            List<Cause> cs = new ArrayList<Cause>();
+            List<Cause> cs = new ArrayList<>();
             if (depth > 0) {
                 if (traversed.add(uc.upstreamUrl + uc.upstreamBuild)) {
                     for (Cause c2 : uc.upstreamCauses) {
@@ -333,7 +333,7 @@ public abstract class Cause {
             public ConverterImpl(XStream2 xstream) { super(xstream); }
             @Override protected void callback(UpstreamCause uc, UnmarshallingContext context) {
                 if (uc.upstreamCause != null) {
-                    if (uc.upstreamCauses == null) uc.upstreamCauses = new ArrayList<Cause>();
+                    if (uc.upstreamCauses == null) uc.upstreamCauses = new ArrayList<>();
                     uc.upstreamCauses.add(uc.upstreamCause);
                     uc.upstreamCause = null;
                     OldDataMonitor.report(context, "1.288");
diff --git a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
index 9ea1415362..ffe11cb3fd 100644
--- a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
+++ b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
@@ -45,7 +45,7 @@ public class ChoiceParameterDefinition extends SimpleParameterDefinition {
 
     public ChoiceParameterDefinition(String name, String[] choices, String description) {
         super(name, description);
-        this.choices = new ArrayList<String>(Arrays.asList(choices));
+        this.choices = new ArrayList<>(Arrays.asList(choices));
         defaultValue = null;
     }
 
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index e4c3a661b8..dacf3d8fa1 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -150,9 +150,9 @@ import static javax.servlet.http.HttpServletResponse.*;
 @ExportedBean
 public /*transient*/ abstract class Computer extends Actionable implements AccessControlled, ExecutorListener, DescriptorByNameOwner {
 
-    private final CopyOnWriteArrayList<Executor> executors = new CopyOnWriteArrayList<Executor>();
+    private final CopyOnWriteArrayList<Executor> executors = new CopyOnWriteArrayList<>();
     // TODO:
-    private final CopyOnWriteArrayList<OneOffExecutor> oneOffExecutors = new CopyOnWriteArrayList<OneOffExecutor>();
+    private final CopyOnWriteArrayList<OneOffExecutor> oneOffExecutors = new CopyOnWriteArrayList<>();
 
     private int numExecutors;
 
@@ -198,8 +198,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      * @since 1.607
      * @see Executor#resetWorkUnit(String)
      */
-    private transient final List<TerminationRequest> terminatedBy = Collections.synchronizedList(new ArrayList
-            <TerminationRequest>());
+    private transient final List<TerminationRequest> terminatedBy = Collections.synchronizedList(new ArrayList<>());
 
     /**
      * This method captures the information of a request to terminate a computer instance. Method is public as
@@ -241,7 +240,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      * @since 1.607
      */
     public List<TerminationRequest> getTerminatedBy() {
-        return new ArrayList<TerminationRequest>(terminatedBy);
+        return new ArrayList<>(terminatedBy);
     }
 
     public Computer(Node node) {
@@ -260,7 +259,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      */
     @SuppressWarnings("deprecation")
     public List<Action> getActions() {
-    	List<Action> result = new ArrayList<Action>();
+    	List<Action> result = new ArrayList<>();
     	result.addAll(super.getActions());
     	synchronized (this) {
     		if (transientActions == null) {
@@ -327,7 +326,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      */
     public AnnotatedLargeText<Computer> getLogText() {
         checkPermission(CONNECT);
-        return new AnnotatedLargeText<Computer>(getLogFile(), Charset.defaultCharset(), false, this);
+        return new AnnotatedLargeText<>(getLogFile(), Charset.defaultCharset(), false, this);
     }
 
     public ACL getACL() {
@@ -910,7 +909,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
         if (Jenkins.getInstanceOrNull() == null) {
             return;
         }
-        Set<Integer> availableNumbers  = new HashSet<Integer>();
+        Set<Integer> availableNumbers  = new HashSet<>();
         for (int i = 0; i < numExecutors; i++)
             availableNumbers.add(i);
 
@@ -965,7 +964,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     @Exported
     @StaplerDispatchable
     public List<Executor> getExecutors() {
-        return new ArrayList<Executor>(executors);
+        return new ArrayList<>(executors);
     }
 
     /**
@@ -974,7 +973,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     @Exported
     @StaplerDispatchable
     public List<OneOffExecutor> getOneOffExecutors() {
-        return new ArrayList<OneOffExecutor>(oneOffExecutors);
+        return new ArrayList<>(oneOffExecutors);
     }
 
     /**
@@ -998,7 +997,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     @Restricted(NoExternalUse.class)
     public List<DisplayExecutor> getDisplayExecutors() {
         // The size may change while we are populating, but let's start with a reasonable guess to minimize resizing
-        List<DisplayExecutor> result = new ArrayList<DisplayExecutor>(executors.size()+oneOffExecutors.size());
+        List<DisplayExecutor> result = new ArrayList<>(executors.size() + oneOffExecutors.size());
         int index = 0;
         for (Executor e: executors) {
             if (e.isDisplayCell()) {
@@ -1153,7 +1152,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      */
     @Exported(inline=true)
     public Map<String/*monitor name*/,Object> getMonitorData() {
-        Map<String,Object> r = new HashMap<String, Object>();
+        Map<String,Object> r = new HashMap<>();
         if (hasPermission(CONNECT)) {
             for (NodeMonitor monitor : NodeMonitor.getAll())
                 r.put(monitor.getClass().getName(), monitor.data(this));
@@ -1324,7 +1323,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
         private static final Logger LOGGER = Logger.getLogger(ListPossibleNames.class.getName());
         
         public List<String> call() throws IOException {
-            List<String> names = new ArrayList<String>();
+            List<String> names = new ArrayList<>();
 
             Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
             while (nis.hasMoreElements()) {
diff --git a/core/src/main/java/hudson/model/ComputerPanelBox.java b/core/src/main/java/hudson/model/ComputerPanelBox.java
index 94ee1aaa3c..d5e7e45cba 100644
--- a/core/src/main/java/hudson/model/ComputerPanelBox.java
+++ b/core/src/main/java/hudson/model/ComputerPanelBox.java
@@ -37,7 +37,7 @@ public abstract class ComputerPanelBox implements ExtensionPoint{
      *      List of all the registered {@link ComputerPanelBox}s.
      */
     public static List<ComputerPanelBox> all(Computer computer) {
-        List<ComputerPanelBox> boxs = new ArrayList<ComputerPanelBox>();
+        List<ComputerPanelBox> boxs = new ArrayList<>();
         for(ComputerPanelBox box:  ExtensionList.lookup(ComputerPanelBox.class)){
             box.setComputer(computer);
             boxs.add(box);
diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java
index 5dbadb9219..1b618d0d50 100644
--- a/core/src/main/java/hudson/model/ComputerSet.java
+++ b/core/src/main/java/hudson/model/ComputerSet.java
@@ -85,7 +85,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
     };
 
     private static final DescribableList<NodeMonitor,Descriptor<NodeMonitor>> monitors
-            = new DescribableList<NodeMonitor, Descriptor<NodeMonitor>>(MONITORS_OWNER);
+            = new DescribableList<>(MONITORS_OWNER);
 
     @Exported
     public String getDisplayName() {
@@ -129,7 +129,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
      * Returns a subset pf {@link #getMonitors()} that are {@linkplain NodeMonitor#isIgnored() not ignored}.
      */
     public static Map<Descriptor<NodeMonitor>,NodeMonitor> getNonIgnoredMonitors() {
-        Map<Descriptor<NodeMonitor>,NodeMonitor> r = new HashMap<Descriptor<NodeMonitor>, NodeMonitor>();
+        Map<Descriptor<NodeMonitor>,NodeMonitor> r = new HashMap<>();
         for (NodeMonitor m : monitors) {
             if(!m.isIgnored())
                 r.put(m.getDescriptor(),m);
@@ -421,7 +421,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
      */
     @Nonnull
     public static List<String> getComputerNames() {
-        final ArrayList<String> names = new ArrayList<String>();
+        final ArrayList<String> names = new ArrayList<>();
         for (Computer c : Jenkins.getInstance().getComputers()) {
             if (!c.getName().isEmpty()) {
                 names.add(c.getName());
@@ -435,14 +435,14 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
     static {
         try {
             DescribableList<NodeMonitor,Descriptor<NodeMonitor>> r
-                    = new DescribableList<NodeMonitor, Descriptor<NodeMonitor>>(Saveable.NOOP);
+                    = new DescribableList<>(Saveable.NOOP);
 
             // load persisted monitors
             XmlFile xf = getConfigFile();
             if(xf.exists()) {
                 DescribableList<NodeMonitor,Descriptor<NodeMonitor>> persisted =
                         (DescribableList<NodeMonitor,Descriptor<NodeMonitor>>) xf.read();
-                List<NodeMonitor> sanitized = new ArrayList<NodeMonitor>();
+                List<NodeMonitor> sanitized = new ArrayList<>();
                 for (NodeMonitor nm : persisted) {
                     try {
                         nm.getDescriptor();
diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java
index 6c7469a302..076b25dee8 100644
--- a/core/src/main/java/hudson/model/DependencyGraph.java
+++ b/core/src/main/java/hudson/model/DependencyGraph.java
@@ -70,8 +70,8 @@ import java.util.Stack;
  */
 public class DependencyGraph implements Comparator<AbstractProject> {
 
-    private Map<AbstractProject, List<DependencyGroup>> forward = new HashMap<AbstractProject, List<DependencyGroup>>();
-    private Map<AbstractProject, List<DependencyGroup>> backward = new HashMap<AbstractProject, List<DependencyGroup>>();
+    private Map<AbstractProject, List<DependencyGroup>> forward = new HashMap<>();
+    private Map<AbstractProject, List<DependencyGroup>> backward = new HashMap<>();
 
     private transient Map<Class<?>, Object> computationalData;
 
@@ -90,7 +90,7 @@ public class DependencyGraph implements Comparator<AbstractProject> {
         // Set full privileges while computing to avoid missing any projects the current user cannot see.
         SecurityContext saveCtx = ACL.impersonate(ACL.SYSTEM);
         try {
-            this.computationalData = new HashMap<Class<?>, Object>();
+            this.computationalData = new HashMap<>();
             for( AbstractProject p : Jenkins.getInstance().allItems(AbstractProject.class) )
                 p.buildDependencyGraph(this);
 
@@ -113,7 +113,7 @@ public class DependencyGraph implements Comparator<AbstractProject> {
         DirectedGraph<AbstractProject> g = new DirectedGraph<AbstractProject>() {
             @Override
             protected Collection<AbstractProject> nodes() {
-                final Set<AbstractProject> nodes = new HashSet<AbstractProject>();
+                final Set<AbstractProject> nodes = new HashSet<>();
                 nodes.addAll(forward.keySet());
                 nodes.addAll(backward.keySet());
                 return nodes;
@@ -127,8 +127,8 @@ public class DependencyGraph implements Comparator<AbstractProject> {
 
         List<SCC<AbstractProject>> sccs = g.getStronglyConnectedComponents();
 
-        final Map<AbstractProject,Integer> topoOrder = new HashMap<AbstractProject,Integer>();
-        topologicallySorted = new ArrayList<AbstractProject<?,?>>();
+        final Map<AbstractProject,Integer> topoOrder = new HashMap<>();
+        topologicallySorted = new ArrayList<>();
         int idx=0;
         for (SCC<AbstractProject> scc : sccs) {
             for (AbstractProject n : scc) {
@@ -196,7 +196,7 @@ public class DependencyGraph implements Comparator<AbstractProject> {
     private List<AbstractProject> get(Map<AbstractProject, List<DependencyGroup>> map, AbstractProject src, boolean up) {
         List<DependencyGroup> v = map.get(src);
         if(v==null) return Collections.emptyList();
-        List<AbstractProject> result = new ArrayList<AbstractProject>(v.size());
+        List<AbstractProject> result = new ArrayList<>(v.size());
         for (DependencyGroup d : v) result.add(up ? d.getUpstreamProject() : d.getDownstreamProject());
         return result;
     }
@@ -284,8 +284,8 @@ public class DependencyGraph implements Comparator<AbstractProject> {
      * where the length is greater than 1.
      */
     public boolean hasIndirectDependencies(AbstractProject src, AbstractProject dst) {
-        Set<AbstractProject> visited = new HashSet<AbstractProject>();
-        Stack<AbstractProject> queue = new Stack<AbstractProject>();
+        Set<AbstractProject> visited = new HashSet<>();
+        Stack<AbstractProject> queue = new Stack<>();
 
         queue.addAll(getDownstream(src));
         queue.remove(dst);
@@ -316,8 +316,8 @@ public class DependencyGraph implements Comparator<AbstractProject> {
     }
 
     private Set<AbstractProject> getTransitive(Map<AbstractProject, List<DependencyGroup>> direction, AbstractProject src, boolean up) {
-        Set<AbstractProject> visited = new HashSet<AbstractProject>();
-        Stack<AbstractProject> queue = new Stack<AbstractProject>();
+        Set<AbstractProject> visited = new HashSet<>();
+        Stack<AbstractProject> queue = new Stack<>();
 
         queue.add(src);
 
@@ -334,11 +334,7 @@ public class DependencyGraph implements Comparator<AbstractProject> {
     }
 
     private void add(Map<AbstractProject, List<DependencyGroup>> map, AbstractProject key, Dependency dep) {
-        List<DependencyGroup> set = map.get(key);
-        if(set==null) {
-            set = new ArrayList<DependencyGroup>();
-            map.put(key,set);
-        }
+        List<DependencyGroup> set = map.computeIfAbsent(key, k -> new ArrayList<>());
         for (DependencyGroup d : set) {
             // Check for existing edge that connects the same two projects:
             if (d.getUpstreamProject() == dep.getUpstreamProject() && d.getDownstreamProject() == dep.getDownstreamProject()) {
@@ -352,7 +348,7 @@ public class DependencyGraph implements Comparator<AbstractProject> {
 
     private Map<AbstractProject, List<DependencyGroup>> finalize(Map<AbstractProject, List<DependencyGroup>> m) {
         for (Entry<AbstractProject, List<DependencyGroup>> e : m.entrySet()) {
-            Collections.sort( e.getValue(), NAME_COMPARATOR );
+            e.getValue().sort(NAME_COMPARATOR);
             e.setValue( Collections.unmodifiableList(e.getValue()) );
         }
         return Collections.unmodifiableMap(m);
@@ -457,7 +453,7 @@ public class DependencyGraph implements Comparator<AbstractProject> {
      * Collect multiple dependencies between the same two projects.
      */
     private static class DependencyGroup {
-        private Set<Dependency> group = new LinkedHashSet<Dependency>();
+        private Set<Dependency> group = new LinkedHashSet<>();
 
         DependencyGroup(Dependency first) {
             this.upstream = first.getUpstreamProject();
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 3d941cd058..b00b60e4fb 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -137,7 +137,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable,
      */
     public transient final Class<? extends T> clazz;
 
-    private transient final Map<String,CheckMethod> checkMethods = new ConcurrentHashMap<String,CheckMethod>(2);
+    private transient final Map<String,CheckMethod> checkMethods = new ConcurrentHashMap<>(2);
 
     /**
      * Lazily computed list of properties on {@link #clazz} and on the descriptor itself.
@@ -233,7 +233,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable,
      *
      * @see #getHelpFile(String) 
      */
-    private transient final Map<String,HelpRedirect> helpRedirect = new HashMap<String,HelpRedirect>(2);
+    private transient final Map<String,HelpRedirect> helpRedirect = new HashMap<>(2);
 
     private static class HelpRedirect {
         private final Class<? extends Describable> owner;
@@ -416,7 +416,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable,
             throw new IllegalStateException(String.format("%s doesn't have the %s method for filling a drop-down list", getClass(), methodName));
 
         // build query parameter line by figuring out what should be submitted
-        List<String> depends = buildFillDependencies(method, new ArrayList<String>());
+        List<String> depends = buildFillDependencies(method, new ArrayList<>());
 
         if (!depends.isEmpty())
             attributes.put("fillDependsOn",Util.join(depends," "));
@@ -506,7 +506,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable,
      * Given the class, list up its {@link PropertyType}s from its public fields/getters.
      */
     private Map<String, PropertyType> buildPropertyTypes(Class<?> clazz) {
-        Map<String, PropertyType> r = new HashMap<String, PropertyType>();
+        Map<String, PropertyType> r = new HashMap<>();
         for (Field f : clazz.getFields())
             r.put(f.getName(),new PropertyType(f));
 
@@ -855,7 +855,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable,
     }
 
     protected List<String> getPossibleViewNames(String baseName) {
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         for (Facet f : WebApp.get(Jenkins.getInstance().servletContext).facets) {
             if (f instanceof JellyCompatibleFacet) {
                 JellyCompatibleFacet jcf = (JellyCompatibleFacet) f;
@@ -981,12 +981,12 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable,
     }
 
     public static <T> List<T> toList( T... values ) {
-        return new ArrayList<T>(Arrays.asList(values));
+        return new ArrayList<>(Arrays.asList(values));
     }
 
     public static <T extends Describable<T>>
     Map<Descriptor<T>,T> toMap(Iterable<T> describables) {
-        Map<Descriptor<T>,T> m = new LinkedHashMap<Descriptor<T>,T>();
+        Map<Descriptor<T>,T> m = new LinkedHashMap<>();
         for (T d : describables) {
             Descriptor<T> descriptor;
             try {
@@ -1025,7 +1025,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable,
     List<T> newInstancesFromHeteroList(StaplerRequest req, Object formData,
                 Collection<? extends Descriptor<T>> descriptors) throws FormException {
 
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
 
         if (formData!=null) {
             for (Object o : JSONArray.fromObject(formData)) {
diff --git a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java
index e449569500..ef099a64dc 100644
--- a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java
+++ b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java
@@ -65,7 +65,7 @@ public abstract class DescriptorVisibilityFilter implements ExtensionPoint {
 
     public static <T extends Descriptor> List<T> apply(Object context, Iterable<T> source) {
         ExtensionList<DescriptorVisibilityFilter> filters = all();
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         Class<?> contextClass = context == null ? null : context.getClass();
 
         if (source == null) {
@@ -110,7 +110,7 @@ public abstract class DescriptorVisibilityFilter implements ExtensionPoint {
 
     public static <T extends Descriptor> List<T> applyType(Class<?> contextClass, Iterable<T> source) {
         ExtensionList<DescriptorVisibilityFilter> filters = all();
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
 
         OUTER:
         for (T d : source) {
diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java
index 125d58a394..1b0c4088fb 100644
--- a/core/src/main/java/hudson/model/DownloadService.java
+++ b/core/src/main/java/hudson/model/DownloadService.java
@@ -309,7 +309,7 @@ public class DownloadService extends PageDecorator {
          * URLs to download from.
          */
         public List<String> getUrls() {
-            List<String> updateSites = new ArrayList<String>();
+            List<String> updateSites = new ArrayList<>();
             for (UpdateSite site : Jenkins.getActiveInstance().getUpdateCenter().getSiteList()) {
                 String siteUrl = site.getUrl();
                 int baseUrlEnd = siteUrl.indexOf("update-center.json");
diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java
index 5f90ad1bfc..b466779e1a 100644
--- a/core/src/main/java/hudson/model/Executor.java
+++ b/core/src/main/java/hudson/model/Executor.java
@@ -139,7 +139,7 @@ public class Executor extends Thread implements ModelObject {
      * Cause of interruption. Access needs to be synchronized.
      */
     @GuardedBy("lock")
-    private final List<CauseOfInterruption> causes = new Vector<CauseOfInterruption>();
+    private final List<CauseOfInterruption> causes = new Vector<>();
 
     public Executor(@Nonnull Computer owner, int n) {
         super("Executor #"+n+" for "+owner.getDisplayName());
@@ -271,7 +271,7 @@ public class Executor extends Thread implements ModelObject {
         lock.writeLock().lock();
         try {
             if (causes.isEmpty())   return;
-            r = new ArrayList<CauseOfInterruption>(causes);
+            r = new ArrayList<>(causes);
             causes.clear();
         } finally {
             lock.writeLock().unlock();
@@ -961,7 +961,7 @@ public class Executor extends Thread implements ModelObject {
      * Mechanism to allow threads (in particular the channel request handling threads) to
      * run on behalf of {@link Executor}.
      */
-    private static final ThreadLocal<Executor> IMPERSONATION = new ThreadLocal<Executor>();
+    private static final ThreadLocal<Executor> IMPERSONATION = new ThreadLocal<>();
 
     private static final Logger LOGGER = Logger.getLogger(Executor.class.getName());
 }
diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java
index cb33903bd1..37e46769c3 100644
--- a/core/src/main/java/hudson/model/Fingerprint.java
+++ b/core/src/main/java/hudson/model/Fingerprint.java
@@ -349,7 +349,7 @@ public class Fingerprint implements ModelObject, Saveable {
         private final List<Range> ranges;
 
         public RangeSet() {
-            this(new ArrayList<Range>());
+            this(new ArrayList<>());
         }
 
         private RangeSet(List<Range> data) {
@@ -417,7 +417,7 @@ public class Fingerprint implements ModelObject, Saveable {
          */
         @Exported
         public synchronized List<Range> getRanges() {
-            return new ArrayList<Range>(ranges);
+            return new ArrayList<>(ranges);
         }
 
         /**
@@ -515,7 +515,7 @@ public class Fingerprint implements ModelObject, Saveable {
          * @return true if this range set was modified as a result.
          */
         public synchronized boolean retainAll(RangeSet that) {
-            List<Range> intersection = new ArrayList<Range>();
+            List<Range> intersection = new ArrayList<>();
 
             int lhs=0,rhs=0;
             while(lhs<this.ranges.size() && rhs<that.ranges.size()) {
@@ -561,7 +561,7 @@ public class Fingerprint implements ModelObject, Saveable {
          */
         public synchronized boolean removeAll(RangeSet that) {
             boolean modified = false;
-            List<Range> sub = new ArrayList<Range>();
+            List<Range> sub = new ArrayList<>();
 
             int lhs=0,rhs=0;
             while(lhs<this.ranges.size() && rhs<that.ranges.size()) {
@@ -866,9 +866,9 @@ public class Fingerprint implements ModelObject, Saveable {
     /**
      * Range of builds that use this file keyed by a job full name.
      */
-    private Hashtable<String,RangeSet> usages = new Hashtable<String,RangeSet>();
+    private Hashtable<String,RangeSet> usages = new Hashtable<>();
 
-    PersistedList<FingerprintFacet> facets = new PersistedList<FingerprintFacet>(this);
+    PersistedList<FingerprintFacet> facets = new PersistedList<>(this);
 
     /**
      * Lazily computed immutable {@link FingerprintFacet}s created from {@link TransientFingerprintFacetFactory}.
@@ -967,7 +967,7 @@ public class Fingerprint implements ModelObject, Saveable {
      * Gets the sorted list of job names where this jar is used.
      */
     public @Nonnull List<String> getJobs() {
-        List<String> r = new ArrayList<String>();
+        List<String> r = new ArrayList<>();
         r.addAll(usages.keySet());
         Collections.sort(r);
         return r;
@@ -993,7 +993,7 @@ public class Fingerprint implements ModelObject, Saveable {
     // this is for remote API
     @Exported(name="usage")
     public @Nonnull List<RangeItem> _getUsages() {
-        List<RangeItem> r = new ArrayList<RangeItem>();
+        List<RangeItem> r = new ArrayList<>();
         final Jenkins instance = Jenkins.getInstance();
         for (Entry<String, RangeSet> e : usages.entrySet()) {
             final String itemName = e.getKey();
@@ -1032,7 +1032,7 @@ public class Fingerprint implements ModelObject, Saveable {
     // JENKINS-49588
     protected Object readResolve() {
         if (usages == null) {
-            usages = new Hashtable<String,RangeSet>();
+            usages = new Hashtable<>();
         }
         return this;
     }
@@ -1087,7 +1087,7 @@ public class Fingerprint implements ModelObject, Saveable {
     public synchronized boolean trim() throws IOException {
         boolean modified = false;
 
-        for (Entry<String,RangeSet> e : new Hashtable<String,RangeSet>(usages).entrySet()) {// copy because we mutate
+        for (Entry<String,RangeSet> e : new Hashtable<>(usages).entrySet()) {// copy because we mutate
             Job j = Jenkins.getInstance().getItemByFullName(e.getKey(),Job.class);
             if(j==null) {// no such job any more. recycle the record
                 modified = true;
@@ -1158,7 +1158,7 @@ public class Fingerprint implements ModelObject, Saveable {
      */
     public @Nonnull Collection<FingerprintFacet> getFacets() {
         if (transientFacets==null) {
-            List<FingerprintFacet> transientFacets = new ArrayList<FingerprintFacet>();
+            List<FingerprintFacet> transientFacets = new ArrayList<>();
             for (TransientFingerprintFacetFactory fff : TransientFingerprintFacetFactory.all()) {
                 fff.createFor(this,transientFacets);
             }
@@ -1199,13 +1199,13 @@ public class Fingerprint implements ModelObject, Saveable {
      * @return Sorted list of {@link FingerprintFacet}s 
      */
     public @Nonnull Collection<FingerprintFacet> getSortedFacets() {
-        List<FingerprintFacet> r = new ArrayList<FingerprintFacet>(getFacets());
-        Collections.sort(r,new Comparator<FingerprintFacet>() {
+        List<FingerprintFacet> r = new ArrayList<>(getFacets());
+        r.sort(new Comparator<FingerprintFacet>() {
             public int compare(FingerprintFacet o1, FingerprintFacet o2) {
                 long a = o1.getTimestamp();
                 long b = o2.getTimestamp();
-                if (a<b)    return -1;
-                if (a==b)   return 0;
+                if (a < b) return -1;
+                if (a == b) return 0;
                 return 1;
             }
         });
@@ -1230,7 +1230,7 @@ public class Fingerprint implements ModelObject, Saveable {
      * Returns the actions contributed from {@link #getFacets()}
      */
     public @Nonnull List<Action> getActions() {
-        List<Action> r = new ArrayList<Action>();
+        List<Action> r = new ArrayList<>();
         for (FingerprintFacet ff : getFacets())
             ff.createActions(r);
         return Collections.unmodifiableList(r);
@@ -1381,7 +1381,7 @@ public class Fingerprint implements ModelObject, Saveable {
             if(logger.isLoggable(Level.FINE))
                 logger.fine("Loading fingerprint "+file+" took "+(System.currentTimeMillis()-start)+"ms");
             if (f.facets==null)
-                f.facets = new PersistedList<FingerprintFacet>(f);
+                f.facets = new PersistedList<>(f);
             for (FingerprintFacet facet : f.facets)
                 facet._setOwner(f);
             return f;
@@ -1420,7 +1420,7 @@ public class Fingerprint implements ModelObject, Saveable {
     }
 
     @Override public String toString() {
-        return "Fingerprint[original=" + original + ",hash=" + getHashString() + ",fileName=" + fileName + ",timestamp=" + DATE_CONVERTER.toString(timestamp) + ",usages=" + ((usages == null) ? "null" : new TreeMap<String,RangeSet>(getUsages())) + ",facets=" + facets + "]";
+        return "Fingerprint[original=" + original + ",hash=" + getHashString() + ",fileName=" + fileName + ",timestamp=" + DATE_CONVERTER.toString(timestamp) + ",usages=" + ((usages == null) ? "null" : new TreeMap<>(getUsages())) + ",facets=" + facets + "]";
     }
     
     /**
diff --git a/core/src/main/java/hudson/model/HealthReport.java b/core/src/main/java/hudson/model/HealthReport.java
index ddcc1f9dec..7b67538272 100644
--- a/core/src/main/java/hudson/model/HealthReport.java
+++ b/core/src/main/java/hudson/model/HealthReport.java
@@ -62,7 +62,7 @@ public class HealthReport implements Serializable, Comparable<HealthReport> {
     private static final String HEALTH_0_TO_20_IMG = "health-00to19.png";
     private static final String HEALTH_UNKNOWN_IMG = "empty.png";
 
-    private static final Map<String, String> iconIMGToClassMap = new HashMap<String, String>();
+    private static final Map<String, String> iconIMGToClassMap = new HashMap<>();
     static {
         iconIMGToClassMap.put(HEALTH_OVER_80_IMG, HEALTH_OVER_80);
         iconIMGToClassMap.put(HEALTH_61_TO_80_IMG, HEALTH_61_TO_80);
diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java
index 195d4d8c0c..b5cf8251f1 100644
--- a/core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -107,7 +107,7 @@ public abstract class ItemGroupMixIn {
                 return child.isDirectory();
             }
         });
-        CopyOnWriteMap.Tree<K,V> configurations = new CopyOnWriteMap.Tree<K,V>();
+        CopyOnWriteMap.Tree<K,V> configurations = new CopyOnWriteMap.Tree<>();
         for (File subdir : subdirs) {
             try {
                 // Try to retain the identity of an existing child object if we can.
@@ -290,16 +290,10 @@ public abstract class ItemGroupMixIn {
             Jenkins.getInstance().rebuildDependencyGraphAsync();
 
             return result;
-        } catch (TransformerException e) {
+        } catch (TransformerException | SAXException e) {
             success = false;
             throw new IOException("Failed to persist config.xml", e);
-        } catch (SAXException e) {
-            success = false;
-            throw new IOException("Failed to persist config.xml", e);
-        } catch (IOException e) {
-            success = false;
-            throw e;
-        } catch (RuntimeException e) {
+        } catch (IOException | RuntimeException e) {
             success = false;
             throw e;
         } finally {
diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java
index d0a26238a3..fb812e7a65 100644
--- a/core/src/main/java/hudson/model/Items.java
+++ b/core/src/main/java/hudson/model/Items.java
@@ -69,7 +69,7 @@ public class Items {
      *      Use {@link #all()} for read access and {@link Extension} for registration.
      */
     @Deprecated
-    public static final List<TopLevelItemDescriptor> LIST = (List)new DescriptorList<TopLevelItem>(TopLevelItem.class);
+    public static final List<TopLevelItemDescriptor> LIST = (List) new DescriptorList<>(TopLevelItem.class);
 
     /**
      * Used to behave differently when loading posted configuration as opposed to persisted configuration.
@@ -173,7 +173,7 @@ public class Items {
      * @since 1.607
      */
     public static List<TopLevelItemDescriptor> all(Authentication a, ItemGroup c) {
-        List<TopLevelItemDescriptor> result = new ArrayList<TopLevelItemDescriptor>();
+        List<TopLevelItemDescriptor> result = new ArrayList<>();
         ACL acl;
         if (c instanceof AccessControlled) {
             acl = ((AccessControlled) c).getACL();
@@ -224,7 +224,7 @@ public class Items {
     public static <T extends Item> List<T> fromNameList(ItemGroup context, @Nonnull String list, @Nonnull Class<T> type) {
         final Jenkins jenkins = Jenkins.getInstance();
         
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         if (jenkins == null) {
             return r;
         }
@@ -250,7 +250,7 @@ public class Items {
         String[] c = context.getFullName().split("/");
         String[] p = path.split("/");
 
-        Stack<String> name = new Stack<String>();
+        Stack<String> name = new Stack<>();
         for (int i=0; i<c.length;i++) {
             if (i==0 && c[i].equals("")) continue;
             name.push(c[i]);
@@ -294,7 +294,7 @@ public class Items {
     public static String computeRelativeNamesAfterRenaming(String oldFullName, String newFullName, String relativeNames, ItemGroup context) {
 
         StringTokenizer tokens = new StringTokenizer(relativeNames,",");
-        List<String> newValue = new ArrayList<String>();
+        List<String> newValue = new ArrayList<>();
         while(tokens.hasMoreTokens()) {
             String relativeName = tokens.nextToken().trim();
             String canonicalName = getCanonicalName(context, relativeName);
@@ -400,14 +400,14 @@ public class Items {
      * @since 1.512
      */
     public static <T extends Item> List<T> getAllItems(final ItemGroup root, Class<T> type) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         getAllItems(root, type, r);
         return r;
     }
     private static <T extends Item> void getAllItems(final ItemGroup root, Class<T> type, List<T> r) {
-        List<Item> items = new ArrayList<Item>(((ItemGroup<?>) root).getItems());
+        List<Item> items = new ArrayList<>(((ItemGroup<?>) root).getItems());
         // because we add items depth first, we can use the quicker BY_NAME comparison
-        Collections.sort(items, BY_NAME);
+        items.sort(BY_NAME);
         for (Item i : items) {
             if (type.isInstance(i)) {
                 if (i.hasPermission(Item.READ)) {
diff --git a/core/src/main/java/hudson/model/JDK.java b/core/src/main/java/hudson/model/JDK.java
index 043a5f392f..b7181ab45b 100644
--- a/core/src/main/java/hudson/model/JDK.java
+++ b/core/src/main/java/hudson/model/JDK.java
@@ -163,9 +163,7 @@ public final class JDK extends ToolInstallation implements NodeSpecific<JDK>, En
             TaskListener listener = new StreamTaskListener(new NullStream());
             Launcher launcher = n.createLauncher(listener);
             return launcher.launch().cmds("java","-fullversion").stdout(listener).join()==0;
-        } catch (IOException e) {
-            return false;
-        } catch (InterruptedException e) {
+        } catch (IOException | InterruptedException e) {
             return false;
         }
     }
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 047e90a85f..820c85e8ae 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -175,7 +175,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      * List of properties configured for this project.
      */
     // this should have been DescribableList but now it's too late
-    protected CopyOnWriteList<JobProperty<? super JobT>> properties = new CopyOnWriteList<JobProperty<? super JobT>>();
+    protected CopyOnWriteList<JobProperty<? super JobT>> properties = new CopyOnWriteList<>();
 
     @Restricted(NoExternalUse.class)
     public transient RunIdMigrator runIdMigrator;
@@ -232,7 +232,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
         }
 
         if (properties == null) // didn't exist < 1.72
-            properties = new CopyOnWriteList<JobProperty<? super JobT>>();
+            properties = new CopyOnWriteList<>();
 
         for (JobProperty p : properties)
             p.setOwner(this);
@@ -595,14 +595,14 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      * @see JobProperty#getJobOverrides
      */
     public Collection<?> getOverrides() {
-        List<Object> r = new ArrayList<Object>();
+        List<Object> r = new ArrayList<>();
         for (JobProperty<? super JobT> p : properties)
             r.addAll(p.getJobOverrides());
         return r;
     }
 
     public List<Widget> getWidgets() {
-        ArrayList<Widget> r = new ArrayList<Widget>();
+        ArrayList<Widget> r = new ArrayList<>();
         r.add(createHistoryWidget());
         return r;
     }
@@ -741,7 +741,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      * Obtains all the {@link Run}s whose build numbers matches the given {@link RangeSet}.
      */
     public synchronized List<RunT> getBuilds(RangeSet rs) {
-        List<RunT> builds = new LinkedList<RunT>();
+        List<RunT> builds = new LinkedList<>();
 
         for (Range r : rs.getRanges()) {
             for (RunT b = getNearestBuild(r.start); b!=null && b.getNumber()<r.end; b=b.getNextBuild()) {
@@ -997,7 +997,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      */
     public List<RunT> getLastBuildsOverThreshold(int numberOfBuilds, Result threshold) {
         
-        List<RunT> result = new ArrayList<RunT>(numberOfBuilds);
+        List<RunT> result = new ArrayList<>(numberOfBuilds);
         
         RunT r = getLastBuild();
         while (r != null && result.size() < numberOfBuilds) {
@@ -1021,7 +1021,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      */
     @SuppressWarnings("unchecked")
     protected List<RunT> getEstimatedDurationCandidates() {
-        List<RunT> candidates = new ArrayList<RunT>(3);
+        List<RunT> candidates = new ArrayList<>(3);
         RunT lastSuccessful = getLastSuccessfulBuild();
         int lastSuccessfulNumber = -1;
         if (lastSuccessful != null) {
@@ -1031,7 +1031,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
 
         int i = 0;
         RunT r = getLastBuild();
-        List<RunT> fallbackCandidates = new ArrayList<RunT>(3);
+        List<RunT> fallbackCandidates = new ArrayList<>(3);
         while (r != null && candidates.size() < 3 && i < 6) {
             if (!r.isBuilding() && r.getResult() != null && r.getNumber() != lastSuccessfulNumber) {
                 Result result = r.getResult();
@@ -1103,7 +1103,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
             }
         }
 
-        List<FeedItem> entries = new ArrayList<FeedItem>();
+        List<FeedItem> entries = new ArrayList<>();
         String scmDisplayName = "";
         if (this instanceof SCMTriggerItem) {
             SCMTriggerItem scmItem = (SCMTriggerItem) this;
@@ -1199,7 +1199,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
 
     @Exported(name = "healthReport")
     public List<HealthReport> getBuildHealthReports() {
-        List<HealthReport> reports = new ArrayList<HealthReport>();
+        List<HealthReport> reports = new ArrayList<>();
         RunT lastBuild = getLastBuild();
 
         if (lastBuild != null && lastBuild.isBuilding()) {
@@ -1241,7 +1241,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
 
             // store the cache
             cachedBuildHealthReportsBuildNumber = lastBuild.getNumber();
-            cachedBuildHealthReports = new ArrayList<HealthReport>(reports);
+            cachedBuildHealthReports = new ArrayList<>(reports);
         }
 
         return reports;
@@ -1332,7 +1332,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
 
                 logRotator = null;
 
-                DescribableList<JobProperty<?>, JobPropertyDescriptor> t = new DescribableList<JobProperty<?>, JobPropertyDescriptor>(NOOP,getAllProperties());
+                DescribableList<JobProperty<?>, JobPropertyDescriptor> t = new DescribableList<>(NOOP, getAllProperties());
                 JSONObject jsonProperties = json.optJSONObject("properties");
                 if (jsonProperties != null) {
                   t.rebuild(req,jsonProperties,JobPropertyDescriptor.getPropertyDescriptors(Job.this.getClass()));
@@ -1469,7 +1469,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
 
                 }
 
-                DataSetBuilder<String, ChartLabel> data = new DataSetBuilder<String, ChartLabel>();
+                DataSetBuilder<String, ChartLabel> data = new DataSetBuilder<>();
                 for (Run r : getNewBuilds()) {
                     if (r.isBuilding())
                         continue;
diff --git a/core/src/main/java/hudson/model/JobPropertyDescriptor.java b/core/src/main/java/hudson/model/JobPropertyDescriptor.java
index 6955dff091..1a90cedf85 100644
--- a/core/src/main/java/hudson/model/JobPropertyDescriptor.java
+++ b/core/src/main/java/hudson/model/JobPropertyDescriptor.java
@@ -99,7 +99,7 @@ public abstract class JobPropertyDescriptor extends Descriptor<JobProperty<?>> {
      * Gets the {@link JobPropertyDescriptor}s applicable for a given job type.
      */
     public static List<JobPropertyDescriptor> getPropertyDescriptors(Class<? extends Job> clazz) {
-        List<JobPropertyDescriptor> r = new ArrayList<JobPropertyDescriptor>();
+        List<JobPropertyDescriptor> r = new ArrayList<>();
         for (JobPropertyDescriptor p : all())
             if(p.isApplicable(clazz))
                 r.add(p);
diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java
index 049d0f89fc..0cb65eea38 100644
--- a/core/src/main/java/hudson/model/Label.java
+++ b/core/src/main/java/hudson/model/Label.java
@@ -241,7 +241,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
     @Exported
     public Set<Cloud> getClouds() {
         if(clouds==null) {
-            Set<Cloud> r = new HashSet<Cloud>();
+            Set<Cloud> r = new HashSet<>();
             Jenkins h = Jenkins.getInstance();
             for (Cloud c : h.clouds) {
                 if(c.canProvision(this))
@@ -381,12 +381,12 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
      */
     @Exported
     public List<AbstractProject> getTiedJobs() {
-        List<AbstractProject> r = new ArrayList<AbstractProject>();
+        List<AbstractProject> r = new ArrayList<>();
         for (AbstractProject<?,?> p : Jenkins.getInstance().allItems(AbstractProject.class)) {
             if(p instanceof TopLevelItem && this.equals(p.getAssignedLabel()))
                 r.add(p);
         }
-        Collections.sort(r, Items.BY_FULL_NAME);
+        r.sort(Items.BY_FULL_NAME);
         return r;
     }
 
@@ -417,7 +417,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
                     }
                 }
                 if (topLevelItem instanceof ItemGroup) {
-                    Stack<ItemGroup> q = new Stack<ItemGroup>();
+                    Stack<ItemGroup> q = new Stack<>();
                     q.push((ItemGroup) topLevelItem);
 
                     while (!q.isEmpty()) {
@@ -480,7 +480,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
      * @since 1.420
      */
     public Set<LabelAtom> listAtoms() {
-        Set<LabelAtom> r = new HashSet<LabelAtom>();
+        Set<LabelAtom> r = new HashSet<>();
         accept(ATOM_COLLECTOR,r);
         return r;
     }
diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java
index 9d84eb32ce..96d8ce1f9e 100644
--- a/core/src/main/java/hudson/model/ListView.java
+++ b/core/src/main/java/hudson/model/ListView.java
@@ -77,7 +77,7 @@ public class ListView extends View implements DirectlyModifiableView {
      * List of job names. This is what gets serialized.
      */
     @GuardedBy("this")
-    /*package*/ /*almost-final*/ SortedSet<String> jobNames = new TreeSet<String>(CaseInsensitiveComparator.INSTANCE);
+    /*package*/ /*almost-final*/ SortedSet<String> jobNames = new TreeSet<>(CaseInsensitiveComparator.INSTANCE);
     
     private DescribableList<ViewJobFilter, Descriptor<ViewJobFilter>> jobFilters;
 
@@ -135,7 +135,7 @@ public class ListView extends View implements DirectlyModifiableView {
         }
         synchronized(this) {
             if (jobNames == null) {
-                jobNames = new TreeSet<String>(CaseInsensitiveComparator.INSTANCE);
+                jobNames = new TreeSet<>(CaseInsensitiveComparator.INSTANCE);
             }
         }
         initColumns();
@@ -145,14 +145,14 @@ public class ListView extends View implements DirectlyModifiableView {
 
     protected void initColumns() {
         if (columns == null)
-            columns = new DescribableList<ListViewColumn, Descriptor<ListViewColumn>>(this,
+            columns = new DescribableList<>(this,
                     ListViewColumn.createDefaultInitialColumnList(getClass())
             );
     }
 
     protected void initJobFilters() {
         if (jobFilters == null)
-            jobFilters = new DescribableList<ViewJobFilter, Descriptor<ViewJobFilter>>(this);
+            jobFilters = new DescribableList<>(this);
     }
 
     /**
@@ -196,14 +196,14 @@ public class ListView extends View implements DirectlyModifiableView {
      */
     private List<TopLevelItem> getItems(boolean recurse) {
         SortedSet<String> names;
-        List<TopLevelItem> items = new ArrayList<TopLevelItem>();
+        List<TopLevelItem> items = new ArrayList<>();
 
         synchronized (this) {
-            names = new TreeSet<String>(jobNames);
+            names = new TreeSet<>(jobNames);
         }
 
         ItemGroup<? extends TopLevelItem> parent = getOwner().getItemGroup();
-        List<TopLevelItem> parentItems = new ArrayList<TopLevelItem>(parent.getItems());
+        List<TopLevelItem> parentItems = new ArrayList<>(parent.getItems());
         includeItems(parent, parentItems, names);
 
         Boolean statusFilter = this.statusFilter; // capture the value to isolate us from concurrent update
@@ -223,13 +223,13 @@ public class ListView extends View implements DirectlyModifiableView {
 
         // check the filters
         Iterable<ViewJobFilter> jobFilters = getJobFilters();
-        List<TopLevelItem> allItems = new ArrayList<TopLevelItem>(parentItems);
-        if (recurse) allItems = expand(allItems, new ArrayList<TopLevelItem>());
+        List<TopLevelItem> allItems = new ArrayList<>(parentItems);
+        if (recurse) allItems = expand(allItems, new ArrayList<>());
     	for (ViewJobFilter jobFilter: jobFilters) {
     		items = jobFilter.filter(items, allItems, this);
     	}
         // for sanity, trim off duplicates
-        items = new ArrayList<TopLevelItem>(new LinkedHashSet<TopLevelItem>(items));
+        items = new ArrayList<>(new LinkedHashSet<>(items));
         
         return items;
     }
@@ -459,12 +459,12 @@ public class ListView extends View implements DirectlyModifiableView {
         setIncludeRegex(req.getParameter("useincluderegex") != null ? req.getParameter("includeRegex") : null);
 
         if (columns == null) {
-            columns = new DescribableList<ListViewColumn,Descriptor<ListViewColumn>>(this);
+            columns = new DescribableList<>(this);
         }
         columns.rebuildHetero(req, json, ListViewColumn.all(), "columns");
         
         if (jobFilters == null) {
-        	jobFilters = new DescribableList<ViewJobFilter,Descriptor<ViewJobFilter>>(this);
+        	jobFilters = new DescribableList<>(this);
         }
         jobFilters.rebuildHetero(req, json, ViewJobFilter.all(), "jobFilters");
 
@@ -545,7 +545,7 @@ public class ListView extends View implements DirectlyModifiableView {
         private void renameViewItem(String oldFullName, String newFullName, ViewGroup vg, ListView lv) {
             boolean needsSave;
             synchronized (lv) {
-                Set<String> oldJobNames = new HashSet<String>(lv.jobNames);
+                Set<String> oldJobNames = new HashSet<>(lv.jobNames);
                 lv.jobNames.clear();
                 for (String oldName : oldJobNames) {
                     lv.jobNames.add(Items.computeRelativeNamesAfterRenaming(oldFullName, newFullName, oldName, vg.getItemGroup()));
diff --git a/core/src/main/java/hudson/model/LoadBalancer.java b/core/src/main/java/hudson/model/LoadBalancer.java
index ce69e89779..fca13b938c 100644
--- a/core/src/main/java/hudson/model/LoadBalancer.java
+++ b/core/src/main/java/hudson/model/LoadBalancer.java
@@ -79,9 +79,9 @@ public abstract class LoadBalancer implements ExtensionPoint {
         @Override
         public Mapping map(Task task, MappingWorksheet ws) {
             // build consistent hash for each work chunk
-            List<ConsistentHash<ExecutorChunk>> hashes = new ArrayList<ConsistentHash<ExecutorChunk>>(ws.works.size());
+            List<ConsistentHash<ExecutorChunk>> hashes = new ArrayList<>(ws.works.size());
             for (int i=0; i<ws.works.size(); i++) {
-                ConsistentHash<ExecutorChunk> hash = new ConsistentHash<ExecutorChunk>(new Hash<ExecutorChunk>() {
+                ConsistentHash<ExecutorChunk> hash = new ConsistentHash<>(new Hash<ExecutorChunk>() {
                     public String hash(ExecutorChunk node) {
                         return node.getName();
                     }
diff --git a/core/src/main/java/hudson/model/MultiStageTimeSeries.java b/core/src/main/java/hudson/model/MultiStageTimeSeries.java
index 62867f2e26..a6b226fa71 100644
--- a/core/src/main/java/hudson/model/MultiStageTimeSeries.java
+++ b/core/src/main/java/hudson/model/MultiStageTimeSeries.java
@@ -201,7 +201,7 @@ public class MultiStageTimeSeries implements Serializable {
 
         public TrendChart(TimeScale timeScale, MultiStageTimeSeries... series) {
             this.timeScale = timeScale;
-            this.series = new ArrayList<MultiStageTimeSeries>(Arrays.asList(series));
+            this.series = new ArrayList<>(Arrays.asList(series));
             this.dataset = createDataset();
         }
 
diff --git a/core/src/main/java/hudson/model/MyView.java b/core/src/main/java/hudson/model/MyView.java
index d24ad97852..3dcc8e397a 100644
--- a/core/src/main/java/hudson/model/MyView.java
+++ b/core/src/main/java/hudson/model/MyView.java
@@ -75,7 +75,7 @@ public class MyView extends View {
 
     @Override
     public Collection<TopLevelItem> getItems() {
-        List<TopLevelItem> items = new ArrayList<TopLevelItem>();
+        List<TopLevelItem> items = new ArrayList<>();
         for (TopLevelItem item : getOwner().getItemGroup().getItems()) {
             if (item.hasPermission(Item.CONFIGURE)) {
                 items.add(item);
diff --git a/core/src/main/java/hudson/model/MyViewsProperty.java b/core/src/main/java/hudson/model/MyViewsProperty.java
index b4b246e2ca..4ebb4fdc22 100644
--- a/core/src/main/java/hudson/model/MyViewsProperty.java
+++ b/core/src/main/java/hudson/model/MyViewsProperty.java
@@ -73,7 +73,7 @@ public class MyViewsProperty extends UserProperty implements ModifiableViewGroup
     /**
      * Always hold at least one view.
      */
-    private CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<View>();
+    private CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<>();
 
     private transient ViewGroupMixIn viewGroupMixIn;
 
@@ -91,7 +91,7 @@ public class MyViewsProperty extends UserProperty implements ModifiableViewGroup
     public Object readResolve() {
         if (views == null)
             // this shouldn't happen, but an error in 1.319 meant the last view could be deleted
-            views = new CopyOnWriteArrayList<View>();
+            views = new CopyOnWriteArrayList<>();
 
         if (views.isEmpty()) {
             // preserve the non-empty invariant
diff --git a/core/src/main/java/hudson/model/PageDecorator.java b/core/src/main/java/hudson/model/PageDecorator.java
index 6f42942ace..a9a5f174fd 100644
--- a/core/src/main/java/hudson/model/PageDecorator.java
+++ b/core/src/main/java/hudson/model/PageDecorator.java
@@ -108,7 +108,7 @@ public abstract class PageDecorator extends Descriptor<PageDecorator> implements
      *      Use {@link #all()} for read access, and use {@link Extension} for registration.
      */
     @Deprecated
-    public static final List<PageDecorator> ALL = (List)new DescriptorList<PageDecorator>(PageDecorator.class);
+    public static final List<PageDecorator> ALL = (List) new DescriptorList<>(PageDecorator.class);
 
     /**
      * Returns all the registered {@link PageDecorator} descriptors.
diff --git a/core/src/main/java/hudson/model/PaneStatusProperties.java b/core/src/main/java/hudson/model/PaneStatusProperties.java
index 279f72fa64..0cd6e0aeee 100644
--- a/core/src/main/java/hudson/model/PaneStatusProperties.java
+++ b/core/src/main/java/hudson/model/PaneStatusProperties.java
@@ -13,7 +13,7 @@ import org.kohsuke.stapler.Stapler;
 
 public class PaneStatusProperties extends UserProperty implements Saveable {
 	
-	private final PersistedList<String> collapsed = new PersistedList<String>(this);
+	private final PersistedList<String> collapsed = new PersistedList<>(this);
 	
 	private static final PaneStatusProperties FALLBACK = new PaneStatusPropertiesSessionFallback();
 	
diff --git a/core/src/main/java/hudson/model/ParameterDefinition.java b/core/src/main/java/hudson/model/ParameterDefinition.java
index d535a90a05..57fdf53468 100644
--- a/core/src/main/java/hudson/model/ParameterDefinition.java
+++ b/core/src/main/java/hudson/model/ParameterDefinition.java
@@ -232,7 +232,7 @@ public abstract class ParameterDefinition implements
      *      Use {@link #all()} for read access, and {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<ParameterDefinition> LIST = new DescriptorList<ParameterDefinition>(ParameterDefinition.class);
+    public static final DescriptorList<ParameterDefinition> LIST = new DescriptorList<>(ParameterDefinition.class);
 
     public abstract static class ParameterDescriptor extends
             Descriptor<ParameterDefinition> {
diff --git a/core/src/main/java/hudson/model/ParametersAction.java b/core/src/main/java/hudson/model/ParametersAction.java
index ccf6f4eb90..6e2ef34686 100644
--- a/core/src/main/java/hudson/model/ParametersAction.java
+++ b/core/src/main/java/hudson/model/ParametersAction.java
@@ -222,11 +222,11 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
             return !parameters.isEmpty();
         } else {
             // I don't think we need multiple ParametersActions, but let's be defensive
-            Set<ParameterValue> params = new HashSet<ParameterValue>();
+            Set<ParameterValue> params = new HashSet<>();
             for (ParametersAction other: others) {
                 params.addAll(other.parameters);
             }
-            return !params.equals(new HashSet<ParameterValue>(this.parameters));
+            return !params.equals(new HashSet<>(this.parameters));
         }
     }
 
@@ -324,7 +324,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
             return parameters;
         }
 
-        List<ParameterValue> filteredParameters = new ArrayList<ParameterValue>();
+        List<ParameterValue> filteredParameters = new ArrayList<>();
 
         for (ParameterValue v : this.parameters) {
             if (this.parameterDefinitionNames.contains(v.getName()) || isSafeParameter(v.getName())) {
diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
index 1fa26ed372..815070e093 100644
--- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
+++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
@@ -138,7 +138,7 @@ public class ParametersDefinitionProperty extends OptionalJobProperty<Job<?, ?>>
             delay=new TimeDuration(TimeUnit.MILLISECONDS.convert(getJob().getQuietPeriod(), TimeUnit.SECONDS));
 
 
-        List<ParameterValue> values = new ArrayList<ParameterValue>();
+        List<ParameterValue> values = new ArrayList<>();
         
         JSONObject formData = req.getSubmittedForm();
         JSONArray a = JSONArray.fromObject(formData.get("parameter"));
@@ -177,7 +177,7 @@ public class ParametersDefinitionProperty extends OptionalJobProperty<Job<?, ?>>
     }
 
     public void buildWithParameters(StaplerRequest req, StaplerResponse rsp, @CheckForNull TimeDuration delay) throws IOException, ServletException {
-        List<ParameterValue> values = new ArrayList<ParameterValue>();
+        List<ParameterValue> values = new ArrayList<>();
         for (ParameterDefinition d: parameterDefinitions) {
         	ParameterValue value = d.createValue(req);
         	if (value != null) {
diff --git a/core/src/main/java/hudson/model/PasswordParameterDefinition.java b/core/src/main/java/hudson/model/PasswordParameterDefinition.java
index f3dfe79356..ef71d9c51f 100644
--- a/core/src/main/java/hudson/model/PasswordParameterDefinition.java
+++ b/core/src/main/java/hudson/model/PasswordParameterDefinition.java
@@ -96,16 +96,11 @@ public class PasswordParameterDefinition extends SimpleParameterDefinition {
         this.defaultValue = Secret.fromString(defaultValue);
     }
 
-    @Extension @Symbol({"password","nonStoredPasswordParam"})
+    @Extension @Symbol({"password"})
     public final static class ParameterDescriptorImpl extends ParameterDescriptor {
         @Override
         public String getDisplayName() {
             return Messages.PasswordParameterDefinition_DisplayName();
         }
-        
-        @Override
-        public String getHelpFile() {
-            return "/help/parameter/string.html";
-        }
     }
 }
diff --git a/core/src/main/java/hudson/model/PeriodicWork.java b/core/src/main/java/hudson/model/PeriodicWork.java
index 1079553551..b085a7bc41 100644
--- a/core/src/main/java/hudson/model/PeriodicWork.java
+++ b/core/src/main/java/hudson/model/PeriodicWork.java
@@ -129,9 +129,7 @@ public abstract class PeriodicWork extends SafeTimerTask implements ExtensionPoi
         private final Set<PeriodicWork> registered = new HashSet<>();
 
         PeriodicWorkExtensionListListener(ExtensionList<PeriodicWork> initiallyRegistered) {
-            for (PeriodicWork p : initiallyRegistered) {
-                registered.add(p);
-            }
+            registered.addAll(initiallyRegistered);
         }
 
         @Override
diff --git a/core/src/main/java/hudson/model/PermalinkProjectAction.java b/core/src/main/java/hudson/model/PermalinkProjectAction.java
index 22c949e7d4..7909040f65 100644
--- a/core/src/main/java/hudson/model/PermalinkProjectAction.java
+++ b/core/src/main/java/hudson/model/PermalinkProjectAction.java
@@ -91,7 +91,7 @@ public interface PermalinkProjectAction extends Action {
         /**
          * List of {@link Permalink}s that are built into Jenkins.
          */
-        public static final List<Permalink> BUILTIN = new CopyOnWriteArrayList<Permalink>();
+        public static final List<Permalink> BUILTIN = new CopyOnWriteArrayList<>();
 
         public static final Permalink LAST_BUILD = new Permalink() {
             public String getDisplayName() {
diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java
index b969b9942c..ff1119b5e2 100644
--- a/core/src/main/java/hudson/model/Project.java
+++ b/core/src/main/java/hudson/model/Project.java
@@ -157,7 +157,7 @@ public abstract class Project<P extends Project<P,B>,B extends Build<P,B>>
 
     @Override
     protected Set<ResourceActivity> getResourceActivities() {
-        final Set<ResourceActivity> activities = new HashSet<ResourceActivity>();
+        final Set<ResourceActivity> activities = new HashSet<>();
 
         activities.addAll(super.getResourceActivities());
         activities.addAll(Util.filter(getBuildersList(),ResourceActivity.class));
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index b2c4f7135a..a2de43abfa 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -96,6 +96,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.Callable;
@@ -184,7 +185,7 @@ public class Queue extends ResourceController implements Saveable {
      * This consists of {@link Item}s that cannot be run yet
      * because its time has not yet come.
      */
-    private final Set<WaitingItem> waitingList = new TreeSet<WaitingItem>();
+    private final Set<WaitingItem> waitingList = new TreeSet<>();
 
     /**
      * {@link Task}s that can be built immediately
@@ -193,20 +194,20 @@ public class Queue extends ResourceController implements Saveable {
      * blocked via {@link QueueTaskDispatcher#canRun(Item)},
      * or otherwise blocked by {@link Task#isBuildBlocked()}.
      */
-    private final ItemList<BlockedItem> blockedProjects = new ItemList<BlockedItem>();
+    private final ItemList<BlockedItem> blockedProjects = new ItemList<>();
 
     /**
      * {@link Task}s that can be built immediately
      * that are waiting for available {@link Executor}.
      * This list is sorted in such a way that earlier items are built earlier.
      */
-    private final ItemList<BuildableItem> buildables = new ItemList<BuildableItem>();
+    private final ItemList<BuildableItem> buildables = new ItemList<>();
 
     /**
      * {@link Task}s that are being handed over to the executor, but execution
      * has not started yet.
      */
-    private final ItemList<BuildableItem> pendings = new ItemList<BuildableItem>();
+    private final ItemList<BuildableItem> pendings = new ItemList<>();
 
     private transient volatile Snapshot snapshot = new Snapshot(waitingList, blockedProjects, buildables, pendings);
 
@@ -319,7 +320,7 @@ public class Queue extends ResourceController implements Saveable {
 
     private volatile transient QueueSorter sorter;
 
-    private transient final AtmostOneTaskExecutor<Void> maintainerThread = new AtmostOneTaskExecutor<Void>(new Callable<Void>() {
+    private transient final AtmostOneTaskExecutor<Void> maintainerThread = new AtmostOneTaskExecutor<>(new Callable<Void>() {
         @Override
         public Void call() throws Exception {
             maintain();
@@ -365,7 +366,7 @@ public class Queue extends ResourceController implements Saveable {
      */
     static class State {
         public long counter;
-        public List<Item> items = new ArrayList<Item>();
+        public List<Item> items = new ArrayList<>();
     }
 
     /**
@@ -495,7 +496,7 @@ public class Queue extends ResourceController implements Saveable {
         Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
         lock.lock();
         try { try {
-            for (WaitingItem i : new ArrayList<WaitingItem>(
+            for (WaitingItem i : new ArrayList<>(
                     waitingList))   // copy the list as we'll modify it in the loop
                 i.cancel(this);
             blockedProjects.cancelAll();
@@ -579,11 +580,8 @@ public class Queue extends ResourceController implements Saveable {
      */
     public @Nonnull ScheduleResult schedule2(Task p, int quietPeriod, List<Action> actions) {
         // remove nulls
-        actions = new ArrayList<Action>(actions);
-        for (Iterator<Action> itr = actions.iterator(); itr.hasNext();) {
-            Action a =  itr.next();
-            if (a==null)    itr.remove();
-        }
+        actions = new ArrayList<>(actions);
+        actions.removeIf(Objects::isNull);
 
         lock.lock();
         try { try {
@@ -617,14 +615,14 @@ public class Queue extends ResourceController implements Saveable {
             due.add(Calendar.SECOND, quietPeriod);
 
             // Do we already have this task in the queue? Because if so, we won't schedule a new one.
-            List<Item> duplicatesInQueue = new ArrayList<Item>();
+            List<Item> duplicatesInQueue = new ArrayList<>();
             for (Item item : liveGetItems(p)) {
                 boolean shouldScheduleItem = false;
                 for (QueueAction action : item.getActions(QueueAction.class)) {
                     shouldScheduleItem |= action.shouldSchedule(actions);
                 }
                 for (QueueAction action : Util.filter(actions, QueueAction.class)) {
-                    shouldScheduleItem |= action.shouldSchedule((new ArrayList<Action>(item.getAllActions())));
+                    shouldScheduleItem |= action.shouldSchedule((new ArrayList<>(item.getAllActions())));
                 }
                 if (!shouldScheduleItem) {
                     duplicatesInQueue.add(item);
@@ -787,7 +785,7 @@ public class Queue extends ResourceController implements Saveable {
     @Exported(inline=true)
     public Item[] getItems() {
         Snapshot s = this.snapshot;
-        List<Item> r = new ArrayList<Item>();
+        List<Item> r = new ArrayList<>();
 
         for(WaitingItem p : s.waitingList) {
             r = checkPermissionsAndAddToList(r, p);
@@ -826,7 +824,7 @@ public class Queue extends ResourceController implements Saveable {
     @Exported(inline=true)
     public StubItem[] getDiscoverableItems() {
         Snapshot s = this.snapshot;
-        List<StubItem> r = new ArrayList<StubItem>();
+        List<StubItem> r = new ArrayList<>();
 
         for(WaitingItem p : s.waitingList) {
             r = filterDiscoverableItemListBasedOnPermissions(r, p);
@@ -904,7 +902,7 @@ public class Queue extends ResourceController implements Saveable {
      */
     public List<BuildableItem> getBuildableItems(Computer c) {
         Snapshot snapshot = this.snapshot;
-        List<BuildableItem> result = new ArrayList<BuildableItem>();
+        List<BuildableItem> result = new ArrayList<>();
         _getBuildableItems(c, snapshot.buildables, result);
         _getBuildableItems(c, snapshot.pendings, result);
         return result;
@@ -925,7 +923,7 @@ public class Queue extends ResourceController implements Saveable {
      */
     public List<BuildableItem> getBuildableItems() {
         Snapshot snapshot = this.snapshot;
-        ArrayList<BuildableItem> r = new ArrayList<BuildableItem>(snapshot.buildables);
+        ArrayList<BuildableItem> r = new ArrayList<>(snapshot.buildables);
         r.addAll(snapshot.pendings);
         return r;
     }
@@ -934,14 +932,14 @@ public class Queue extends ResourceController implements Saveable {
      * Gets the snapshot of all {@link BuildableItem}s.
      */
     public List<BuildableItem> getPendingItems() {
-        return new ArrayList<BuildableItem>(snapshot.pendings);
+        return new ArrayList<>(snapshot.pendings);
     }
 
     /**
      * Gets the snapshot of all {@link BlockedItem}s.
      */
     protected List<BlockedItem> getBlockedItems() {
-        return new ArrayList<BlockedItem>(snapshot.blockedProjects);
+        return new ArrayList<>(snapshot.blockedProjects);
     }
     
     /**
@@ -969,7 +967,7 @@ public class Queue extends ResourceController implements Saveable {
      */
     public List<Item> getUnblockedItems() {
         Snapshot snapshot = this.snapshot;
-        List<Item> queuedNotBlocked = new ArrayList<Item>();
+        List<Item> queuedNotBlocked = new ArrayList<>();
         queuedNotBlocked.addAll(snapshot.waitingList);
         queuedNotBlocked.addAll(snapshot.buildables);
         queuedNotBlocked.addAll(snapshot.pendings);
@@ -984,7 +982,7 @@ public class Queue extends ResourceController implements Saveable {
      */
     public Set<Task> getUnblockedTasks() {
         List<Item> items = getUnblockedItems();
-        Set<Task> unblockedTasks = new HashSet<Task>(items.size());
+        Set<Task> unblockedTasks = new HashSet<>(items.size());
         for (Queue.Item t : items)
             unblockedTasks.add(t.task);
         return unblockedTasks;
@@ -1089,7 +1087,7 @@ public class Queue extends ResourceController implements Saveable {
     private List<Item> liveGetItems(Task t) {
         lock.lock();
         try {
-            List<Item> result = new ArrayList<Item>();
+            List<Item> result = new ArrayList<>();
             result.addAll(blockedProjects.getAll(t));
             result.addAll(buildables.getAll(t));
             // Do not include pendings—we have already finalized WorkUnitContext.actions.
@@ -1117,7 +1115,7 @@ public class Queue extends ResourceController implements Saveable {
      */
     public List<Item> getItems(Task t) {
         Snapshot snapshot = this.snapshot;
-        List<Item> result = new ArrayList<Item>();
+        List<Item> result = new ArrayList<>();
         for (Item item : snapshot.blockedProjects) {
             if (item.task.equals(t)) {
                 result.add(item);
@@ -1356,7 +1354,7 @@ public class Queue extends ResourceController implements Saveable {
         final Jenkins jenkins = Jenkins.getInstanceOrNull();
         // TODO confirm safe to assume non-null and use getInstance()
         final Queue queue = jenkins == null ? null : jenkins.getQueue();
-        return queue == null ? callable : new LockedJUCCallable<V>(callable);
+        return queue == null ? callable : new LockedJUCCallable<>(callable);
     }
 
     @Override
@@ -1466,10 +1464,10 @@ public class Queue extends ResourceController implements Saveable {
             LOGGER.log(Level.FINE, "Queue maintenance started on {0} with {1}", new Object[] {this, snapshot});
 
             // The executors that are currently waiting for a job to run.
-            Map<Executor, JobOffer> parked = new HashMap<Executor, JobOffer>();
+            Map<Executor, JobOffer> parked = new HashMap<>();
 
             {// update parked (and identify any pending items whose executor has disappeared)
-                List<BuildableItem> lostPendings = new ArrayList<BuildableItem>(pendings);
+                List<BuildableItem> lostPendings = new ArrayList<>(pendings);
                 for (Computer c : jenkins.getComputers()) {
                     for (Executor e : c.getAllExecutors()) {
                         if (e.isInterrupted()) {
@@ -1514,7 +1512,7 @@ public class Queue extends ResourceController implements Saveable {
                 if (s != null) {
                     s.sortBlockedItems(blockedItems);
                 } else {
-                    Collections.sort(blockedItems, QueueSorter.DEFAULT_BLOCKED_ITEM_COMPARATOR);
+                    blockedItems.sort(QueueSorter.DEFAULT_BLOCKED_ITEM_COMPARATOR);
                 }
                 for (BlockedItem p : blockedItems) {
                     String taskDisplayName = LOGGER.isLoggable(Level.FINEST) ? p.task.getFullDisplayName() : null;
@@ -1584,7 +1582,7 @@ public class Queue extends ResourceController implements Saveable {
             updateSnapshot();
             
             // allocate buildable jobs to executors
-            for (BuildableItem p : new ArrayList<BuildableItem>(
+            for (BuildableItem p : new ArrayList<>(
                     buildables)) {// copy as we'll mutate the list in the loop
                 // one last check to make sure this build is not blocked.
                 CauseOfBlockage causeOfBlockage = getCauseOfBlockageForItem(p);
@@ -1721,7 +1719,7 @@ public class Queue extends ResourceController implements Saveable {
                 }
             }
 
-            Map<Node, Integer> hashSource = new HashMap<Node, Integer>(h.getNodes().size());
+            Map<Node, Integer> hashSource = new HashMap<>(h.getNodes().size());
 
             // Even if master is configured with zero executors, we may need to run a flyweight task like MatrixProject on it.
             hashSource.put(h, Math.max(h.getNumExecutors() * 100, 1));
@@ -1730,7 +1728,7 @@ public class Queue extends ResourceController implements Saveable {
                 hashSource.put(n, n.getNumExecutors() * 100);
             }
 
-            ConsistentHash<Node> hash = new ConsistentHash<Node>(NODE_HASH);
+            ConsistentHash<Node> hash = new ConsistentHash<>(NODE_HASH);
             hash.addAll(hashSource);
 
             String fullDisplayName = p.task.getFullDisplayName();
@@ -2222,7 +2220,7 @@ public class Queue extends ResourceController implements Saveable {
         @SuppressWarnings("deprecation") // JENKINS-51584
         protected Item(Item item) {
             // do not use item.getAllActions() here as this will persist actions from a TransientActionFactory
-            this(item.task, new ArrayList<Action>(item.getActions()), item.id, item.future, item.inQueueSince);
+            this(item.task, new ArrayList<>(item.getActions()), item.id, item.future, item.inQueueSince);
         }
 
         /**
diff --git a/core/src/main/java/hudson/model/ResourceController.java b/core/src/main/java/hudson/model/ResourceController.java
index 852a72f366..9d1a82c852 100644
--- a/core/src/main/java/hudson/model/ResourceController.java
+++ b/core/src/main/java/hudson/model/ResourceController.java
@@ -42,7 +42,7 @@ public class ResourceController {
     /**
      * {@link ResourceList}s that are used by activities that are in progress.
      */
-    private final Set<ResourceActivity> inProgress = new CopyOnWriteArraySet<ResourceActivity>();
+    private final Set<ResourceActivity> inProgress = new CopyOnWriteArraySet<>();
 
     /**
      * View of {@link #inProgress} that exposes its {@link ResourceList}.
diff --git a/core/src/main/java/hudson/model/ResourceList.java b/core/src/main/java/hudson/model/ResourceList.java
index 0a5217088e..d3fdb9302e 100644
--- a/core/src/main/java/hudson/model/ResourceList.java
+++ b/core/src/main/java/hudson/model/ResourceList.java
@@ -52,7 +52,7 @@ public final class ResourceList {
     /**
      * All resources (R/W.)
      */
-    private final Set<Resource> all = new HashSet<Resource>();
+    private final Set<Resource> all = new HashSet<>();
 
     /**
      * Write accesses. Values are the # of write counts that this list uses.
@@ -60,7 +60,7 @@ public final class ResourceList {
      * The values are mostly supposed to be 1, but when {@link ResourceController}
      * uses a list to keep track of the union of all the activities, it can get larger.
      */
-    private final Map<Resource,Integer> write = new HashMap<Resource,Integer>();
+    private final Map<Resource,Integer> write = new HashMap<>();
     private static final Integer MAX_INT = Integer.MAX_VALUE;
 
     /**
@@ -143,7 +143,7 @@ public final class ResourceList {
 
     @Override
     public String toString() {
-        Map<Resource,String> m = new HashMap<Resource,String>();
+        Map<Resource,String> m = new HashMap<>();
         for (Resource r : all)
             m.put(r,"R");
         for (Entry<Resource,Integer> e : write.entrySet())
diff --git a/core/src/main/java/hudson/model/Result.java b/core/src/main/java/hudson/model/Result.java
index 8b1d05fc4b..ea912c856d 100644
--- a/core/src/main/java/hudson/model/Result.java
+++ b/core/src/main/java/hudson/model/Result.java
@@ -155,7 +155,7 @@ public final class Result implements Serializable, CustomExportedBean {
     }
 
     private static @Nonnull List<String> getNames() {
-        List<String> l = new ArrayList<String>();
+        List<String> l = new ArrayList<>();
         for (Result r : all)
             l.add(r.name);
         return l;
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 8565876d29..ca2f0c811a 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -381,7 +381,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
      */
     @Deprecated
     public List<Action> getTransientActions() {
-        List<Action> actions = new ArrayList<Action>();
+        List<Action> actions = new ArrayList<>();
         for (TransientBuildActionFactory factory: TransientBuildActionFactory.all()) {
             for (Action created : factory.createFor(this)) {
                 if (created == null) {
@@ -821,7 +821,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
      * @since 1.556
      */   
     protected @Nonnull BuildReference<RunT> createReference() {
-        return new BuildReference<RunT>(getId(), _this());
+        return new BuildReference<>(getId(), _this());
     }
 
     /**
@@ -865,7 +865,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
     public final @CheckForNull RunT getPreviousBuildInProgress() {
         if(previousBuildInProgress==this)   return null;    // the most common case
 
-        List<RunT> fixUp = new ArrayList<RunT>();
+        List<RunT> fixUp = new ArrayList<>();
         RunT r = _this(); // 'r' is the source of the pointer (so that we can add it to fix up if we find that the target of the pointer is inefficient.)
         RunT answer;
         while (true) {
@@ -948,7 +948,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
      * @since 1.383
      */  
     public @Nonnull List<RunT> getPreviousBuildsOverThreshold(int numberOfBuilds, @Nonnull Result threshold) {
-        List<RunT> builds = new ArrayList<RunT>(numberOfBuilds);
+        List<RunT> builds = new ArrayList<>(numberOfBuilds);
         
         RunT r = getPreviousBuild();
         while (r != null && builds.size() < numberOfBuilds) {
@@ -1216,7 +1216,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
          * Map of Artifact to treeNodeId of parent node in tree view.
          * Contains Artifact objects for directories and files (the ArrayList contains only files).
          */
-        private LinkedHashMap<Artifact,String> tree = new LinkedHashMap<Artifact,String>();
+        private LinkedHashMap<Artifact,String> tree = new LinkedHashMap<>();
 
         void updateFrom(SerializableArtifactList clone) {
             Map<String, Artifact> artifacts = new HashMap<>(); // need to share objects between tree and list, since computeDisplayName mutates displayPath
@@ -1256,7 +1256,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
             int depth=0;
             do {
                 collision = false;
-                Map<String,Integer/*index*/> names = new HashMap<String,Integer>();
+                Map<String,Integer/*index*/> names = new HashMap<>();
                 for (int i = 0; i < tokens.length; i++) {
                     String[] token = tokens[i];
                     String displayName = combineLast(token,len[i]);
@@ -1429,7 +1429,9 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
     /**
      * Returns the log file.
      * @return The file may reference both uncompressed or compressed logs
-     */  
+     * @deprecated Assumes file-based storage of the log, which is not necessarily the case for Pipelines after JEP-210. Use other methods giving various kinds of streams such as {@link Run#getLogReader()},  {@link Run#getLogInputStream()}, or {@link Run#getLogText()}.
+     */
+    @Deprecated
     public @Nonnull File getLogFile() {
         File rawF = new File(getRootDir(), "log");
         if (rawF.isFile()) {
@@ -1658,7 +1660,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
              * Stages of the builds that this runner has completed. This is used for concurrent {@link RunExecution}s to
              * coordinate and serialize their executions where necessary.
              */
-            private final Set<CheckPoint> checkpoints = new HashSet<CheckPoint>();
+            private final Set<CheckPoint> checkpoints = new HashSet<>();
 
             private boolean allDone;
 
@@ -1697,7 +1699,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
 
         private final CheckpointSet checkpoints = new CheckpointSet();
 
-        private final Map<Object,Object> attributes = new HashMap<Object, Object>();
+        private final Map<Object,Object> attributes = new HashMap<>();
 
         /**
          * Performs the main build and returns the status code.
@@ -2098,7 +2100,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
 
     private String convertBytesToString(List<Byte> bytes) {
         Collections.reverse(bytes);
-        Byte[] byteArray = bytes.toArray(new Byte[bytes.size()]);
+        Byte[] byteArray = bytes.toArray(new Byte[0]);
         return new String(ArrayUtils.toPrimitive(byteArray), getCharset());
     }
 
@@ -2335,9 +2337,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
         LOGGER.log(WARNING, "deprecated call to Run.getEnvVars\n\tat {0}", new Throwable().getStackTrace()[1]);
         try {
             return getEnvironment(new LogTaskListener(LOGGER, Level.INFO));
-        } catch (IOException e) {
-            return new EnvVars();
-        } catch (InterruptedException e) {
+        } catch (IOException | InterruptedException e) {
             return new EnvVars();
         }
     }
diff --git a/core/src/main/java/hudson/model/RunMap.java b/core/src/main/java/hudson/model/RunMap.java
index 284808208f..eefbc86cd4 100644
--- a/core/src/main/java/hudson/model/RunMap.java
+++ b/core/src/main/java/hudson/model/RunMap.java
@@ -227,11 +227,7 @@ public final class RunMap<R extends Run<?,R>> extends AbstractLazyLoadRunMap<R>
                     LOGGER.log(FINEST, "Loaded " + b.getFullDisplayName() + " in " + Thread.currentThread().getName(), new ThisIsHowItsLoaded());
                 }
                 return b;
-            } catch (IOException e) {
-                LOGGER.log(Level.WARNING, "could not load " + d, e);
-            } catch (InstantiationError e) {
-                LOGGER.log(Level.WARNING, "could not load " + d, e);
-            } catch (Exception e) {
+            } catch (Exception | InstantiationError e) {
                 LOGGER.log(Level.WARNING, "could not load " + d, e);
             }
         }
diff --git a/core/src/main/java/hudson/model/RunnerStack.java b/core/src/main/java/hudson/model/RunnerStack.java
index 2cade6d5ef..8065ce9cac 100644
--- a/core/src/main/java/hudson/model/RunnerStack.java
+++ b/core/src/main/java/hudson/model/RunnerStack.java
@@ -38,12 +38,11 @@ import javax.annotation.CheckForNull;
  * @since 1.319
  */
 final class RunnerStack {
-    private final Map<Executor,Stack<RunExecution>> stack = new WeakHashMap<Executor,Stack<RunExecution>>();
+    private final Map<Executor,Stack<RunExecution>> stack = new WeakHashMap<>();
 
     synchronized void push(RunExecution r) {
         Executor e = Executor.currentExecutor();
-        Stack<RunExecution> s = stack.get(e);
-        if(s==null) stack.put(e,s=new Stack<RunExecution>());
+        Stack<RunExecution> s = stack.computeIfAbsent(e, k -> new Stack<>());
         s.push(r);
     }
 
diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index c3cad4eea7..c9514a34d7 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -636,7 +636,7 @@ public abstract class Slave extends Node implements Serializable {
         @SuppressWarnings("unchecked") // used by Jelly EL only
         @Restricted(NoExternalUse.class) // used by Jelly EL only
         public final List<NodePropertyDescriptor> nodePropertyDescriptors(@CheckForNull Slave it) {
-            List<NodePropertyDescriptor> result = new ArrayList<NodePropertyDescriptor>();
+            List<NodePropertyDescriptor> result = new ArrayList<>();
             Collection<NodePropertyDescriptor> list =
                     (Collection) Jenkins.getInstance().getDescriptorList(NodeProperty.class);
             for (NodePropertyDescriptor npd : it == null
diff --git a/core/src/main/java/hudson/model/TaskThread.java b/core/src/main/java/hudson/model/TaskThread.java
index 73623e7b0d..9fb5ba25e9 100644
--- a/core/src/main/java/hudson/model/TaskThread.java
+++ b/core/src/main/java/hudson/model/TaskThread.java
@@ -97,7 +97,7 @@ public abstract class TaskThread extends Thread {
      */
     protected final void associateWith(TaskAction action) {
         action.workerThread = this;
-        action.log = new WeakReference<AnnotatedLargeText>(log);
+        action.log = new WeakReference<>(log);
     }
 
     /**
@@ -188,7 +188,7 @@ public abstract class TaskThread extends Thread {
 
             return new ListenerAndText(
                 new StreamTaskListener(log),
-                new AnnotatedLargeText<TaskAction>(log,Charset.defaultCharset(),false,context)
+                new AnnotatedLargeText<>(log, Charset.defaultCharset(), false, context)
             );
         }
 
@@ -198,7 +198,7 @@ public abstract class TaskThread extends Thread {
         public static ListenerAndText forFile(File f, TaskAction context) throws IOException {
             return new ListenerAndText(
                 new StreamTaskListener(f),
-                new AnnotatedLargeText<TaskAction>(f,Charset.defaultCharset(),false,context)
+                new AnnotatedLargeText<>(f, Charset.defaultCharset(), false, context)
             );
         }
     }
diff --git a/core/src/main/java/hudson/model/TransientComputerActionFactory.java b/core/src/main/java/hudson/model/TransientComputerActionFactory.java
index 3a77db8c52..1506da7135 100644
--- a/core/src/main/java/hudson/model/TransientComputerActionFactory.java
+++ b/core/src/main/java/hudson/model/TransientComputerActionFactory.java
@@ -64,7 +64,7 @@ public abstract class TransientComputerActionFactory implements ExtensionPoint {
      * Creates {@link Action}s for a node, using all registered {@link TransientComputerActionFactory}s.
      */
 	public static List<Action> createAllFor(Computer target) {
-		List<Action> result = new ArrayList<Action>();
+		List<Action> result = new ArrayList<>();
 		for (TransientComputerActionFactory f: all()) {
 			result.addAll(f.createFor(target));
 		}
diff --git a/core/src/main/java/hudson/model/TransientViewActionFactory.java b/core/src/main/java/hudson/model/TransientViewActionFactory.java
index edf9a1c85a..d5fa9dcfc2 100644
--- a/core/src/main/java/hudson/model/TransientViewActionFactory.java
+++ b/core/src/main/java/hudson/model/TransientViewActionFactory.java
@@ -31,7 +31,7 @@ public abstract class TransientViewActionFactory implements ExtensionPoint {
      * Creates {@link Action}s for a view, using all registered {@link TransientViewActionFactory}s.
      */
 	public static List<Action> createAllFor(View v) {
-		List<Action> result = new ArrayList<Action>();
+		List<Action> result = new ArrayList<>();
 		for (TransientViewActionFactory f: all()) {
 			result.addAll(f.createFor(v));
 		}
diff --git a/core/src/main/java/hudson/model/TreeView.java b/core/src/main/java/hudson/model/TreeView.java
index d70c2d4744..d4229acbf8 100644
--- a/core/src/main/java/hudson/model/TreeView.java
+++ b/core/src/main/java/hudson/model/TreeView.java
@@ -62,12 +62,12 @@ public class TreeView extends View implements ViewGroup {
      * List of job names. This is what gets serialized.
      */
     private final Set<String> jobNames
-        = new TreeSet<String>(CaseInsensitiveComparator.INSTANCE);
+        = new TreeSet<>(CaseInsensitiveComparator.INSTANCE);
 
     /**
      * Nested views.
      */
-    private final CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<View>();
+    private final CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<>();
 
     @DataBoundConstructor
     public TreeView(String name) {
diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index 0185e4f854..380bdce825 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -189,18 +189,18 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
     /**
      * List of created {@link UpdateCenterJob}s. Access needs to be synchronized.
      */
-    private final Vector<UpdateCenterJob> jobs = new Vector<UpdateCenterJob>();
+    private final Vector<UpdateCenterJob> jobs = new Vector<>();
 
     /**
      * {@link UpdateSite}s from which we've already installed a plugin at least once.
      * This is used to skip network tests.
      */
-    private final Set<UpdateSite> sourcesUsed = new HashSet<UpdateSite>();
+    private final Set<UpdateSite> sourcesUsed = new HashSet<>();
 
     /**
      * List of {@link UpdateSite}s to be used.
      */
-    private final PersistedList<UpdateSite> sites = new PersistedList<UpdateSite>(this);
+    private final PersistedList<UpdateSite> sites = new PersistedList<>(this);
 
     /**
      * Update center configuration data
@@ -338,7 +338,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
     @StaplerDispatchable
     public List<UpdateCenterJob> getJobs() {
         synchronized (jobs) {
-            return new ArrayList<UpdateCenterJob>(jobs);
+            return new ArrayList<>(jobs);
         }
     }
 
@@ -918,7 +918,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
 
     @Exported
     public List<Plugin> getAvailables() {
-        Map<String,Plugin> pluginMap = new LinkedHashMap<String, Plugin>();
+        Map<String,Plugin> pluginMap = new LinkedHashMap<>();
         for (UpdateSite site : sites) {
             for (Plugin plugin: site.getAvailables()) {
                 final Plugin existing = pluginMap.get(plugin.name);
@@ -935,7 +935,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
             }
         }
 
-        return new ArrayList<Plugin>(pluginMap.values());
+        return new ArrayList<>(pluginMap.values());
     }
 
     /**
@@ -943,7 +943,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
      * A plugin with multiple categories will appear multiple times in the list.
      */
     public PluginEntry[] getCategorizedAvailables() {
-        TreeSet<PluginEntry> entries = new TreeSet<PluginEntry>();
+        TreeSet<PluginEntry> entries = new TreeSet<>();
         for (Plugin p : getAvailables()) {
             if (p.categories==null || p.categories.length==0)
                 entries.add(new PluginEntry(p, getCategoryDisplayName(null)));
@@ -951,7 +951,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
                 for (String c : p.categories)
                     entries.add(new PluginEntry(p, getCategoryDisplayName(c)));
         }
-        return entries.toArray(new PluginEntry[entries.size()]);
+        return entries.toArray(new PluginEntry[0]);
     }
 
     private static String getCategoryDisplayName(String category) {
@@ -966,7 +966,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
     }
 
     public List<Plugin> getUpdates() {
-        Map<String,Plugin> pluginMap = new LinkedHashMap<String, Plugin>();
+        Map<String,Plugin> pluginMap = new LinkedHashMap<>();
         for (UpdateSite site : sites) {
             for (Plugin plugin: site.getUpdates()) {
                 final Plugin existing = pluginMap.get(plugin.name);
@@ -983,7 +983,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
             }
         }
 
-        return new ArrayList<Plugin>(pluginMap.values());
+        return new ArrayList<>(pluginMap.values());
     }
 
     /**
@@ -997,7 +997,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
      *
      */
     public List<FormValidation> updateAllSites() throws InterruptedException, ExecutionException {
-        List <Future<FormValidation>> futures = new ArrayList<Future<FormValidation>>();
+        List <Future<FormValidation>> futures = new ArrayList<>();
         for (UpdateSite site : getSites()) {
             Future<FormValidation> future = site.updateDirectly(DownloadService.signatureCheck);
             if (future != null) {
@@ -1005,7 +1005,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
             }
         }
 
-        List<FormValidation> results = new ArrayList<FormValidation>();
+        List<FormValidation> results = new ArrayList<>();
         for (Future<FormValidation> f : futures) {
             results.add(f.get());
         }
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 153d692093..16be69f4cf 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -335,11 +335,7 @@ public class UpdateSite {
         if(df.exists()) {
             try {
                 return JSONObject.fromObject(df.read());
-            } catch (JSONException e) {
-                LOGGER.log(Level.SEVERE,"Failed to parse "+df,e);
-                df.delete(); // if we keep this file, it will cause repeated failures
-                return null;
-            } catch (IOException e) {
+            } catch (JSONException | IOException e) {
                 LOGGER.log(Level.SEVERE,"Failed to parse "+df,e);
                 df.delete(); // if we keep this file, it will cause repeated failures
                 return null;
@@ -355,7 +351,7 @@ public class UpdateSite {
      */
     @Exported
     public List<Plugin> getAvailables() {
-        List<Plugin> r = new ArrayList<Plugin>();
+        List<Plugin> r = new ArrayList<>();
         Data data = getData();
         if(data==null)     return Collections.emptyList();
         for (Plugin p : data.plugins.values()) {
@@ -415,7 +411,7 @@ public class UpdateSite {
         Data data = getData();
         if(data==null)      return Collections.emptyList(); // fail to determine
         
-        List<Plugin> r = new ArrayList<Plugin>();
+        List<Plugin> r = new ArrayList<>();
         for (PluginWrapper pw : Jenkins.getInstance().getPluginManager().getPlugins()) {
             Plugin p = pw.getUpdateInfo();
             if(p!=null) r.add(p);
@@ -515,13 +511,13 @@ public class UpdateSite {
         /**
          * Plugins in the repository, keyed by their artifact IDs.
          */
-        public final Map<String,Plugin> plugins = new TreeMap<String,Plugin>(String.CASE_INSENSITIVE_ORDER);
+        public final Map<String,Plugin> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         /**
          * List of warnings (mostly security) published with the update site.
          *
          * @since 2.40
          */
-        private final Set<Warning> warnings = new HashSet<Warning>();
+        private final Set<Warning> warnings = new HashSet<>();
 
         /**
          * If this is non-null, Jenkins is going to check the connectivity to this URL to make sure
@@ -1073,7 +1069,7 @@ public class UpdateSite {
          */
         @Exported
         public List<Plugin> getNeededDependencies() {
-            List<Plugin> deps = new ArrayList<Plugin>();
+            List<Plugin> deps = new ArrayList<>();
 
             for(Map.Entry<String,String> e : dependencies.entrySet()) {
                 VersionNumber requiredVersion = e.getValue() != null ? new VersionNumber(e.getValue()) : null;
diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java
index e7037555ae..93e4057c40 100644
--- a/core/src/main/java/hudson/model/UsageStatistics.java
+++ b/core/src/main/java/hudson/model/UsageStatistics.java
@@ -130,7 +130,7 @@ public class UsageStatistics extends PageDecorator implements PersistentDescript
         o.put("servletContainer", j.servletContext.getServerInfo());
         o.put("version", Jenkins.VERSION);
 
-        List<JSONObject> nodes = new ArrayList<JSONObject>();
+        List<JSONObject> nodes = new ArrayList<>();
         for( Computer c : j.getComputers() ) {
             JSONObject  n = new JSONObject();
             if(c.getNode()==j) {
@@ -146,7 +146,7 @@ public class UsageStatistics extends PageDecorator implements PersistentDescript
         }
         o.put("nodes",nodes);
 
-        List<JSONObject> plugins = new ArrayList<JSONObject>();
+        List<JSONObject> plugins = new ArrayList<>();
         for( PluginWrapper pw : j.getPluginManager().getPlugins() ) {
             if(!pw.isActive())  continue;   // treat disabled plugins as if they are uninstalled
             JSONObject p = new JSONObject();
diff --git a/core/src/main/java/hudson/model/UserProperties.java b/core/src/main/java/hudson/model/UserProperties.java
index 2c936dfbbf..3b02a7c711 100644
--- a/core/src/main/java/hudson/model/UserProperties.java
+++ b/core/src/main/java/hudson/model/UserProperties.java
@@ -40,5 +40,5 @@ public class UserProperties {
      *      Use {@link UserProperty#all()} for read access and {@link Extension} for auto-registration.
      */
     @Deprecated
-    public static final List<UserPropertyDescriptor> LIST = (List)new DescriptorList<UserProperty>(UserProperty.class);
+    public static final List<UserPropertyDescriptor> LIST = (List) new DescriptorList<>(UserProperty.class);
 }
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index a062f19b8c..ff391155ed 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -206,7 +206,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
     public Collection<TopLevelItem> getAllItems() {
 
         if (this instanceof ViewGroup) {
-            final Collection<TopLevelItem> items = new LinkedHashSet<TopLevelItem>(getItems());
+            final Collection<TopLevelItem> items = new LinkedHashSet<>(getItems());
 
             for(View view: ((ViewGroup) this).getViews()) {
                 items.addAll(view.getAllItems());
@@ -318,7 +318,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
      * on this label.
      */
     public List<ViewPropertyDescriptor> getApplicablePropertyDescriptors() {
-        List<ViewPropertyDescriptor> r = new ArrayList<ViewPropertyDescriptor>();
+        List<ViewPropertyDescriptor> r = new ArrayList<>();
         for (ViewPropertyDescriptor pd : ViewProperty.all()) {
             if (pd.isEnabledFor(this))
                 r.add(pd);
@@ -428,9 +428,9 @@ public abstract class View extends AbstractModelObject implements AccessControll
             return Arrays.asList(computers);
         }
 
-        List<Computer> result = new ArrayList<Computer>();
+        List<Computer> result = new ArrayList<>();
 
-        HashSet<Label> labels = new HashSet<Label>();
+        HashSet<Label> labels = new HashSet<>();
         for (Item item : getItems()) {
             if (item instanceof AbstractProject<?, ?>) {
                 labels.addAll(((AbstractProject<?, ?>) item).getRelevantLabels());
@@ -725,7 +725,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
         }
 
         private Map<User,UserInfo> getUserInfo(Collection<? extends Item> items) {
-            Map<User,UserInfo> users = new HashMap<User,UserInfo>();
+            Map<User,UserInfo> users = new HashMap<>();
             for (Item item : items) {
                 for (Job<?, ?> job : item.getAllJobs()) {
                     RunList<? extends Run<?, ?>> runs = job.getBuilds();
@@ -754,7 +754,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
         }
 
         private List<UserInfo> toList(Map<User,UserInfo> users) {
-            ArrayList<UserInfo> list = new ArrayList<UserInfo>();
+            ArrayList<UserInfo> list = new ArrayList<>();
             list.addAll(users.values());
             Collections.sort(list);
             return Collections.unmodifiableList(list);
@@ -799,8 +799,8 @@ public abstract class View extends AbstractModelObject implements AccessControll
 
         private final Collection<TopLevelItem> items;
         private final User unknown;
-        private final Map<User,UserInfo> users = new HashMap<User,UserInfo>();
-        private final Set<User> modified = new HashSet<User>();
+        private final Map<User,UserInfo> users = new HashMap<>();
+        private final Set<User> modified = new HashSet<>();
         private final String iconSize;
         public final ModelObject parent;
 
@@ -1085,7 +1085,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
         }
         for (TopLevelItemDescriptor descriptor : DescriptorVisibilityFilter.apply(getOwner().getItemGroup(), Items.all(Jenkins.getAuthentication(), getOwner().getItemGroup()))) {
             ItemCategory ic = ItemCategory.getCategory(descriptor);
-            Map<String, Serializable> metadata = new HashMap<String, Serializable>();
+            Map<String, Serializable> metadata = new HashMap<>();
 
             // Information about Item.
             metadata.put("class", descriptor.getId());
@@ -1109,7 +1109,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
             if (category != null) {
                 category.getItems().add(metadata);
             } else {
-                List<Map<String, Serializable>> temp = new ArrayList<Map<String, Serializable>>();
+                List<Map<String, Serializable>> temp = new ArrayList<>();
                 temp.add(metadata);
                 category = new Category(ic.getId(), ic.getDisplayName(), ic.getDescription(), ic.getOrder(), ic.getMinToShow(), temp);
                 categories.getItems().add(category);
@@ -1140,7 +1140,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
     }
 
     public void doRssLatest( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
-        List<Run> lastBuilds = new ArrayList<Run>();
+        List<Run> lastBuilds = new ArrayList<>();
         for (TopLevelItem item : getItems()) {
             if (item instanceof Job) {
                 Job job = (Job) item;
@@ -1241,7 +1241,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
      *      Use {@link #all()} for read access, and use {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<View> LIST = new DescriptorList<View>(View.class);
+    public static final DescriptorList<View> LIST = new DescriptorList<>(View.class);
 
     /**
      * Returns all the registered {@link ViewDescriptor}s.
@@ -1259,7 +1259,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
      */
     @Nonnull
     public static List<ViewDescriptor> allInstantiable() {
-        List<ViewDescriptor> r = new ArrayList<ViewDescriptor>();
+        List<ViewDescriptor> r = new ArrayList<>();
         StaplerRequest request = Stapler.getCurrentRequest();
         if (request == null) {
             throw new IllegalStateException("This method can only be invoked from a stapler request");
@@ -1403,7 +1403,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
      * "Job" in "New Job". When a view is used in a context that restricts the child type,
      * It might be useful to override this.
      */
-    public static final Message<View> NEW_PRONOUN = new Message<View>();
+    public static final Message<View> NEW_PRONOUN = new Message<>();
 
     private final static Logger LOGGER = Logger.getLogger(View.class.getName());
 }
diff --git a/core/src/main/java/hudson/model/ViewGroupMixIn.java b/core/src/main/java/hudson/model/ViewGroupMixIn.java
index 6547a8c5ae..0e164b76d7 100644
--- a/core/src/main/java/hudson/model/ViewGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ViewGroupMixIn.java
@@ -146,12 +146,12 @@ public abstract class ViewGroupMixIn {
     @Exported
     public Collection<View> getViews() {
         List<View> orig = views();
-        List<View> copy = new ArrayList<View>(orig.size());
+        List<View> copy = new ArrayList<>(orig.size());
         for (View v : orig) {
             if (v.hasPermission(View.READ))
                 copy.add(v);
         }
-        Collections.sort(copy, View.SORTER);
+        copy.sort(View.SORTER);
         return copy;
     }
 
diff --git a/core/src/main/java/hudson/model/ViewJob.java b/core/src/main/java/hudson/model/ViewJob.java
index 2bf7fa9766..dc16020834 100644
--- a/core/src/main/java/hudson/model/ViewJob.java
+++ b/core/src/main/java/hudson/model/ViewJob.java
@@ -60,7 +60,7 @@ public abstract class ViewJob<JobT extends ViewJob<JobT,RunT>, RunT extends Run<
     /**
      * All {@link Run}s. Copy-on-write semantics.
      */
-    protected transient /*almost final*/ RunMap<RunT> runs = new RunMap<RunT>();
+    protected transient /*almost final*/ RunMap<RunT> runs = new RunMap<>();
 
     private transient boolean notLoaded = true;
 
@@ -105,7 +105,7 @@ public abstract class ViewJob<JobT extends ViewJob<JobT,RunT>, RunT extends Run<
             // if none is loaded yet, do so immediately.
             synchronized(this) {
                 if(runs==null)
-                    runs = new RunMap<RunT>();
+                    runs = new RunMap<>();
                 if(notLoaded) {
                     notLoaded = false;
                     _reload();   
@@ -177,7 +177,7 @@ public abstract class ViewJob<JobT extends ViewJob<JobT,RunT>, RunT extends Run<
          * This is a set, so no {@link ExternalJob}s are scheduled twice, yet
          * it's order is predictable, avoiding starvation.
          */
-        final Set<ViewJob> reloadQueue = new LinkedHashSet<ViewJob>();
+        final Set<ViewJob> reloadQueue = new LinkedHashSet<>();
 
         private ReloadThread() {
             setName("ViewJob reload thread");
diff --git a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java
index 8c55c2bc4d..056bb2c712 100644
--- a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java
+++ b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java
@@ -65,7 +65,7 @@ public class WorkspaceCleanupThread extends AsyncPeriodicWork {
             LOGGER.fine("Disabled. Skipping execution");
             return;
         }
-        List<Node> nodes = new ArrayList<Node>();
+        List<Node> nodes = new ArrayList<>();
         Jenkins j = Jenkins.getInstance();
         nodes.add(j);
         nodes.addAll(j.getNodes());
@@ -82,10 +82,7 @@ public class WorkspaceCleanupThread extends AsyncPeriodicWork {
                 boolean check;
                 try {
                     check = shouldBeDeleted(item, ws, node);
-                } catch (IOException x) {
-                    Functions.printStackTrace(x, listener.error("Failed to check " + node.getDisplayName()));
-                    continue;
-                } catch (InterruptedException x) {
+                } catch (IOException | InterruptedException x) {
                     Functions.printStackTrace(x, listener.error("Failed to check " + node.getDisplayName()));
                     continue;
                 }
@@ -94,9 +91,7 @@ public class WorkspaceCleanupThread extends AsyncPeriodicWork {
                     try {
                         ws.deleteRecursive();
                         WorkspaceList.tempDir(ws).deleteRecursive();
-                    } catch (IOException x) {
-                        Functions.printStackTrace(x, listener.error("Failed to delete " + ws + " on " + node.getDisplayName()));
-                    } catch (InterruptedException x) {
+                    } catch (IOException | InterruptedException x) {
                         Functions.printStackTrace(x, listener.error("Failed to delete " + ws + " on " + node.getDisplayName()));
                     }
                 }
diff --git a/core/src/main/java/hudson/model/labels/LabelAtom.java b/core/src/main/java/hudson/model/labels/LabelAtom.java
index 3a6e6b44b2..d2a634cd4c 100644
--- a/core/src/main/java/hudson/model/labels/LabelAtom.java
+++ b/core/src/main/java/hudson/model/labels/LabelAtom.java
@@ -66,10 +66,10 @@ import javax.annotation.Nullable;
  */
 public class LabelAtom extends Label implements Saveable {
     private DescribableList<LabelAtomProperty,LabelAtomPropertyDescriptor> properties =
-            new DescribableList<LabelAtomProperty,LabelAtomPropertyDescriptor>(this);
+            new DescribableList<>(this);
 
     @CopyOnWrite
-    protected transient volatile List<Action> transientActions = new Vector<Action>();
+    protected transient volatile List<Action> transientActions = new Vector<>();
 
     private String description;
 
@@ -100,7 +100,7 @@ public class LabelAtom extends Label implements Saveable {
     @Override
     public List<Action> getActions() {
         // add all the transient actions, too
-        List<Action> actions = new Vector<Action>(super.getActions());
+        List<Action> actions = new Vector<>(super.getActions());
         actions.addAll(transientActions);
         // return the read only list to cause a failure on plugins who try to add an action here
         return Collections.unmodifiableList(actions);
@@ -109,7 +109,7 @@ public class LabelAtom extends Label implements Saveable {
     // TODO implement addAction, addOrReplaceAction, removeAction, removeActions, replaceActions
 
     protected void updateTransientActions() {
-        Vector<Action> ta = new Vector<Action>();
+        Vector<Action> ta = new Vector<>();
 
         for (LabelAtomProperty p : properties)
             ta.addAll(p.getActions(this));
@@ -236,7 +236,7 @@ public class LabelAtom extends Label implements Saveable {
     }
 
     public static LabelAtom findNearest(String name) {
-        List<String> candidates = new ArrayList<String>();
+        List<String> candidates = new ArrayList<>();
         for (LabelAtom a : Jenkins.getInstance().getLabelAtoms()) {
             candidates.add(a.getName());
         }
diff --git a/core/src/main/java/hudson/model/listeners/SCMListener.java b/core/src/main/java/hudson/model/listeners/SCMListener.java
index ebbcaa397d..2415ce86fa 100644
--- a/core/src/main/java/hudson/model/listeners/SCMListener.java
+++ b/core/src/main/java/hudson/model/listeners/SCMListener.java
@@ -130,7 +130,7 @@ public abstract class SCMListener implements ExtensionPoint {
         if (j == null) { // TODO use !Functions.isExtensionsAvailable() once JENKINS-33377
             return Collections.emptySet();
         }
-        List<SCMListener> r = new ArrayList<SCMListener>(j.getExtensionList(SCMListener.class));
+        List<SCMListener> r = new ArrayList<>(j.getExtensionList(SCMListener.class));
         for (SCMListener l : j.getSCMListeners()) {
             r.add(l);
         }
diff --git a/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java b/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java
index f3194209ef..0752dadab4 100644
--- a/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java
+++ b/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
 public abstract class AbstractQueueSorterImpl extends QueueSorter implements Comparator<BuildableItem> {
     @Override
     public void sortBuildableItems(List<BuildableItem> buildables) {
-        Collections.sort(buildables,this); // sort is ascending order
+        buildables.sort(this); // sort is ascending order
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/queue/BackFiller.java b/core/src/main/java/hudson/model/queue/BackFiller.java
index bc3773cc4d..17c421c43f 100644
--- a/core/src/main/java/hudson/model/queue/BackFiller.java
+++ b/core/src/main/java/hudson/model/queue/BackFiller.java
@@ -32,7 +32,7 @@ public class BackFiller extends LoadPredictor {
     @Override
     public Iterable<FutureLoad> predict(MappingWorksheet plan, Computer computer, long start, long end) {
         TimeRange timeRange = new TimeRange(start, end - start);
-        List<FutureLoad> loads = new ArrayList<FutureLoad>();
+        List<FutureLoad> loads = new ArrayList<>();
 
         for (BuildableItem bi : Jenkins.getInstance().getQueue().getBuildableItems()) {
             TentativePlan tp = bi.getAction(TentativePlan.class);
@@ -94,7 +94,7 @@ public class BackFiller extends LoadPredictor {
         recursion = true;
         try {
             // pretend for now that all executors are available and decide some assignment that's executable.
-            List<PseudoExecutorSlot> slots = new ArrayList<PseudoExecutorSlot>();
+            List<PseudoExecutorSlot> slots = new ArrayList<>();
             for (Computer c : Jenkins.getInstance().getComputers()) {
                 if (c.isOffline())  continue;
                 for (Executor e : c.getExecutors()) {
@@ -109,7 +109,7 @@ public class BackFiller extends LoadPredictor {
             if (m==null)    return null;
 
             // figure out how many executors we need on each computer?
-            Map<Computer,Integer> footprint = new HashMap<Computer, Integer>();
+            Map<Computer,Integer> footprint = new HashMap<>();
             for (Entry<WorkChunk, ExecutorChunk> e : m.toMap().entrySet()) {
                 Computer c = e.getValue().computer;
                 Integer v = footprint.get(c);
diff --git a/core/src/main/java/hudson/model/queue/FutureImpl.java b/core/src/main/java/hudson/model/queue/FutureImpl.java
index 2104dd4fcf..172fd6bb47 100644
--- a/core/src/main/java/hudson/model/queue/FutureImpl.java
+++ b/core/src/main/java/hudson/model/queue/FutureImpl.java
@@ -47,14 +47,14 @@ public final class FutureImpl extends AsyncFutureImpl<Executable> implements Que
     /**
      * If the computation has started, set to {@link Executor}s that are running the build.
      */
-    private final Set<Executor> executors = new HashSet<Executor>();
+    private final Set<Executor> executors = new HashSet<>();
 
     /**
      * {@link Future} that completes when the task started running.
      *
      * In contrast, {@link FutureImpl} will complete when the task finishes.
      */
-    /*package*/ final AsyncFutureImpl<Executable> start = new AsyncFutureImpl<Executable>();
+    /*package*/ final AsyncFutureImpl<Executable> start = new AsyncFutureImpl<>();
 
     public FutureImpl(Task task) {
         this.task = task;
diff --git a/core/src/main/java/hudson/model/queue/Latch.java b/core/src/main/java/hudson/model/queue/Latch.java
index 15743a0d3f..49f2d870b2 100644
--- a/core/src/main/java/hudson/model/queue/Latch.java
+++ b/core/src/main/java/hudson/model/queue/Latch.java
@@ -75,10 +75,7 @@ class Latch {
 
         try {
             onCriteriaMet();
-        } catch (Error e) {
-            abort(e);
-            throw e;
-        } catch (RuntimeException e) {
+        } catch (Error | RuntimeException e) {
             abort(e);
             throw e;
         }
diff --git a/core/src/main/java/hudson/model/queue/LoadPredictor.java b/core/src/main/java/hudson/model/queue/LoadPredictor.java
index 2fc4bf8d65..9e8ce7bc07 100644
--- a/core/src/main/java/hudson/model/queue/LoadPredictor.java
+++ b/core/src/main/java/hudson/model/queue/LoadPredictor.java
@@ -92,7 +92,7 @@ public abstract class LoadPredictor implements ExtensionPoint {
         @Override
         public Iterable<FutureLoad> predict(MappingWorksheet plan, final Computer computer, long start, long eternity) {
             long now = System.currentTimeMillis();
-            List<FutureLoad> fl = new ArrayList<FutureLoad>();
+            List<FutureLoad> fl = new ArrayList<>();
             for (Executor e : computer.getExecutors()) {
                 if (e.isIdle())     continue;
 
diff --git a/core/src/main/java/hudson/model/queue/MappingWorksheet.java b/core/src/main/java/hudson/model/queue/MappingWorksheet.java
index 561c950e4a..d953b48fd1 100644
--- a/core/src/main/java/hudson/model/queue/MappingWorksheet.java
+++ b/core/src/main/java/hudson/model/queue/MappingWorksheet.java
@@ -218,7 +218,7 @@ public class MappingWorksheet {
         }
 
         public List<ExecutorChunk> applicableExecutorChunks() {
-            List<ExecutorChunk> r = new ArrayList<ExecutorChunk>(executors.size());
+            List<ExecutorChunk> r = new ArrayList<>(executors.size());
             for (ExecutorChunk e : executors) {
                 if (e.canAccept(this))
                     r.add(e);
@@ -270,7 +270,7 @@ public class MappingWorksheet {
          * Returns the assignment as a map.
          */
         public Map<WorkChunk,ExecutorChunk> toMap() {
-            Map<WorkChunk,ExecutorChunk> r = new HashMap<WorkChunk,ExecutorChunk>();
+            Map<WorkChunk,ExecutorChunk> r = new HashMap<>();
             for (int i=0; i<size(); i++)
                 r.put(get(i),assigned(i));
             return r;
@@ -322,12 +322,10 @@ public class MappingWorksheet {
         this.item = item;
         
         // group executors by their computers
-        Map<Computer,List<ExecutorSlot>> j = new HashMap<Computer, List<ExecutorSlot>>();
+        Map<Computer,List<ExecutorSlot>> j = new HashMap<>();
         for (ExecutorSlot o : offers) {
             Computer c = o.getExecutor().getOwner();
-            List<ExecutorSlot> l = j.get(c);
-            if (l==null)
-                j.put(c,l=new ArrayList<ExecutorSlot>());
+            List<ExecutorSlot> l = j.computeIfAbsent(c, k -> new ArrayList<>());
             l.add(o);
         }
 
@@ -363,7 +361,7 @@ public class MappingWorksheet {
         }
 
         // build into the final shape
-        List<ExecutorChunk> executors = new ArrayList<ExecutorChunk>();
+        List<ExecutorChunk> executors = new ArrayList<>();
         for (List<ExecutorSlot> group : j.values()) {
             if (group.isEmpty())    continue;   // evict empty group
             ExecutorChunk ec = new ExecutorChunk(group, executors.size());
@@ -373,19 +371,17 @@ public class MappingWorksheet {
         this.executors = ImmutableList.copyOf(executors);
 
         // group execution units into chunks. use of LinkedHashMap ensures that the main work comes at the top
-        Map<Object,List<SubTask>> m = new LinkedHashMap<Object,List<SubTask>>();
+        Map<Object,List<SubTask>> m = new LinkedHashMap<>();
         for (SubTask meu : item.task.getSubTasks()) {
             Object c = meu.getSameNodeConstraint();
             if (c==null)    c = new Object();
 
-            List<SubTask> l = m.get(c);
-            if (l==null)
-                m.put(c,l= new ArrayList<SubTask>());
+            List<SubTask> l = m.computeIfAbsent(c, k -> new ArrayList<>());
             l.add(meu);
         }
 
         // build into the final shape
-        List<WorkChunk> works = new ArrayList<WorkChunk>();
+        List<WorkChunk> works = new ArrayList<>();
         for (List<SubTask> group : m.values()) {
             works.add(new WorkChunk(group,works.size()));
         }
diff --git a/core/src/main/java/hudson/model/queue/QueueSorter.java b/core/src/main/java/hudson/model/queue/QueueSorter.java
index 251f8d72b8..97d314f22f 100644
--- a/core/src/main/java/hudson/model/queue/QueueSorter.java
+++ b/core/src/main/java/hudson/model/queue/QueueSorter.java
@@ -53,7 +53,7 @@ public abstract class QueueSorter implements ExtensionPoint {
      * @since 1.618
      */
     public void sortBlockedItems(List<Queue.BlockedItem> blockedItems) {
-        Collections.sort(blockedItems, DEFAULT_BLOCKED_ITEM_COMPARATOR);
+        blockedItems.sort(DEFAULT_BLOCKED_ITEM_COMPARATOR);
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/queue/Timeline.java b/core/src/main/java/hudson/model/queue/Timeline.java
index 91c1b9aeb1..43da59fc68 100644
--- a/core/src/main/java/hudson/model/queue/Timeline.java
+++ b/core/src/main/java/hudson/model/queue/Timeline.java
@@ -38,7 +38,7 @@ import static java.lang.Math.*;
 */
 final class Timeline {
     // int[] is always length=1
-    private final TreeMap<Long, int[]> data = new TreeMap<Long, int[]>();
+    private final TreeMap<Long, int[]> data = new TreeMap<>();
 
     /**
      * Obtains q(t) for the given t.
diff --git a/core/src/main/java/hudson/model/queue/WorkUnitContext.java b/core/src/main/java/hudson/model/queue/WorkUnitContext.java
index 8afce5cbfd..82a9ef343d 100644
--- a/core/src/main/java/hudson/model/queue/WorkUnitContext.java
+++ b/core/src/main/java/hudson/model/queue/WorkUnitContext.java
@@ -56,7 +56,7 @@ public final class WorkUnitContext {
 
     private final Latch startLatch, endLatch;
 
-    private List<WorkUnit> workUnits = new ArrayList<WorkUnit>();
+    private List<WorkUnit> workUnits = new ArrayList<>();
 
     /**
      * If the execution is aborted, set to non-null that indicates where it was aborted.
@@ -68,7 +68,7 @@ public final class WorkUnitContext {
         this.task = item.task;
         this.future = (FutureImpl)item.getFuture();
         // JENKINS-51584 do not use item.getAllActions() here.
-        this.actions = new ArrayList<Action>(item.getActions());
+        this.actions = new ArrayList<>(item.getActions());
         // +1 for the main task
         int workUnitSize = task.getSubTasks().size();
         startLatch = new Latch(workUnitSize) {
diff --git a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java
index e35ae80a7e..ed68e6198e 100644
--- a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java
+++ b/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java
@@ -80,7 +80,7 @@ public abstract class AbstractAsyncNodeMonitorDescriptor<T> extends AbstractNode
      * Perform monitoring with detailed reporting.
      */
     protected final @Nonnull Result<T> monitorDetailed() throws InterruptedException {
-        Map<Computer,Future<T>> futures = new HashMap<Computer,Future<T>>();
+        Map<Computer,Future<T>> futures = new HashMap<>();
         Set<Computer> skipped = new HashSet<>();
 
         for (Computer c : Jenkins.getInstance().getComputers()) {
@@ -92,9 +92,7 @@ public abstract class AbstractAsyncNodeMonitorDescriptor<T> extends AbstractNode
                     if (cc!=null)
                         futures.put(c,ch.callAsync(cc));
                 }
-            } catch (RuntimeException e) {
-                LOGGER.log(WARNING, "Failed to monitor "+c.getDisplayName()+" for "+getDisplayName(), e);
-            } catch (IOException e) {
+            } catch (RuntimeException | IOException e) {
                 LOGGER.log(WARNING, "Failed to monitor "+c.getDisplayName()+" for "+getDisplayName(), e);
             }
         }
@@ -102,7 +100,7 @@ public abstract class AbstractAsyncNodeMonitorDescriptor<T> extends AbstractNode
         final long now = System.currentTimeMillis();
         final long end = now + getMonitoringTimeOut();
 
-        final Map<Computer,T> data = new HashMap<Computer,T>();
+        final Map<Computer,T> data = new HashMap<>();
 
         for (Entry<Computer, Future<T>> e : futures.entrySet()) {
             Computer c = e.getKey();
@@ -112,11 +110,7 @@ public abstract class AbstractAsyncNodeMonitorDescriptor<T> extends AbstractNode
             if (f!=null) {
                 try {
                     data.put(c,f.get(Math.max(0,end-System.currentTimeMillis()), MILLISECONDS));
-                } catch (RuntimeException x) {
-                    LOGGER.log(WARNING, "Failed to monitor " + c.getDisplayName() + " for " + getDisplayName(), x);
-                } catch (ExecutionException x) {
-                    LOGGER.log(WARNING, "Failed to monitor " + c.getDisplayName() + " for " + getDisplayName(), x);
-                } catch (TimeoutException x) {
+                } catch (RuntimeException | TimeoutException | ExecutionException x) {
                     LOGGER.log(WARNING, "Failed to monitor " + c.getDisplayName() + " for " + getDisplayName(), x);
                 }
             } else {
diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
index ee1cd6c41d..80ae4d36fb 100644
--- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
+++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
@@ -140,7 +140,7 @@ public abstract class AbstractNodeMonitorDescriptor<T> extends Descriptor<NodeMo
      *      For all the computers, report the monitored values.
      */
     protected Map<Computer,T> monitor() throws InterruptedException {
-        Map<Computer,T> data = new HashMap<Computer,T>();
+        Map<Computer,T> data = new HashMap<>();
         for( Computer c : Jenkins.getInstance().getComputers() ) {
             try {
                 Thread.currentThread().setName("Monitoring "+c.getDisplayName()+" for "+getDisplayName());
@@ -149,9 +149,7 @@ public abstract class AbstractNodeMonitorDescriptor<T> extends Descriptor<NodeMo
                     data.put(c,null);
                 else
                     data.put(c,monitor(c));
-            } catch (RuntimeException e) {
-                LOGGER.log(Level.WARNING, "Failed to monitor "+c.getDisplayName()+" for "+getDisplayName(), e);
-            } catch (IOException e) {
+            } catch (RuntimeException | IOException e) {
                 LOGGER.log(Level.WARNING, "Failed to monitor "+c.getDisplayName()+" for "+getDisplayName(), e);
             } catch (InterruptedException e) {
                 throw (InterruptedException)new InterruptedException("Node monitoring "+c.getDisplayName()+" for "+getDisplayName()+" aborted.").initCause(e);
diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitor.java b/core/src/main/java/hudson/node_monitors/NodeMonitor.java
index 665b9cafe6..f5fea7f6eb 100644
--- a/core/src/main/java/hudson/node_monitors/NodeMonitor.java
+++ b/core/src/main/java/hudson/node_monitors/NodeMonitor.java
@@ -140,7 +140,7 @@ public abstract class NodeMonitor implements ExtensionPoint, Describable<NodeMon
      *      Use {@link #all()} for read access and {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<NodeMonitor> LIST = new DescriptorList<NodeMonitor>(NodeMonitor.class);
+    public static final DescriptorList<NodeMonitor> LIST = new DescriptorList<>(NodeMonitor.class);
 
     /**
      * Returns all the registered {@link NodeMonitor} descriptors.
diff --git a/core/src/main/java/hudson/scm/ChangeLogSet.java b/core/src/main/java/hudson/scm/ChangeLogSet.java
index 472e1eaa94..770b552749 100644
--- a/core/src/main/java/hudson/scm/ChangeLogSet.java
+++ b/core/src/main/java/hudson/scm/ChangeLogSet.java
@@ -107,7 +107,7 @@ public abstract class ChangeLogSet<T extends ChangeLogSet.Entry> implements Iter
     // method for the remote API.
     @Exported
     public final Object[] getItems() {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         for (T t : this)
             r.add(t);
         return r.toArray();
diff --git a/core/src/main/java/hudson/scm/RepositoryBrowsers.java b/core/src/main/java/hudson/scm/RepositoryBrowsers.java
index e32f0210ef..11b034f119 100644
--- a/core/src/main/java/hudson/scm/RepositoryBrowsers.java
+++ b/core/src/main/java/hudson/scm/RepositoryBrowsers.java
@@ -53,7 +53,7 @@ public class RepositoryBrowsers {
      * Only returns those {@link RepositoryBrowser} descriptors that extend from the given type.
      */
     public static List<Descriptor<RepositoryBrowser<?>>> filter(Class<? extends RepositoryBrowser> t) {
-        List<Descriptor<RepositoryBrowser<?>>> r = new ArrayList<Descriptor<RepositoryBrowser<?>>>();
+        List<Descriptor<RepositoryBrowser<?>>> r = new ArrayList<>();
         for (Descriptor<RepositoryBrowser<?>> d : RepositoryBrowser.all())
             if(d.isSubTypeOf(t))
                 r.add(d);
diff --git a/core/src/main/java/hudson/scm/SCMDescriptor.java b/core/src/main/java/hudson/scm/SCMDescriptor.java
index 9929e95d3a..1479c2463f 100644
--- a/core/src/main/java/hudson/scm/SCMDescriptor.java
+++ b/core/src/main/java/hudson/scm/SCMDescriptor.java
@@ -86,9 +86,7 @@ public abstract class SCMDescriptor<T extends SCM> extends Descriptor<SCM> {
                 Field f = SCMDescriptor.class.getDeclaredField("repositoryBrowser");
                 f.setAccessible(true);
                 f.set(this,rb);
-            } catch (NoSuchFieldException e) {
-                LOGGER.log(WARNING, "Failed to overwrite the repositoryBrowser field",e);
-            } catch (IllegalAccessException e) {
+            } catch (NoSuchFieldException | IllegalAccessException e) {
                 LOGGER.log(WARNING, "Failed to overwrite the repositoryBrowser field",e);
             }
         }
diff --git a/core/src/main/java/hudson/scm/SCMS.java b/core/src/main/java/hudson/scm/SCMS.java
index 5a821eb1fc..64a0c02cd8 100644
--- a/core/src/main/java/hudson/scm/SCMS.java
+++ b/core/src/main/java/hudson/scm/SCMS.java
@@ -46,7 +46,7 @@ public class SCMS {
      *      Use {@link SCM#all()} for read access and {@link Extension} for registration.
      */
     @Deprecated
-    public static final List<SCMDescriptor<?>> SCMS = (List)new DescriptorList<SCM>(SCM.class);
+    public static final List<SCMDescriptor<?>> SCMS = (List) new DescriptorList<>(SCM.class);
 
     /**
      * Parses {@link SCM} configuration from the submitted form.
diff --git a/core/src/main/java/hudson/search/ParsedQuickSilver.java b/core/src/main/java/hudson/search/ParsedQuickSilver.java
index 8f3a47f9b5..4af2614364 100644
--- a/core/src/main/java/hudson/search/ParsedQuickSilver.java
+++ b/core/src/main/java/hudson/search/ParsedQuickSilver.java
@@ -39,7 +39,7 @@ import java.beans.Introspector;
  * @author Kohsuke Kawaguchi
  */
 final class ParsedQuickSilver {
-    private static final Map<Class,ParsedQuickSilver> TABLE = new HashMap<Class,ParsedQuickSilver>();
+    private static final Map<Class,ParsedQuickSilver> TABLE = new HashMap<>();
 
     synchronized static ParsedQuickSilver get(Class<? extends SearchableModelObject> clazz) {
         ParsedQuickSilver pqs = TABLE.get(clazz);
@@ -48,7 +48,7 @@ final class ParsedQuickSilver {
         return pqs;
     }
 
-    private final List<Getter> getters = new ArrayList<Getter>();
+    private final List<Getter> getters = new ArrayList<>();
 
     private ParsedQuickSilver(Class<? extends SearchableModelObject> clazz) {
         QuickSilver qs;
diff --git a/core/src/main/java/hudson/search/Search.java b/core/src/main/java/hudson/search/Search.java
index ba743c7555..d799078f93 100644
--- a/core/src/main/java/hudson/search/Search.java
+++ b/core/src/main/java/hudson/search/Search.java
@@ -142,7 +142,7 @@ public class Search implements StaplerProxy {
      *      a certain threshold to avoid showing too many options. 
      */
     public SearchResult getSuggestions(StaplerRequest req, String query) {
-        Set<String> paths = new HashSet<String>();  // paths already added, to control duplicates
+        Set<String> paths = new HashSet<>();  // paths already added, to control duplicates
         SearchResultImpl r = new SearchResultImpl();
         int max = req.hasParameter("max") ? Integer.parseInt(req.getParameter("max")) : 100;
         SearchableModelObject smo = findClosestSearchableModelObject(req);
diff --git a/core/src/main/java/hudson/search/SearchIndexBuilder.java b/core/src/main/java/hudson/search/SearchIndexBuilder.java
index b6d2f11f3d..0c62e2ad5f 100644
--- a/core/src/main/java/hudson/search/SearchIndexBuilder.java
+++ b/core/src/main/java/hudson/search/SearchIndexBuilder.java
@@ -38,9 +38,9 @@ import java.util.List;
  * @see AbstractModelObject#makeSearchIndex()
  */
 public final class SearchIndexBuilder {
-    private final List<SearchItem> items = new ArrayList<SearchItem>();
+    private final List<SearchItem> items = new ArrayList<>();
 
-    private final List<SearchIndex> indices = new ArrayList<SearchIndex>();
+    private final List<SearchIndex> indices = new ArrayList<>();
 
     /**
      * Adds all {@link QuickSilver}-annotated properties to the search index.
diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java
index c8ee16e681..e032a64ae2 100644
--- a/core/src/main/java/hudson/security/AuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java
@@ -194,7 +194,7 @@ public abstract class AuthorizationStrategy extends AbstractDescribableImpl<Auth
      *      Use {@link #all()} for read access, and {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<AuthorizationStrategy> LIST = new DescriptorList<AuthorizationStrategy>(AuthorizationStrategy.class);
+    public static final DescriptorList<AuthorizationStrategy> LIST = new DescriptorList<>(AuthorizationStrategy.class);
     
     /**
      * {@link AuthorizationStrategy} that implements the semantics
diff --git a/core/src/main/java/hudson/security/ChainedServletFilter.java b/core/src/main/java/hudson/security/ChainedServletFilter.java
index 40830fc2e6..a9a0e12907 100644
--- a/core/src/main/java/hudson/security/ChainedServletFilter.java
+++ b/core/src/main/java/hudson/security/ChainedServletFilter.java
@@ -58,7 +58,7 @@ public class ChainedServletFilter implements Filter {
     }
 
     public void setFilters(Collection<? extends Filter> filters) {
-        this.filters = filters.toArray(new Filter[filters.size()]);
+        this.filters = filters.toArray(new Filter[0]);
     }
 
     public void init(FilterConfig filterConfig) throws ServletException {
diff --git a/core/src/main/java/hudson/security/ContainerAuthentication.java b/core/src/main/java/hudson/security/ContainerAuthentication.java
index f990ad333c..28a8c34029 100644
--- a/core/src/main/java/hudson/security/ContainerAuthentication.java
+++ b/core/src/main/java/hudson/security/ContainerAuthentication.java
@@ -60,13 +60,13 @@ public final class ContainerAuthentication implements Authentication {
 
         // Servlet API doesn't provide a way to list up all roles the current user
         // has, so we need to ask AuthorizationStrategy what roles it is going to check against.
-        List<GrantedAuthority> l = new ArrayList<GrantedAuthority>();
+        List<GrantedAuthority> l = new ArrayList<>();
         for( String g : Jenkins.getInstance().getAuthorizationStrategy().getGroups()) {
             if(request.isUserInRole(g))
                 l.add(new GrantedAuthorityImpl(g));
         }
         l.add(SecurityRealm.AUTHENTICATED_AUTHORITY);
-        authorities = l.toArray(new GrantedAuthority[l.size()]);
+        authorities = l.toArray(new GrantedAuthority[0]);
     }
 
     public GrantedAuthority[] getAuthorities() {
diff --git a/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java b/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java
index 8084522b8e..334fa1dcd1 100644
--- a/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java
+++ b/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java
@@ -45,7 +45,7 @@ public class FederatedLoginServiceUserProperty extends UserProperty {
     protected final Set<String> identifiers;
 
     protected FederatedLoginServiceUserProperty(Collection<String> identifiers) {
-        this.identifiers = new HashSet<String>(identifiers);
+        this.identifiers = new HashSet<>(identifiers);
     }
 
     public boolean has(String identifier) {
diff --git a/core/src/main/java/hudson/security/Permission.java b/core/src/main/java/hudson/security/Permission.java
index 31f6a944e2..040aa94534 100644
--- a/core/src/main/java/hudson/security/Permission.java
+++ b/core/src/main/java/hudson/security/Permission.java
@@ -287,7 +287,7 @@ public final class Permission {
     /**
      * All permissions in the system but in a single list.
      */
-    private static final List<Permission> ALL = new CopyOnWriteArrayList<Permission>();
+    private static final List<Permission> ALL = new CopyOnWriteArrayList<>();
 
     private static final List<Permission> ALL_VIEW = Collections.unmodifiableList(ALL);
 
diff --git a/core/src/main/java/hudson/security/PermissionGroup.java b/core/src/main/java/hudson/security/PermissionGroup.java
index ef39787662..891a3a5e0e 100644
--- a/core/src/main/java/hudson/security/PermissionGroup.java
+++ b/core/src/main/java/hudson/security/PermissionGroup.java
@@ -41,7 +41,7 @@ import org.jvnet.localizer.Localizable;
  * Sortable by the owner class name.
  */
 public final class PermissionGroup implements Iterable<Permission>, Comparable<PermissionGroup> {
-    private final SortedSet<Permission> permissions = new TreeSet<Permission>(Permission.ID_COMPARATOR);
+    private final SortedSet<Permission> permissions = new TreeSet<>(Permission.ID_COMPARATOR);
 
     @Nonnull
     public final Class owner;
@@ -104,7 +104,7 @@ public final class PermissionGroup implements Iterable<Permission>, Comparable<P
      * Lists up all the permissions in this group.
      */
     public synchronized List<Permission> getPermissions() {
-        return new ArrayList<Permission>(permissions);
+        return new ArrayList<>(permissions);
     }
 
     public synchronized boolean hasPermissionContainedBy(PermissionScope scope) {
@@ -169,7 +169,7 @@ public final class PermissionGroup implements Iterable<Permission>, Comparable<P
      *      always non-null. Read-only.
      */
     public static synchronized List<PermissionGroup> getAll() {
-        return new ArrayList<PermissionGroup>(PERMISSIONS);
+        return new ArrayList<>(PERMISSIONS);
     }
 
     /**
@@ -189,5 +189,5 @@ public final class PermissionGroup implements Iterable<Permission>, Comparable<P
     /**
      * All the permissions in the system, keyed by their owners.
      */
-    private static final SortedSet<PermissionGroup> PERMISSIONS = new TreeSet<PermissionGroup>();
+    private static final SortedSet<PermissionGroup> PERMISSIONS = new TreeSet<>();
 }
diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java
index 867183f4b5..c7deaf7602 100644
--- a/core/src/main/java/hudson/security/SecurityRealm.java
+++ b/core/src/main/java/hudson/security/SecurityRealm.java
@@ -641,7 +641,7 @@ public abstract class SecurityRealm extends AbstractDescribableImpl<SecurityReal
      *      Use {@link #all()} for read access, and use {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<SecurityRealm> LIST = new DescriptorList<SecurityRealm>(SecurityRealm.class);
+    public static final DescriptorList<SecurityRealm> LIST = new DescriptorList<>(SecurityRealm.class);
 
     /**
      * Returns all the registered {@link SecurityRealm} descriptors.
diff --git a/core/src/main/java/hudson/security/SparseACL.java b/core/src/main/java/hudson/security/SparseACL.java
index 5a70a2a50e..d9c67a05ec 100644
--- a/core/src/main/java/hudson/security/SparseACL.java
+++ b/core/src/main/java/hudson/security/SparseACL.java
@@ -50,7 +50,7 @@ public class SparseACL extends SidACL {
         }
     }
 
-    private final List<Entry> entries = new ArrayList<Entry>();
+    private final List<Entry> entries = new ArrayList<>();
     /**
      * Parent to delegate to. Can be null.
      */
diff --git a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
index c412919d59..71ba57c692 100644
--- a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
+++ b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
@@ -311,9 +311,7 @@ public class TokenBasedRememberMeServices2 extends TokenBasedRememberMeServices
         if (SET_HTTP_ONLY!=null) {
             try {
                 SET_HTTP_ONLY.invoke(cookie,true);
-            } catch (IllegalAccessException e) {
-                // ignore
-            } catch (InvocationTargetException e) {
+            } catch (IllegalAccessException | InvocationTargetException e) {
                 // ignore
             }
         }
diff --git a/core/src/main/java/hudson/security/WhoAmI.java b/core/src/main/java/hudson/security/WhoAmI.java
index 66e837acd3..5d944acb88 100644
--- a/core/src/main/java/hudson/security/WhoAmI.java
+++ b/core/src/main/java/hudson/security/WhoAmI.java
@@ -65,11 +65,11 @@ public class WhoAmI implements UnprotectedRootAction {
         if (auth().getAuthorities() == null) {
             return MemoryReductionUtil.EMPTY_STRING_ARRAY;
         }
-        List <String> authorities = new ArrayList<String>();
+        List <String> authorities = new ArrayList<>();
         for (GrantedAuthority a : auth().getAuthorities()) {
             authorities.add(a.getAuthority());
         }
-        return (String[]) authorities.toArray(new String[authorities.size()]);
+        return (String[]) authorities.toArray(new String[0]);
     }
 
     @Override
diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
index b0f54d9050..18daf64e2f 100644
--- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java
+++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
@@ -279,7 +279,7 @@ public class ArtifactArchiver extends Recorder implements SimpleBuildStep {
         }
 
         @Override public Map<String,String> invoke(File basedir, VirtualChannel channel) throws IOException, InterruptedException {
-            Map<String,String> r = new HashMap<String,String>();
+            Map<String,String> r = new HashMap<>();
 
             FileSet fileSet = Util.createFileSet(basedir, includes, excludes);
             fileSet.setDefaultexcludes(defaultExcludes);
diff --git a/core/src/main/java/hudson/tasks/BuildStep.java b/core/src/main/java/hudson/tasks/BuildStep.java
index ad81455335..600b419a1a 100644
--- a/core/src/main/java/hudson/tasks/BuildStep.java
+++ b/core/src/main/java/hudson/tasks/BuildStep.java
@@ -232,7 +232,7 @@ public interface BuildStep {
      *      {@link Extension} for registration.
      */
     @Deprecated
-    List<Descriptor<Builder>> BUILDERS = new DescriptorList<Builder>(Builder.class);
+    List<Descriptor<Builder>> BUILDERS = new DescriptorList<>(Builder.class);
 
     /**
      * List of all installed publishers.
@@ -259,14 +259,14 @@ public interface BuildStep {
          * {@link Descriptor}s are actually stored in here.
          * Since {@link PublisherList} lives longer than {@link jenkins.model.Jenkins} we cannot directly use {@link ExtensionList}.
          */
-        private final DescriptorList<Publisher> core = new DescriptorList<Publisher>(Publisher.class);
+        private final DescriptorList<Publisher> core = new DescriptorList<>(Publisher.class);
 
         /**
          * For descriptors that are manually registered, remember what kind it was since
          * older plugins don't extend from neither {@link Recorder} nor {@link Notifier}.
          */
         /*package*/ static final WeakHashMap<Descriptor<Publisher>,Class<? extends Publisher>/*either Recorder.class or Notifier.class*/>
-                KIND = new WeakHashMap<Descriptor<Publisher>, Class<? extends Publisher>>();
+                KIND = new WeakHashMap<>();
 
         private PublisherList() {
         }
diff --git a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java
index dbabe42266..4f70a550ce 100644
--- a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java
+++ b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java
@@ -74,7 +74,7 @@ public abstract class BuildStepDescriptor<T extends BuildStep & Describable<T>>
         // descriptor of the project
         Descriptor pd = Jenkins.getInstance().getDescriptor((Class) type);
 
-        List<Descriptor<T>> r = new ArrayList<Descriptor<T>>(base.size());
+        List<Descriptor<T>> r = new ArrayList<>(base.size());
         for (Descriptor<T> d : base) {
             if (pd instanceof AbstractProjectDescriptor && !((AbstractProjectDescriptor)pd).isApplicable(d))
                 continue;
diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java
index 78f8ef13f8..9ee8c349e4 100644
--- a/core/src/main/java/hudson/tasks/BuildTrigger.java
+++ b/core/src/main/java/hudson/tasks/BuildTrigger.java
@@ -256,10 +256,10 @@ public class BuildTrigger extends Recorder implements DependencyDeclarer {
         // Check all downstream Project of the project, not just those defined by BuildTrigger
         // TODO this may not yet be up to date if rebuildDependencyGraphAsync has been used; need a method to wait for the last call made before now to finish
         final DependencyGraph graph = Jenkins.getInstance().getDependencyGraph();
-        List<Dependency> downstreamProjects = new ArrayList<Dependency>(
+        List<Dependency> downstreamProjects = new ArrayList<>(
                 graph.getDownstreamDependencies(build.getProject()));
         // Sort topologically
-        Collections.sort(downstreamProjects, new Comparator<Dependency>() {
+        downstreamProjects.sort(new Comparator<Dependency>() {
             public int compare(Dependency lhs, Dependency rhs) {
                 // Swapping lhs/rhs to get reverse sort:
                 return graph.compare(rhs.getDownstreamProject(), lhs.getDownstreamProject());
@@ -267,7 +267,7 @@ public class BuildTrigger extends Recorder implements DependencyDeclarer {
         });
 
         for (Dependency dep : downstreamProjects) {
-            List<Action> buildActions = new ArrayList<Action>();
+            List<Action> buildActions = new ArrayList<>();
             if (dep.shouldTriggerBuild(build, listener, buildActions)) {
                 AbstractProject p = dep.getDownstreamProject();
                 // Allow shouldTriggerBuild to return false first, in case it is skipping because of a lack of Item.READ/DISCOVER permission:
@@ -275,7 +275,7 @@ public class BuildTrigger extends Recorder implements DependencyDeclarer {
                     logger.println(Messages.BuildTrigger_Disabled(ModelHyperlinkNote.encodeTo(p)));
                     continue;
                 }
-                boolean scheduled = p.scheduleBuild(p.getQuietPeriod(), new UpstreamCause((Run)build), buildActions.toArray(new Action[buildActions.size()]));
+                boolean scheduled = p.scheduleBuild(p.getQuietPeriod(), new UpstreamCause((Run)build), buildActions.toArray(new Action[0]));
                 if (Jenkins.getInstance().getItemByFullName(p.getFullName()) == p) {
                     String name = ModelHyperlinkNote.encodeTo(p);
                     if (scheduled) {
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index 959bbaebc0..b71cf200e2 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -119,7 +119,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
         try {
             listener.getLogger().println(Messages.Fingerprinter_Recording());
 
-            Map<String,String> record = new HashMap<String,String>();
+            Map<String,String> record = new HashMap<>();
             
             EnvVars environment = build.getEnvironment(listener);
             if(targets.length()!=0) {
@@ -152,7 +152,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
     public void buildDependencyGraph(AbstractProject owner, DependencyGraph graph) {
         if (enableFingerprintsInDependencyGraph) {
             RunList builds = owner.getBuilds();
-            Set<String> seenUpstreamProjects = new HashSet<String>();
+            Set<String> seenUpstreamProjects = new HashSet<>();
 
             for (Object build1 : builds) {
                 Run build = (Run) build1;
@@ -222,7 +222,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
 
         @Override
         public List<Record> invoke(File baseDir, VirtualChannel channel) throws IOException {
-            List<Record> results = new ArrayList<Record>();
+            List<Record> results = new ArrayList<>();
 
             FileSet src = Util.createFileSet(baseDir,targets);
 
@@ -316,7 +316,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
         }
 
         public void add(Map<String,String> moreRecords) {
-            Map<String,String> r = new HashMap<String, String>(record);
+            Map<String,String> r = new HashMap<>(record);
             r.putAll(moreRecords);
             record = compact(r);
             ref = null;
@@ -361,7 +361,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
 
         /** Share data structure with other builds, mainly those of the same job. */
         private PackedMap<String,String> compact(Map<String,String> record) {
-            Map<String,String> b = new HashMap<String,String>();
+            Map<String,String> b = new HashMap<>();
             for (Entry<String,String> e : record.entrySet()) {
                 b.put(e.getKey().intern(), e.getValue().intern());
             }
@@ -380,7 +380,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
 
             Jenkins h = Jenkins.getInstance();
 
-            Map<String,Fingerprint> m = new TreeMap<String,Fingerprint>();
+            Map<String,Fingerprint> m = new TreeMap<>();
             for (Entry<String, String> r : record.entrySet()) {
                 try {
                     Fingerprint fp = h._getFingerprint(r.getValue());
@@ -392,7 +392,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
             }
 
             m = ImmutableMap.copyOf(m);
-            ref = new WeakReference<Map<String,Fingerprint>>(m);
+            ref = new WeakReference<>(m);
             return m;
         }
 
@@ -411,7 +411,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
          * @since 1.430
          */
         public Map<AbstractProject,Integer> getDependencies(boolean includeMissing) {
-            Map<AbstractProject,Integer> r = new HashMap<AbstractProject,Integer>();
+            Map<AbstractProject,Integer> r = new HashMap<>();
 
             for (Fingerprint fp : getFingerprints().values()) {
                 BuildPtr bp = fp.getOriginal();
diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index 5bccbfe785..5f5410b59e 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -349,7 +349,7 @@ public class Maven extends Builder {
             }
 
             // Add properties from builder configuration, AFTER the injected build variables.
-            final VariableResolver<String> resolver = new Union<String>(new ByMap<String>(env), vr);
+            final VariableResolver<String> resolver = new Union<>(new ByMap<>(env), vr);
             args.addKeyValuePairsFromPropertyString("-D", this.properties, resolver, sensitiveVars);
 
             if (usesPrivateRepository())
@@ -460,7 +460,7 @@ public class Maven extends Builder {
         }
 
 		public void setInstallations(MavenInstallation... installations) {
-			List<MavenInstallation> tmpList = new ArrayList<Maven.MavenInstallation>();
+			List<MavenInstallation> tmpList = new ArrayList<>();
 			// remote empty Maven installation : 
 			if(installations != null) {
 				Collections.addAll(tmpList, installations);
@@ -470,7 +470,7 @@ public class Maven extends Builder {
 					}
 				}
 			}
-            this.installations = tmpList.toArray(new MavenInstallation[tmpList.size()]);
+            this.installations = tmpList.toArray(new MavenInstallation[0]);
             save();
         }
 
@@ -580,18 +580,12 @@ public class Maven extends Builder {
                 if (jars != null) { // be defensive
                     for (File jar : jars) {
                         if (jar.getName().startsWith("maven-")) {
-                            JarFile jf = null;
-                            try {
-                                jf = new JarFile(jar);
+                            try (JarFile jf = new JarFile(jar)) {
                                 Manifest manifest = jf.getManifest();
                                 String version = manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION);
                                 if (version != null) {
                                     return version;
                                 }
-                            } finally {
-                                if (jf != null) {
-                                    jf.close();
-                                }
                             }
                         }
                     }
diff --git a/core/src/main/java/hudson/tasks/Publisher.java b/core/src/main/java/hudson/tasks/Publisher.java
index c1c8a601e2..0db4ab0518 100644
--- a/core/src/main/java/hudson/tasks/Publisher.java
+++ b/core/src/main/java/hudson/tasks/Publisher.java
@@ -135,8 +135,8 @@ public abstract class Publisher extends BuildStepCompatibilityLayer implements D
 
         @Override
         protected List<ExtensionComponent<Descriptor<Publisher>>> sort(List<ExtensionComponent<Descriptor<Publisher>>> r) {
-            List<ExtensionComponent<Descriptor<Publisher>>> copy = new ArrayList<ExtensionComponent<Descriptor<Publisher>>>(r);
-            Collections.sort(copy,this);
+            List<ExtensionComponent<Descriptor<Publisher>>> copy = new ArrayList<>(r);
+            copy.sort(this);
             return copy;
         }
 
diff --git a/core/src/main/java/hudson/tasks/Shell.java b/core/src/main/java/hudson/tasks/Shell.java
index 3455076d5b..cfafd179b2 100644
--- a/core/src/main/java/hudson/tasks/Shell.java
+++ b/core/src/main/java/hudson/tasks/Shell.java
@@ -88,11 +88,11 @@ public class Shell extends CommandInterpreter {
             // interpreter override
             int end = command.indexOf('\n');
             if(end<0)   end=command.length();
-            List<String> args = new ArrayList<String>();
+            List<String> args = new ArrayList<>();
             args.addAll(Arrays.asList(Util.tokenize(command.substring(0,end).trim())));
             args.add(script.getRemote());
             args.set(0,args.get(0).substring(2));   // trim off "#!"
-            return args.toArray(new String[args.size()]);
+            return args.toArray(new String[0]);
         } else
             return new String[] { getDescriptor().getShellOrDefault(script.getChannel()), "-xe", script.getRemote()};
     }
@@ -165,9 +165,7 @@ public class Shell extends CommandInterpreter {
             String interpreter = null;
             try {
                 interpreter = channel.call(new Shellinterpreter());
-            } catch (IOException e) {
-                LOGGER.log(Level.WARNING, null, e);
-            } catch (InterruptedException e) {
+            } catch (IOException | InterruptedException e) {
                 LOGGER.log(Level.WARNING, null, e);
             }
             if (interpreter == null) {
diff --git a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
index dab3fda669..ab67566d7f 100644
--- a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
+++ b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
@@ -178,7 +178,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller {
         private JSONObject reduce(List<JSONObject> jsonList) {
             List<ToolInstallerEntry> reducedToolEntries = new LinkedList<>();
 
-            HashSet<String> processedIds = new HashSet<String>();
+            HashSet<String> processedIds = new HashSet<>();
             for (JSONObject jsonToolList : jsonList) {
                 ToolInstallerList toolInstallerList = (ToolInstallerList) JSONObject.toBean(jsonToolList, ToolInstallerList.class);
                 for(ToolInstallerEntry entry : toolInstallerList.list) {
diff --git a/core/src/main/java/hudson/tools/InstallSourceProperty.java b/core/src/main/java/hudson/tools/InstallSourceProperty.java
index 7ef474d015..ef358df253 100644
--- a/core/src/main/java/hudson/tools/InstallSourceProperty.java
+++ b/core/src/main/java/hudson/tools/InstallSourceProperty.java
@@ -42,7 +42,7 @@ import java.io.IOException;
 public class InstallSourceProperty extends ToolProperty<ToolInstallation> {
     // TODO: get the proper Saveable
     public final DescribableList<ToolInstaller, Descriptor<ToolInstaller>> installers =
-            new DescribableList<ToolInstaller, Descriptor<ToolInstaller>>(Saveable.NOOP);
+            new DescribableList<>(Saveable.NOOP);
 
     @DataBoundConstructor
     public InstallSourceProperty(List<? extends ToolInstaller> installers) throws IOException {
diff --git a/core/src/main/java/hudson/tools/InstallerTranslator.java b/core/src/main/java/hudson/tools/InstallerTranslator.java
index fd45212bd7..fe506789df 100644
--- a/core/src/main/java/hudson/tools/InstallerTranslator.java
+++ b/core/src/main/java/hudson/tools/InstallerTranslator.java
@@ -40,7 +40,7 @@ import java.util.concurrent.Semaphore;
 @Extension
 public class InstallerTranslator extends ToolLocationTranslator {
 
-    private static final Map<Node,Map<ToolInstallation,Semaphore>> mutexByNode = new WeakHashMap<Node,Map<ToolInstallation,Semaphore>>();
+    private static final Map<Node,Map<ToolInstallation,Semaphore>> mutexByNode = new WeakHashMap<>();
 
     public String getToolHome(Node node, ToolInstallation tool, TaskListener log) throws IOException, InterruptedException {
         if (node.getRootPath() == null) {
@@ -52,16 +52,13 @@ public class InstallerTranslator extends ToolLocationTranslator {
             return null;
         }
 
-        ArrayList<String> inapplicableInstallersMessages = new ArrayList<String>();
+        ArrayList<String> inapplicableInstallersMessages = new ArrayList<>();
 
         for (ToolInstaller installer : isp.installers) {
             if (installer.appliesTo(node)) {
                 Semaphore semaphore;
                 synchronized (mutexByNode) {
-                    Map<ToolInstallation, Semaphore> mutexByTool = mutexByNode.get(node);
-                    if (mutexByTool == null) {
-                        mutexByNode.put(node, mutexByTool = new WeakHashMap<ToolInstallation, Semaphore>());
-                    }
+                    Map<ToolInstallation, Semaphore> mutexByTool = mutexByNode.computeIfAbsent(node, k -> new WeakHashMap<>());
                     semaphore = mutexByTool.get(tool);
                     if (semaphore == null) {
                         mutexByTool.put(tool, semaphore = new Semaphore(1));
diff --git a/core/src/main/java/hudson/tools/PropertyDescriptor.java b/core/src/main/java/hudson/tools/PropertyDescriptor.java
index fe619a85d6..0ef3163392 100644
--- a/core/src/main/java/hudson/tools/PropertyDescriptor.java
+++ b/core/src/main/java/hudson/tools/PropertyDescriptor.java
@@ -50,7 +50,7 @@ public abstract class PropertyDescriptor<P extends Describable<P>,T> extends Des
     }
 
     public static <D extends PropertyDescriptor<?,T>,T> List<D> for_(List<D> all, Class<? extends T> target) {
-        List<D> result = new ArrayList<D>();
+        List<D> result = new ArrayList<>();
         for (D d : all)
             if (d.isApplicable(target))
                 result.add(d);
diff --git a/core/src/main/java/hudson/tools/ToolDescriptor.java b/core/src/main/java/hudson/tools/ToolDescriptor.java
index c39149ceeb..76a07f39ba 100644
--- a/core/src/main/java/hudson/tools/ToolDescriptor.java
+++ b/core/src/main/java/hudson/tools/ToolDescriptor.java
@@ -136,7 +136,7 @@ public abstract class ToolDescriptor<T extends ToolInstallation> extends Descrip
      */
     public DescribableList<ToolProperty<?>,ToolPropertyDescriptor> getDefaultProperties() throws IOException {
         DescribableList<ToolProperty<?>,ToolPropertyDescriptor> r
-                = new DescribableList<ToolProperty<?>, ToolPropertyDescriptor>(NOOP);
+                = new DescribableList<>(NOOP);
 
         List<? extends ToolInstaller> installers = getDefaultInstallers();
         if(!installers.isEmpty())
diff --git a/core/src/main/java/hudson/tools/ToolInstallation.java b/core/src/main/java/hudson/tools/ToolInstallation.java
index e6f104dffc..59a5317a12 100644
--- a/core/src/main/java/hudson/tools/ToolInstallation.java
+++ b/core/src/main/java/hudson/tools/ToolInstallation.java
@@ -84,7 +84,7 @@ public abstract class ToolInstallation extends AbstractDescribableImpl<ToolInsta
      */
     @XStreamSerializable
     private transient /*almost final*/ DescribableList<ToolProperty<?>,ToolPropertyDescriptor> properties
-            = new DescribableList<ToolProperty<?>,ToolPropertyDescriptor>(Saveable.NOOP);
+            = new DescribableList<>(Saveable.NOOP);
 
     /**
      * @deprecated
@@ -211,7 +211,7 @@ public abstract class ToolInstallation extends AbstractDescribableImpl<ToolInsta
      */
     protected Object readResolve() {
         if(properties==null)
-            properties = new DescribableList<ToolProperty<?>,ToolPropertyDescriptor>(Saveable.NOOP);
+            properties = new DescribableList<>(Saveable.NOOP);
         for (ToolProperty<?> p : properties)
             _setTool(p, this);
         return this;
diff --git a/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java b/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java
index 09d60b622a..e0e543d578 100644
--- a/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java
+++ b/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java
@@ -55,7 +55,7 @@ public abstract class ToolInstallerDescriptor<T extends ToolInstaller> extends D
      * Filters {@link #all()} by eliminating things that are not applicable to the given type.
      */
     public static List<ToolInstallerDescriptor<?>> for_(Class<? extends ToolInstallation> type) {
-        List<ToolInstallerDescriptor<?>> r = new ArrayList<ToolInstallerDescriptor<?>>();
+        List<ToolInstallerDescriptor<?>> r = new ArrayList<>();
         for (ToolInstallerDescriptor<?> d : all())
             if(d.isApplicable(type))
                 r.add(d);
diff --git a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
index d5a3560839..1c3c1e53da 100644
--- a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
+++ b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
@@ -57,7 +57,7 @@ public class ToolLocationNodeProperty extends NodeProperty<Node> {
     @DataBoundConstructor
     public ToolLocationNodeProperty(List<ToolLocation> locations) {
         if (locations == null) {
-            locations = new ArrayList<ToolLocation>();
+            locations = new ArrayList<>();
         }
         this.locations = locations;
     }
diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java
index 59f149b034..4962892658 100644
--- a/core/src/main/java/hudson/util/ArgumentListBuilder.java
+++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java
@@ -46,7 +46,7 @@ import javax.annotation.Nonnull;
  * @author Kohsuke Kawaguchi
  */
 public class ArgumentListBuilder implements Serializable, Cloneable {
-    private final List<String> args = new ArrayList<String>();
+    private final List<String> args = new ArrayList<>();
     /**
      * Bit mask indicating arguments that shouldn't be echoed-back (e.g., password)
      */
@@ -260,7 +260,7 @@ public class ArgumentListBuilder implements Serializable, Cloneable {
     }
 
     public String[] toCommandArray() {
-        return args.toArray(new String[args.size()]);
+        return args.toArray(new String[0]);
     }
     
     @Override
diff --git a/core/src/main/java/hudson/util/BootFailure.java b/core/src/main/java/hudson/util/BootFailure.java
index 8d1055b1c2..5649d79d6a 100644
--- a/core/src/main/java/hudson/util/BootFailure.java
+++ b/core/src/main/java/hudson/util/BootFailure.java
@@ -55,7 +55,7 @@ public abstract class BootFailure extends ErrorObject {
      * Parses the boot attempt file carefully so as not to cause the entire hook script to fail to execute.
      */
     protected List<Date> loadAttempts(File home) {
-        List<Date> dates = new ArrayList<Date>();
+        List<Date> dates = new ArrayList<>();
         if (home!=null) {
             File f = getBootFailureFile(home);
             try {
diff --git a/core/src/main/java/hudson/util/CharSpool.java b/core/src/main/java/hudson/util/CharSpool.java
index 6ab9c531d6..887c6aba5f 100644
--- a/core/src/main/java/hudson/util/CharSpool.java
+++ b/core/src/main/java/hudson/util/CharSpool.java
@@ -57,7 +57,7 @@ public final class CharSpool extends Writer {
             return;
 
         if(buf==null)
-            buf = new LinkedList<char[]>();
+            buf = new LinkedList<>();
         buf.add(last);
         last = new char[1024];
         pos = 0;
diff --git a/core/src/main/java/hudson/util/ClasspathBuilder.java b/core/src/main/java/hudson/util/ClasspathBuilder.java
index e8bfafecc2..eb4b730647 100644
--- a/core/src/main/java/hudson/util/ClasspathBuilder.java
+++ b/core/src/main/java/hudson/util/ClasspathBuilder.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
  * @since 1.300
  */
 public class ClasspathBuilder implements Serializable {
-    private final List<String> args = new ArrayList<String>();
+    private final List<String> args = new ArrayList<>();
 
     /**
      * Adds a single directory or a jar file.
diff --git a/core/src/main/java/hudson/util/ClockDifference.java b/core/src/main/java/hudson/util/ClockDifference.java
index ee56d328d0..4c6f0ae8b6 100644
--- a/core/src/main/java/hudson/util/ClockDifference.java
+++ b/core/src/main/java/hudson/util/ClockDifference.java
@@ -95,9 +95,7 @@ public final class ClockDifference {
         try {
             if(d==null) return FAILED_HTML;
             return d.getClockDifference().toHtml();
-        } catch (IOException e) {
-            return FAILED_HTML;
-        } catch (InterruptedException e) {
+        } catch (IOException | InterruptedException e) {
             return FAILED_HTML;
         }
     }
diff --git a/core/src/main/java/hudson/util/CompressedFile.java b/core/src/main/java/hudson/util/CompressedFile.java
index 0fcc867ef5..e466069195 100644
--- a/core/src/main/java/hudson/util/CompressedFile.java
+++ b/core/src/main/java/hudson/util/CompressedFile.java
@@ -166,7 +166,7 @@ public class CompressedFile {
      * this should be a fairly low-priority task.
      */
     private static final ExecutorService compressionThread = new ThreadPoolExecutor(
-        0, 1, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(),
+        0, 1, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
         new ExceptionCatchingThreadFactory(new NamingThreadFactory(new DaemonThreadFactory(), "CompressedFile")));
 
     private static final Logger LOGGER = Logger.getLogger(CompressedFile.class.getName());
diff --git a/core/src/main/java/hudson/util/ConsistentHash.java b/core/src/main/java/hudson/util/ConsistentHash.java
index d26e3b4fc8..e1aa16990b 100644
--- a/core/src/main/java/hudson/util/ConsistentHash.java
+++ b/core/src/main/java/hudson/util/ConsistentHash.java
@@ -64,7 +64,7 @@ public class ConsistentHash<T> {
     /**
      * All the items in the hash, to their replication factors.
      */
-    private final Map<T,Point[]> items = new HashMap<T,Point[]>();
+    private final Map<T,Point[]> items = new HashMap<>();
     private int numPoints;
 
     private final int defaultReplication;
@@ -141,15 +141,16 @@ public class ConsistentHash<T> {
          */
         Iterator<T> list(int queryPoint) {
             final int start = index(queryPoint);
-            return new DuplicateFilterIterator<T>(new Iterator<T>() {
-                int pos=0;
+            return new DuplicateFilterIterator<>(new Iterator<T>() {
+                int pos = 0;
+
                 public boolean hasNext() {
-                    return pos<owner.length;
+                    return pos < owner.length;
                 }
 
                 public T next() {
-                    if(!hasNext())  throw new NoSuchElementException();
-                    return (T)owner[(start+(pos++))%owner.length];
+                    if (!hasNext()) throw new NoSuchElementException();
+                    return (T) owner[(start + (pos++)) % owner.length];
                 }
 
                 public void remove() {
diff --git a/core/src/main/java/hudson/util/CopyOnWriteList.java b/core/src/main/java/hudson/util/CopyOnWriteList.java
index 4e6af51dc6..0e9bd7862e 100644
--- a/core/src/main/java/hudson/util/CopyOnWriteList.java
+++ b/core/src/main/java/hudson/util/CopyOnWriteList.java
@@ -59,7 +59,7 @@ public class CopyOnWriteList<E> implements Iterable<E> {
     }
 
     private CopyOnWriteList(List<E> core, boolean noCopy) {
-        this.core = noCopy ? core : new ArrayList<E>(core);
+        this.core = noCopy ? core : new ArrayList<>(core);
     }
 
     public CopyOnWriteList() {
@@ -67,13 +67,13 @@ public class CopyOnWriteList<E> implements Iterable<E> {
     }
 
     public synchronized void add(E e) {
-        List<E> n = new ArrayList<E>(core);
+        List<E> n = new ArrayList<>(core);
         n.add(e);
         core = n;
     }
 
     public synchronized void addAll(Collection<? extends E> items) {
-        List<E> n = new ArrayList<E>(core);
+        List<E> n = new ArrayList<>(core);
         n.addAll(items);
         core = n;
     }
@@ -86,7 +86,7 @@ public class CopyOnWriteList<E> implements Iterable<E> {
      *      in which case there's no change.
      */
     public synchronized boolean remove(E e) {
-        List<E> n = new ArrayList<E>(core);
+        List<E> n = new ArrayList<>(core);
         boolean r = n.remove(e);
         core = n;
         return r;
@@ -135,7 +135,7 @@ public class CopyOnWriteList<E> implements Iterable<E> {
     }
 
     public void clear() {
-        this.core = new ArrayList<E>();
+        this.core = new ArrayList<>();
     }
 
     public <E> E[] toArray(E[] array) {
@@ -198,9 +198,7 @@ public class CopyOnWriteList<E> implements Iterable<E> {
                     items.add(item);
                 } catch (CriticalXStreamException e) {
                     throw e;
-                } catch (XStreamException e) {
-                    RobustReflectionConverter.addErrorInContext(context, e);
-                } catch (LinkageError e) {
+                } catch (XStreamException | LinkageError e) {
                     RobustReflectionConverter.addErrorInContext(context, e);
                 }
                 reader.moveUp();
diff --git a/core/src/main/java/hudson/util/CopyOnWriteMap.java b/core/src/main/java/hudson/util/CopyOnWriteMap.java
index 3624bf550e..f57e56889d 100644
--- a/core/src/main/java/hudson/util/CopyOnWriteMap.java
+++ b/core/src/main/java/hudson/util/CopyOnWriteMap.java
@@ -166,14 +166,14 @@ public abstract class CopyOnWriteMap<K,V> implements Map<K,V> {
      */
     public static final class Hash<K,V> extends CopyOnWriteMap<K,V> {
         public Hash(Map<K,V> core) {
-            super(new LinkedHashMap<K,V>(core));
+            super(new LinkedHashMap<>(core));
         }
 
         public Hash() {
         }
 
         protected Map<K,V> copy() {
-            return new LinkedHashMap<K,V>(core);
+            return new LinkedHashMap<>(core);
         }
 
         public static class ConverterImpl extends MapConverter {
@@ -210,7 +210,7 @@ public abstract class CopyOnWriteMap<K,V> implements Map<K,V> {
         }
 
         public Tree(Comparator<K> comparator) {
-            super(new TreeMap<K,V>(comparator));
+            super(new TreeMap<>(comparator));
             this.comparator = comparator;
         }
 
@@ -219,14 +219,14 @@ public abstract class CopyOnWriteMap<K,V> implements Map<K,V> {
         }
 
         protected Map<K,V> copy() {
-            TreeMap<K,V> m = new TreeMap<K,V>(comparator);
+            TreeMap<K,V> m = new TreeMap<>(comparator);
             m.putAll(core);
             return m;
         }
 
         @Override
         public synchronized void clear() {
-            update(new TreeMap<K,V>(comparator));
+            update(new TreeMap<>(comparator));
         }
 
         public static class ConverterImpl extends TreeMapConverter {
diff --git a/core/src/main/java/hudson/util/CyclicGraphDetector.java b/core/src/main/java/hudson/util/CyclicGraphDetector.java
index 8e4b6d33c0..07c4037799 100644
--- a/core/src/main/java/hudson/util/CyclicGraphDetector.java
+++ b/core/src/main/java/hudson/util/CyclicGraphDetector.java
@@ -14,11 +14,11 @@ import java.util.Stack;
  * @author Kohsuke Kawaguchi
  */
 public abstract class CyclicGraphDetector<N> {
-    private final Set<N> visited = new HashSet<N>();
-    private final Set<N> visiting = new HashSet<N>();
-    private final Stack<N> path = new Stack<N>();
+    private final Set<N> visited = new HashSet<>();
+    private final Set<N> visiting = new HashSet<>();
+    private final Stack<N> path = new Stack<>();
 
-    private final List<N> topologicalOrder = new ArrayList<N>();
+    private final List<N> topologicalOrder = new ArrayList<>();
 
     public void run(Iterable<? extends N> allNodes) throws CycleDetectedException {
         for (N n : allNodes){
diff --git a/core/src/main/java/hudson/util/DataSetBuilder.java b/core/src/main/java/hudson/util/DataSetBuilder.java
index def5765086..d13dbce112 100644
--- a/core/src/main/java/hudson/util/DataSetBuilder.java
+++ b/core/src/main/java/hudson/util/DataSetBuilder.java
@@ -44,9 +44,9 @@ import java.util.TreeSet;
  */
 public final class DataSetBuilder<Row extends Comparable,Column extends Comparable> {
 
-    private List<Number> values = new ArrayList<Number>();
-    private List<Row> rows = new ArrayList<Row>();
-    private List<Column> columns = new ArrayList<Column>();
+    private List<Number> values = new ArrayList<>();
+    private List<Row> rows = new ArrayList<>();
+    private List<Column> columns = new ArrayList<>();
 
     public void add( Number value, Row rowKey, Column columnKey ) {
         values.add(value);
@@ -57,11 +57,11 @@ public final class DataSetBuilder<Row extends Comparable,Column extends Comparab
     public CategoryDataset build() {
         DefaultCategoryDataset ds = new DefaultCategoryDataset();
 
-        TreeSet<Row> rowSet = new TreeSet<Row>(rows);
-        TreeSet<Column> colSet = new TreeSet<Column>(columns);
+        TreeSet<Row> rowSet = new TreeSet<>(rows);
+        TreeSet<Column> colSet = new TreeSet<>(columns);
 
-        Comparable[] _rows = rowSet.toArray(new Comparable[rowSet.size()]);
-        Comparable[] _cols = colSet.toArray(new Comparable[colSet.size()]);
+        Comparable[] _rows = rowSet.toArray(new Comparable[0]);
+        Comparable[] _cols = colSet.toArray(new Comparable[0]);
 
         // insert rows and columns in the right order
         for (Comparable r : _rows)
diff --git a/core/src/main/java/hudson/util/DescribableList.java b/core/src/main/java/hudson/util/DescribableList.java
index 18642093c7..3c3a85a785 100644
--- a/core/src/main/java/hudson/util/DescribableList.java
+++ b/core/src/main/java/hudson/util/DescribableList.java
@@ -162,7 +162,7 @@ public class DescribableList<T extends Describable<T>, D extends Descriptor<T>>
      *      Structured form data that includes the data for nested descriptor list.
      */
     public void rebuild(StaplerRequest req, JSONObject json, List<? extends Descriptor<T>> descriptors) throws FormException, IOException {
-        List<T> newList = new ArrayList<T>();
+        List<T> newList = new ArrayList<>();
 
         for (Descriptor<T> d : descriptors) {
             T existing = get((D)d);
diff --git a/core/src/main/java/hudson/util/DescriptorList.java b/core/src/main/java/hudson/util/DescriptorList.java
index 34ea3ba796..0cdb0df804 100644
--- a/core/src/main/java/hudson/util/DescriptorList.java
+++ b/core/src/main/java/hudson/util/DescriptorList.java
@@ -82,7 +82,7 @@ public final class DescriptorList<T extends Describable<T>> extends AbstractList
     @Deprecated
     public DescriptorList(Descriptor<T>... descriptors) {
         this.type = null;
-        this.legacy = new CopyOnWriteArrayList<Descriptor<T>>(descriptors);
+        this.legacy = new CopyOnWriteArrayList<>(descriptors);
     }
 
     /**
diff --git a/core/src/main/java/hudson/util/FormValidation.java b/core/src/main/java/hudson/util/FormValidation.java
index 60b63b18ac..b77c50bec6 100644
--- a/core/src/main/java/hudson/util/FormValidation.java
+++ b/core/src/main/java/hudson/util/FormValidation.java
@@ -596,7 +596,7 @@ public abstract class FormValidation extends IOException implements HttpResponse
 
             method = ReflectionUtils.getPublicMethodNamed(descriptor.getClass(), "doCheck" + capitalizedFieldName);
             if(method !=null) {
-                names = new ArrayList<String>();
+                names = new ArrayList<>();
                 findParameters(method);
             } else {
                 names = null;
diff --git a/core/src/main/java/hudson/util/Iterators.java b/core/src/main/java/hudson/util/Iterators.java
index d07e97f38b..68ae293c26 100644
--- a/core/src/main/java/hudson/util/Iterators.java
+++ b/core/src/main/java/hudson/util/Iterators.java
@@ -148,7 +148,7 @@ public class Iterators {
      * Remove duplicates from another iterator.
      */
     public static final class DuplicateFilterIterator<T> extends FilterIterator<T> {
-        private final Set<T> seen = new HashSet<T>();
+        private final Set<T> seen = new HashSet<>();
 
         public DuplicateFilterIterator(Iterator<? extends T> core) {
             super(core);
@@ -336,7 +336,7 @@ public class Iterators {
      */
     public static <T> Iterator<T> removeDups(Iterator<T> iterator) {
         return new FilterIterator<T>(iterator) {
-            final Set<T> found = new HashSet<T>();
+            final Set<T> found = new HashSet<>();
             @Override
             protected boolean filter(T t) {
                 return found.add(t);
diff --git a/core/src/main/java/hudson/util/JVMBuilder.java b/core/src/main/java/hudson/util/JVMBuilder.java
index aa77d16ddb..8166cbe497 100644
--- a/core/src/main/java/hudson/util/JVMBuilder.java
+++ b/core/src/main/java/hudson/util/JVMBuilder.java
@@ -41,7 +41,7 @@ import java.util.TreeMap;
  */
 public class JVMBuilder implements Serializable {
     private final ClasspathBuilder classpath = new ClasspathBuilder();
-    private final Map<String,String> systemProperties = new TreeMap<String,String>();
+    private final Map<String,String> systemProperties = new TreeMap<>();
     private final ArgumentListBuilder args = new ArgumentListBuilder();
     private final ArgumentListBuilder vmopts = new ArgumentListBuilder();
     private FilePath pwd;
diff --git a/core/src/main/java/hudson/util/KeyedDataStorage.java b/core/src/main/java/hudson/util/KeyedDataStorage.java
index 1834439455..93f15b6a09 100644
--- a/core/src/main/java/hudson/util/KeyedDataStorage.java
+++ b/core/src/main/java/hudson/util/KeyedDataStorage.java
@@ -63,7 +63,7 @@ public abstract class KeyedDataStorage<T,P> {
      * If it's {@link Loading}, then that indicates the fingerprint is being loaded.
      * The thread can wait on this object to be notified when the loading completes.
      */
-    private final ConcurrentHashMap<String,Object> core = new ConcurrentHashMap<String,Object>();
+    private final ConcurrentHashMap<String,Object> core = new ConcurrentHashMap<>();
 
     /**
      * Used in {@link KeyedDataStorage#core} to indicate that the loading of a fingerprint
@@ -149,7 +149,7 @@ public abstract class KeyedDataStorage<T,P> {
 
             // the fingerprint doesn't seem to be loaded thus far, so let's load it now.
             // the care needs to be taken that other threads might be trying to do the same.
-            Loading<T> l = new Loading<T>();
+            Loading<T> l = new Loading<>();
             if(value==null ? core.putIfAbsent(key,l)!=null : !core.replace(key,value,l)) {
                 // the value has changed since then. another thread is attempting to do the same.
                 // go back to square 1 and try it again.
@@ -175,7 +175,7 @@ public abstract class KeyedDataStorage<T,P> {
 
             // the map needs to be updated to reflect the result of loading
             if(t!=null)
-                core.put(key,new SoftReference<T>(t));
+                core.put(key, new SoftReference<>(t));
             else
                 core.remove(key);
 
diff --git a/core/src/main/java/hudson/util/Memoizer.java b/core/src/main/java/hudson/util/Memoizer.java
index 8e4057100b..cce36b315c 100644
--- a/core/src/main/java/hudson/util/Memoizer.java
+++ b/core/src/main/java/hudson/util/Memoizer.java
@@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @Deprecated
 public abstract class Memoizer<K,V> {
-    private final ConcurrentHashMap<K,V> store = new ConcurrentHashMap<K,V>();
+    private final ConcurrentHashMap<K,V> store = new ConcurrentHashMap<>();
 
     public V get(K key) {
         V v = store.get(key);
diff --git a/core/src/main/java/hudson/util/MultipartFormDataParser.java b/core/src/main/java/hudson/util/MultipartFormDataParser.java
index 466962e4a3..141523e65f 100644
--- a/core/src/main/java/hudson/util/MultipartFormDataParser.java
+++ b/core/src/main/java/hudson/util/MultipartFormDataParser.java
@@ -44,7 +44,7 @@ import java.util.HashMap;
  */
 public class MultipartFormDataParser implements AutoCloseable {
     private final ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
-    private final Map<String,FileItem> byName = new HashMap<String,FileItem>();
+    private final Map<String,FileItem> byName = new HashMap<>();
 
     public MultipartFormDataParser(HttpServletRequest request) throws ServletException {
         try {
diff --git a/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java b/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java
index 03508ce50d..2f3d86e0cc 100644
--- a/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java
+++ b/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java
@@ -77,7 +77,7 @@ public class NoOverlapCategoryAxis extends CategoryAxis {
                 g2.setPaint(getTickLabelPaint(tick.getCategory()));
 
                 CategoryLabelPosition position
-                    = this.getCategoryLabelPositions().getLabelPosition(edge);
+                        = this.getCategoryLabelPositions().getLabelPosition(edge);
                 double x0 = 0.0;
                 double x1 = 0.0;
                 double y0 = 0.0;
@@ -89,24 +89,21 @@ public class NoOverlapCategoryAxis extends CategoryAxis {
                             edge);
                     y1 = state.getCursor() - this.getCategoryLabelPositionOffset();
                     y0 = y1 - state.getMax();
-                }
-                else if (edge == RectangleEdge.BOTTOM) {
+                } else if (edge == RectangleEdge.BOTTOM) {
                     x0 = getCategoryStart(categoryIndex, ticks.size(),
                             dataArea, edge);
                     x1 = getCategoryEnd(categoryIndex, ticks.size(), dataArea,
                             edge);
                     y0 = state.getCursor() + this.getCategoryLabelPositionOffset();
                     y1 = y0 + state.getMax();
-                }
-                else if (edge == RectangleEdge.LEFT) {
+                } else if (edge == RectangleEdge.LEFT) {
                     y0 = getCategoryStart(categoryIndex, ticks.size(),
                             dataArea, edge);
                     y1 = getCategoryEnd(categoryIndex, ticks.size(), dataArea,
                             edge);
                     x1 = state.getCursor() - this.getCategoryLabelPositionOffset();
                     x0 = x1 - state.getMax();
-                }
-                else if (edge == RectangleEdge.RIGHT) {
+                } else if (edge == RectangleEdge.RIGHT) {
                     y0 = getCategoryStart(categoryIndex, ticks.size(),
                             dataArea, edge);
                     y1 = getCategoryEnd(categoryIndex, ticks.size(), dataArea,
@@ -116,7 +113,7 @@ public class NoOverlapCategoryAxis extends CategoryAxis {
                 }
                 Rectangle2D area = new Rectangle2D.Double(x0, y0, (x1 - x0),
                         (y1 - y0));
-                if(r==null || !r.intersects(area)) {
+                if (r == null || !r.intersects(area)) {
                     Point2D anchorPoint = RectangleAnchor.coordinates(area,
                             position.getCategoryAnchor());
                     TextBlock block = tick.getLabel();
@@ -130,7 +127,7 @@ public class NoOverlapCategoryAxis extends CategoryAxis {
                             (float) anchorPoint.getY(), position.getAngle());
                     if (plotState != null && plotState.getOwner() != null) {
                         EntityCollection entities
-                            = plotState.getOwner().getEntityCollection();
+                                = plotState.getOwner().getEntityCollection();
                         if (entities != null) {
                             String tooltip = getCategoryLabelToolTip(
                                     tick.getCategory());
@@ -140,10 +137,10 @@ public class NoOverlapCategoryAxis extends CategoryAxis {
                     }
                     r = bounds.getBounds2D();
                     // add margins in all directions
-                    r.add(r.getMaxX() + r.getWidth()/2, r.getCenterY());
-                    r.add(r.getMinX() - r.getWidth()/2, r.getCenterY());
-                    r.add(r.getCenterX(), r.getMinY() - r.getHeight()/2);
-                    r.add(r.getCenterX(), r.getMaxX() + r.getHeight()/2);
+                    r.add(r.getMaxX() + r.getWidth() / 2, r.getCenterY());
+                    r.add(r.getMinX() - r.getWidth() / 2, r.getCenterY());
+                    r.add(r.getCenterX(), r.getMinY() - r.getHeight() / 2);
+                    r.add(r.getCenterX(), r.getMaxX() + r.getHeight() / 2);
                 }
 
                 categoryIndex++;
diff --git a/core/src/main/java/hudson/util/PackedMap.java b/core/src/main/java/hudson/util/PackedMap.java
index b395a20d6a..617f0dfdf3 100644
--- a/core/src/main/java/hudson/util/PackedMap.java
+++ b/core/src/main/java/hudson/util/PackedMap.java
@@ -64,7 +64,7 @@ public final class PackedMap<K,V> extends AbstractMap<K,V> {
      *      Map to copy contents from. Iteration order is preserved.
      */
     public static <K,V> PackedMap<K,V> of(Map<? extends K,? extends V> src) {
-        return new PackedMap<K, V>(src);
+        return new PackedMap<>(src);
     }
 
     private PackedMap(Map<? extends K,? extends V> src) {
diff --git a/core/src/main/java/hudson/util/PersistedList.java b/core/src/main/java/hudson/util/PersistedList.java
index ae27fbfc48..78373c34c6 100644
--- a/core/src/main/java/hudson/util/PersistedList.java
+++ b/core/src/main/java/hudson/util/PersistedList.java
@@ -48,7 +48,7 @@ import java.util.List;
  * @since 1.333
  */
 public class PersistedList<T> extends AbstractList<T> {
-    protected final CopyOnWriteList<T> data = new CopyOnWriteList<T>();
+    protected final CopyOnWriteList<T> data = new CopyOnWriteList<>();
     protected Saveable owner = Saveable.NOOP;
 
     protected PersistedList() {
@@ -100,7 +100,7 @@ public class PersistedList<T> extends AbstractList<T> {
      * Gets all instances that matches the given type.
      */
     public <U extends T> List<U> getAll(Class<U> type) {
-        List<U> r = new ArrayList<U>();
+        List<U> r = new ArrayList<>();
         for (T t : data)
             if(type.isInstance(t))
                 r.add(type.cast(t));
@@ -131,7 +131,7 @@ public class PersistedList<T> extends AbstractList<T> {
      * as copy-on-write semantics make this rather slow.
      */
     public void replace(T from, T to) throws IOException {
-        List<T> copy = new ArrayList<T>(data.getView());
+        List<T> copy = new ArrayList<>(data.getView());
         for (int i=0; i<copy.size(); i++) {
             if (copy.get(i).equals(from))
                 copy.set(i,to);
diff --git a/core/src/main/java/hudson/util/PluginServletFilter.java b/core/src/main/java/hudson/util/PluginServletFilter.java
index 08ab061511..3ffe1de333 100644
--- a/core/src/main/java/hudson/util/PluginServletFilter.java
+++ b/core/src/main/java/hudson/util/PluginServletFilter.java
@@ -60,7 +60,7 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
  * @see SecurityRealm
  */
 public class PluginServletFilter implements Filter, ExtensionPoint {
-    private final List<Filter> list = new CopyOnWriteArrayList<Filter>();
+    private final List<Filter> list = new CopyOnWriteArrayList<>();
 
     private /*almost final*/ FilterConfig config;
 
@@ -69,7 +69,7 @@ public class PluginServletFilter implements Filter, ExtensionPoint {
      * starts functioning, when we are not sure which Jenkins instance a filter belongs to, put it here,
      * and let the first Jenkins instance take over.
      */
-    private static final List<Filter> LEGACY = new Vector<Filter>();
+    private static final List<Filter> LEGACY = new Vector<>();
 
     private static final String KEY = PluginServletFilter.class.getName();
 
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
index fd33d2f995..a0c2c6fc48 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -99,7 +99,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
     /**
      * To be filled in the constructor of the derived type.
      */
-    protected final Map<Integer/*pid*/, OSProcess> processes = new HashMap<Integer, OSProcess>();
+    protected final Map<Integer/*pid*/, OSProcess> processes = new HashMap<>();
 
     /**
      * Lazily obtained {@link ProcessKiller}s to be applied on this process tree.
diff --git a/core/src/main/java/hudson/util/QueryParameterMap.java b/core/src/main/java/hudson/util/QueryParameterMap.java
index 1b7683d824..8f306ea588 100644
--- a/core/src/main/java/hudson/util/QueryParameterMap.java
+++ b/core/src/main/java/hudson/util/QueryParameterMap.java
@@ -48,7 +48,7 @@ import java.util.Map;
  * @since 1.394
  */
 public class QueryParameterMap {
-    private final Map<String,List<String>> store = new HashMap<String, List<String>>();
+    private final Map<String,List<String>> store = new HashMap<>();
 
     /**
      * @param queryString
@@ -61,9 +61,7 @@ public class QueryParameterMap {
                 String[] kv = param.split("=");
                 String key = URLDecoder.decode(kv[0], "UTF-8");
                 String value = URLDecoder.decode(kv[1], "UTF-8");
-                List<String> values = store.get(key);
-                if (values == null)
-                    store.put(key, values = new ArrayList<String>());
+                List<String> values = store.computeIfAbsent(key, k -> new ArrayList<>());
                 values.add(value);
             }
         } catch (UnsupportedEncodingException e) {
diff --git a/core/src/main/java/hudson/util/RemotingDiagnostics.java b/core/src/main/java/hudson/util/RemotingDiagnostics.java
index 447b19a5c9..57d397b7f4 100644
--- a/core/src/main/java/hudson/util/RemotingDiagnostics.java
+++ b/core/src/main/java/hudson/util/RemotingDiagnostics.java
@@ -75,7 +75,7 @@ public final class RemotingDiagnostics {
 
     private static final class GetSystemProperties extends MasterToSlaveCallable<Map<Object,Object>,RuntimeException> {
         public Map<Object,Object> call() {
-            return new TreeMap<Object,Object>(System.getProperties());
+            return new TreeMap<>(System.getProperties());
         }
         private static final long serialVersionUID = 1L;
     }
@@ -88,13 +88,13 @@ public final class RemotingDiagnostics {
 
     public static Future<Map<String,String>> getThreadDumpAsync(VirtualChannel channel) throws IOException, InterruptedException {
         if(channel==null)
-            return new AsyncFutureImpl<Map<String, String>>(Collections.singletonMap("N/A","offline"));
+            return new AsyncFutureImpl<>(Collections.singletonMap("N/A", "offline"));
         return channel.callAsync(new GetThreadDump());
     }
 
     private static final class GetThreadDump extends MasterToSlaveCallable<Map<String,String>,RuntimeException> {
         public Map<String,String> call() {
-            Map<String,String> r = new LinkedHashMap<String,String>();
+            Map<String,String> r = new LinkedHashMap<>();
                 ThreadInfo[] data = Functions.getThreadInfos();
                 Functions.ThreadGroupMap map = Functions.sortThreadsAndGetGroupMap(data);
                 for (ThreadInfo ti : data)
diff --git a/core/src/main/java/hudson/util/RobustCollectionConverter.java b/core/src/main/java/hudson/util/RobustCollectionConverter.java
index d0903ff82b..7f95b2e873 100644
--- a/core/src/main/java/hudson/util/RobustCollectionConverter.java
+++ b/core/src/main/java/hudson/util/RobustCollectionConverter.java
@@ -86,9 +86,7 @@ public class RobustCollectionConverter extends CollectionConverter {
                 collection.add(item);
             } catch (CriticalXStreamException e) {
                 throw e;
-            } catch (XStreamException e) {
-                RobustReflectionConverter.addErrorInContext(context, e);
-            } catch (LinkageError e) {
+            } catch (XStreamException | LinkageError e) {
                 RobustReflectionConverter.addErrorInContext(context, e);
             }
             reader.moveUp();
diff --git a/core/src/main/java/hudson/util/RobustMapConverter.java b/core/src/main/java/hudson/util/RobustMapConverter.java
index 48bdf94c79..ce16bc0b1e 100644
--- a/core/src/main/java/hudson/util/RobustMapConverter.java
+++ b/core/src/main/java/hudson/util/RobustMapConverter.java
@@ -58,10 +58,7 @@ final class RobustMapConverter extends MapConverter {
             return readItem(reader, context, map);
         } catch (CriticalXStreamException x) {
             throw x;
-        } catch (XStreamException x) {
-            RobustReflectionConverter.addErrorInContext(context, x);
-            return ERROR;
-        } catch (LinkageError x) {
+        } catch (XStreamException | LinkageError x) {
             RobustReflectionConverter.addErrorInContext(context, x);
             return ERROR;
         } finally {
diff --git a/core/src/main/java/hudson/util/RobustReflectionConverter.java b/core/src/main/java/hudson/util/RobustReflectionConverter.java
index 68d2dc816f..8c876ce18e 100644
--- a/core/src/main/java/hudson/util/RobustReflectionConverter.java
+++ b/core/src/main/java/hudson/util/RobustReflectionConverter.java
@@ -84,7 +84,7 @@ public class RobustReflectionConverter implements Converter {
         with the fields as the keys.**/
     private final ReadWriteLock criticalFieldsLock = new ReentrantReadWriteLock();
     @GuardedBy("criticalFieldsLock")
-    private final Map<String, Set<String>> criticalFields = new HashMap<String, Set<String>>();
+    private final Map<String, Set<String>> criticalFields = new HashMap<>();
 
     public RobustReflectionConverter(Mapper mapper, ReflectionProvider reflectionProvider) {
         this(mapper, reflectionProvider, new XStream2().new PluginClassOwnership());
@@ -104,7 +104,7 @@ public class RobustReflectionConverter implements Converter {
             // If the class already exists, then add a new field, otherwise
             // create the hash map field
             if (!criticalFields.containsKey(field)) {
-                criticalFields.put(field, new HashSet<String>());
+                criticalFields.put(field, new HashSet<>());
             }
             criticalFields.get(field).add(clazz.getName());
         }
@@ -376,7 +376,7 @@ public class RobustReflectionConverter implements Converter {
         LOGGER.log(FINE, "Failed to load", e);
         ArrayList<Throwable> list = (ArrayList<Throwable>)context.get("ReadError");
         if (list == null)
-            context.put("ReadError", list = new ArrayList<Throwable>());
+            context.put("ReadError", list = new ArrayList<>());
         list.add(e);
     }
 
diff --git a/core/src/main/java/hudson/util/RunList.java b/core/src/main/java/hudson/util/RunList.java
index bdc9cb61f4..44136da9b9 100644
--- a/core/src/main/java/hudson/util/RunList.java
+++ b/core/src/main/java/hudson/util/RunList.java
@@ -58,11 +58,11 @@ public class RunList<R extends Run> extends AbstractList<R> {
     }
 
     public RunList(View view) {// this is a type unsafe operation
-        Set<Job> jobs = new HashSet<Job>();
+        Set<Job> jobs = new HashSet<>();
         for (TopLevelItem item : view.getItems())
             jobs.addAll(item.getAllJobs());
 
-        List<Iterable<R>> runLists = new ArrayList<Iterable<R>>();
+        List<Iterable<R>> runLists = new ArrayList<>();
         for (Job job : jobs) {
             runLists.add(job.getBuilds());
         }
@@ -70,7 +70,7 @@ public class RunList<R extends Run> extends AbstractList<R> {
     }
 
     public RunList(Collection<? extends Job> jobs) {
-        List<Iterable<R>> runLists = new ArrayList<Iterable<R>>();
+        List<Iterable<R>> runLists = new ArrayList<>();
         for (Job j : jobs)
             runLists.add(j.getBuilds());
         this.base = combine(runLists);
@@ -148,7 +148,7 @@ public class RunList<R extends Run> extends AbstractList<R> {
      */
     @Override
     public List<R> subList(int fromIndex, int toIndex) {
-        List<R> r = new ArrayList<R>();
+        List<R> r = new ArrayList<>();
         Iterator<R> itr = iterator();
         hudson.util.Iterators.skip(itr, fromIndex);
         for (int i=toIndex-fromIndex; i>0; i--) {
diff --git a/core/src/main/java/hudson/util/Secret.java b/core/src/main/java/hudson/util/Secret.java
index 6e78cad856..7bc4c9369d 100644
--- a/core/src/main/java/hudson/util/Secret.java
+++ b/core/src/main/java/hudson/util/Secret.java
@@ -210,11 +210,9 @@ public final class Secret implements Serializable {
         } else {
             try {
                 return HistoricalSecrets.decrypt(data, KEY);
-            } catch (GeneralSecurityException e) {
-                return null;
             } catch (UnsupportedEncodingException e) {
                 throw new Error(e); // impossible
-            } catch (IOException e) {
+            } catch (GeneralSecurityException | IOException e) {
                 return null;
             }
         }
diff --git a/core/src/main/java/hudson/util/SecretRewriter.java b/core/src/main/java/hudson/util/SecretRewriter.java
index e0ac4df4c7..ab4afceee1 100644
--- a/core/src/main/java/hudson/util/SecretRewriter.java
+++ b/core/src/main/java/hudson/util/SecretRewriter.java
@@ -41,7 +41,7 @@ public class SecretRewriter {
      * Canonical paths of the directories we are recursing to protect
      * against symlink induced cycles.
      */
-    private Set<String> callstack = new HashSet<String>();
+    private Set<String> callstack = new HashSet<>();
 
     public SecretRewriter() throws GeneralSecurityException {
         cipher = Secret.getCipher("AES");
diff --git a/core/src/main/java/hudson/util/SequentialExecutionQueue.java b/core/src/main/java/hudson/util/SequentialExecutionQueue.java
index 1ad1915099..d2ba8209c0 100644
--- a/core/src/main/java/hudson/util/SequentialExecutionQueue.java
+++ b/core/src/main/java/hudson/util/SequentialExecutionQueue.java
@@ -25,13 +25,13 @@ public class SequentialExecutionQueue implements Executor {
     /**
      * Access is synchronized by {@code Queue.this}
      */
-    private final Map<Runnable,QueueEntry> entries = new HashMap<Runnable,QueueEntry>();
+    private final Map<Runnable,QueueEntry> entries = new HashMap<>();
     private ExecutorService executors;
 
     /**
      * {@link Runnable}s that are currently executing. Useful for trouble-shooting.
      */
-    private final Set<QueueEntry> inProgress = new HashSet<QueueEntry>();
+    private final Set<QueueEntry> inProgress = new HashSet<>();
 
     public SequentialExecutionQueue(ExecutorService executors) {
         this.executors = executors;
@@ -86,7 +86,7 @@ public class SequentialExecutionQueue implements Executor {
      * Gets {@link Runnable}s that are currently executed by a live thread.
      */
     public synchronized Set<Runnable> getInProgress() {
-        Set<Runnable> items = new HashSet<Runnable>();
+        Set<Runnable> items = new HashSet<>();
         for (QueueEntry entry : inProgress) {
             items.add(entry.item);
         }
diff --git a/core/src/main/java/hudson/util/Service.java b/core/src/main/java/hudson/util/Service.java
index 43ef0e9fa1..b1330e2577 100644
--- a/core/src/main/java/hudson/util/Service.java
+++ b/core/src/main/java/hudson/util/Service.java
@@ -46,7 +46,7 @@ import static java.util.logging.Level.WARNING;
 @Deprecated
 public class Service {
     public static <T> List<T> loadInstances(ClassLoader classLoader, Class<T> type) throws IOException {
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
 
         final Enumeration<URL> e = classLoader.getResources("META-INF/services/"+type.getName());
         while (e.hasMoreElements()) {
@@ -62,11 +62,7 @@ public class Service {
                         if (!type.isAssignableFrom(t)) continue;      // invalid type
 
                         result.add(type.cast(t.newInstance()));
-                    } catch (ClassNotFoundException x) {
-                        LOGGER.log(WARNING, "Failed to load " + line, x);
-                    } catch (InstantiationException x) {
-                        LOGGER.log(WARNING, "Failed to load " + line, x);
-                    } catch (IllegalAccessException x) {
+                    } catch (ClassNotFoundException | IllegalAccessException | InstantiationException x) {
                         LOGGER.log(WARNING, "Failed to load " + line, x);
                     }
                 }
diff --git a/core/src/main/java/hudson/util/TableNestChecker.java b/core/src/main/java/hudson/util/TableNestChecker.java
index 9187da965a..d5ceead677 100644
--- a/core/src/main/java/hudson/util/TableNestChecker.java
+++ b/core/src/main/java/hudson/util/TableNestChecker.java
@@ -54,8 +54,8 @@ import java.util.Arrays;
  */
 public class TableNestChecker extends XMLFilterImpl {
 
-    private final Stack<Checker> elements = new Stack<Checker>();
-    private final Stack<String> tagNames = new Stack<String>();
+    private final Stack<Checker> elements = new Stack<>();
+    private final Stack<String> tagNames = new Stack<>();
 
     public static void applyTo(XMLOutput xo) {
         xo.setContentHandler(new TableNestChecker(xo.getContentHandler()));
@@ -108,7 +108,7 @@ public class TableNestChecker extends XMLFilterImpl {
         private final Set<String> tags;
 
         private InList(String... tags) {
-            this.tags = new HashSet<String>(Arrays.asList(tags));
+            this.tags = new HashSet<>(Arrays.asList(tags));
         }
 
         public boolean isAllowed(String childTag) {
@@ -116,7 +116,7 @@ public class TableNestChecker extends XMLFilterImpl {
         }
     }
 
-    private static final Map<String,Checker> CHECKERS = new HashMap<String, Checker>();
+    private static final Map<String,Checker> CHECKERS = new HashMap<>();
 
     static {
         CHECKERS.put("TABLE",new InList("TR","THEAD","TBODY"));
diff --git a/core/src/main/java/hudson/util/TagCloud.java b/core/src/main/java/hudson/util/TagCloud.java
index 9b1e0a6eb0..56b4cd7b15 100644
--- a/core/src/main/java/hudson/util/TagCloud.java
+++ b/core/src/main/java/hudson/util/TagCloud.java
@@ -59,7 +59,7 @@ public class TagCloud<T> extends AbstractList<TagCloud<T>.Entry> {
         float weight(T item);
     }
 
-    private final List<Entry> entries = new ArrayList<Entry>();
+    private final List<Entry> entries = new ArrayList<>();
     private float max = 1;
 
     /**
diff --git a/core/src/main/java/hudson/util/VariableResolver.java b/core/src/main/java/hudson/util/VariableResolver.java
index 909dd0860b..2f57719185 100644
--- a/core/src/main/java/hudson/util/VariableResolver.java
+++ b/core/src/main/java/hudson/util/VariableResolver.java
@@ -87,7 +87,7 @@ public interface VariableResolver<V> {
         }
 
         public Union(Collection<? extends VariableResolver<? extends V>> resolvers) {
-            this.resolvers = resolvers.toArray(new VariableResolver[resolvers.size()]);
+            this.resolvers = resolvers.toArray(new VariableResolver[0]);
         }
 
         public V resolve(String name) {
diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java
index d4124ae147..5a37dbed71 100644
--- a/core/src/main/java/hudson/util/XStream2.java
+++ b/core/src/main/java/hudson/util/XStream2.java
@@ -90,9 +90,9 @@ public class XStream2 extends XStream {
     private static final Logger LOGGER = Logger.getLogger(XStream2.class.getName());
 
     private RobustReflectionConverter reflectionConverter;
-    private final ThreadLocal<Boolean> oldData = new ThreadLocal<Boolean>();
+    private final ThreadLocal<Boolean> oldData = new ThreadLocal<>();
     private final @CheckForNull ClassOwnership classOwnership;
-    private final Map<String,Class<?>> compatibilityAliases = new ConcurrentHashMap<String, Class<?>>();
+    private final Map<String,Class<?>> compatibilityAliases = new ConcurrentHashMap<>();
 
     /**
      * Hook to insert {@link Mapper}s after they are created.
@@ -397,7 +397,7 @@ public class XStream2 extends XStream {
     private static final class AssociatedConverterImpl implements Converter {
         private final XStream xstream;
         private final ConcurrentHashMap<Class<?>,Converter> cache =
-                new ConcurrentHashMap<Class<?>,Converter>();
+                new ConcurrentHashMap<>();
 
         private AssociatedConverterImpl(XStream xstream) {
             this.xstream = xstream;
@@ -445,11 +445,7 @@ public class XStream2 extends XStream {
                 IllegalAccessError x = new IllegalAccessError();
                 x.initCause(e);
                 throw x;
-            } catch (InstantiationException e) {
-                InstantiationError x = new InstantiationError();
-                x.initCause(e);
-                throw x;
-            } catch (InvocationTargetException e) {
+            } catch (InstantiationException | InvocationTargetException e) {
                 InstantiationError x = new InstantiationError();
                 x.initCause(e);
                 throw x;
diff --git a/core/src/main/java/hudson/util/jna/RegistryKey.java b/core/src/main/java/hudson/util/jna/RegistryKey.java
index d4fe32973c..e2051fcbc1 100644
--- a/core/src/main/java/hudson/util/jna/RegistryKey.java
+++ b/core/src/main/java/hudson/util/jna/RegistryKey.java
@@ -187,7 +187,7 @@ public class RegistryKey {
      */
     public Collection<String> getSubKeys() {
         WINBASE.FILETIME lpftLastWriteTime;
-        TreeSet<String> subKeys = new TreeSet<String>();
+        TreeSet<String> subKeys = new TreeSet<>();
         char[] lpName = new char[256];
         IntByReference lpcName = new IntByReference(256);
         lpftLastWriteTime = new WINBASE.FILETIME();
@@ -228,7 +228,7 @@ public class RegistryKey {
         byte[] lpData;
         IntByReference lpcchValueName, lpType, lpcbData;
         String name;
-        TreeMap<String, Object> values = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
+        TreeMap<String, Object> values = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 
         lpValueName = new char[16384];
         lpcchValueName = new IntByReference(16384);
diff --git a/core/src/main/java/hudson/util/spring/BeanBuilder.java b/core/src/main/java/hudson/util/spring/BeanBuilder.java
index 22399d5c03..a4d3bd4244 100644
--- a/core/src/main/java/hudson/util/spring/BeanBuilder.java
+++ b/core/src/main/java/hudson/util/spring/BeanBuilder.java
@@ -87,7 +87,7 @@ public class BeanBuilder extends GroovyObjectSupport {
     private static final String ANONYMOUS_BEAN = "bean";
     private RuntimeSpringConfiguration springConfig = new DefaultRuntimeSpringConfiguration();
     private BeanConfiguration currentBeanConfig;
-    private Map<String,DeferredProperty> deferredProperties = new HashMap<String,DeferredProperty>();
+    private Map<String,DeferredProperty> deferredProperties = new HashMap<>();
     private ApplicationContext parentCtx;
     private Map binding = new HashMap();
     private ClassLoader classLoader = null;
@@ -172,7 +172,7 @@ public class BeanBuilder extends GroovyObjectSupport {
      */
     public Map<String,BeanDefinition> getBeanDefinitions() {
 
-        Map<String,BeanDefinition> beanDefinitions = new HashMap<String,BeanDefinition>();
+        Map<String,BeanDefinition> beanDefinitions = new HashMap<>();
         for (String beanName : getSpringConfig().getBeanNames()) {
             BeanDefinition bd = getSpringConfig()
                     .getBeanConfig(beanName)
diff --git a/core/src/main/java/hudson/util/spring/DefaultBeanConfiguration.java b/core/src/main/java/hudson/util/spring/DefaultBeanConfiguration.java
index c5430681d9..7e2cf68b32 100644
--- a/core/src/main/java/hudson/util/spring/DefaultBeanConfiguration.java
+++ b/core/src/main/java/hudson/util/spring/DefaultBeanConfiguration.java
@@ -50,7 +50,7 @@ class DefaultBeanConfiguration extends GroovyObjectSupport implements BeanConfig
     private static final String PARENT = "parent";
     private static final String BY_TYPE = "byType";
     private static final String BY_CONSTRUCTOR = "constructor";
-    private static final Set<String> DYNAMIC_PROPS = new HashSet<String>(Arrays.asList(AUTOWIRE, CONSTRUCTOR_ARGS, DESTROY_METHOD, FACTORY_BEAN, FACTORY_METHOD, INIT_METHOD, BY_NAME, BY_TYPE, BY_CONSTRUCTOR));
+    private static final Set<String> DYNAMIC_PROPS = new HashSet<>(Arrays.asList(AUTOWIRE, CONSTRUCTOR_ARGS, DESTROY_METHOD, FACTORY_BEAN, FACTORY_METHOD, INIT_METHOD, BY_NAME, BY_TYPE, BY_CONSTRUCTOR));
     private String parentName;
 
     @Override
diff --git a/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java b/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java
index 3734c47245..fe06ac7411 100644
--- a/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java
+++ b/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java
@@ -80,12 +80,10 @@ public class ImmutableListConverter extends CollectionConverter {
 	                    items.add(item);
 	                } catch (CriticalXStreamException e) {
 	                    throw e;
-	                } catch (XStreamException e) {
-	                    RobustReflectionConverter.addErrorInContext(context, e);
-	                } catch (LinkageError e) {
+	                } catch (XStreamException | LinkageError e) {
 	                    RobustReflectionConverter.addErrorInContext(context, e);
 	                }
-	                reader.moveUp();
+                    reader.moveUp();
 	            }
 
                 // move back up past the elements element.
diff --git a/core/src/main/java/hudson/views/ListViewColumn.java b/core/src/main/java/hudson/views/ListViewColumn.java
index 4b1581a2f9..08b584f2e4 100644
--- a/core/src/main/java/hudson/views/ListViewColumn.java
+++ b/core/src/main/java/hudson/views/ListViewColumn.java
@@ -96,7 +96,7 @@ public abstract class ListViewColumn implements ExtensionPoint, Describable<List
      *      Use {@link #all()} for read access and {@link Extension} for registration.
      */
     @Deprecated
-    public static final DescriptorList<ListViewColumn> LIST = new DescriptorList<ListViewColumn>(ListViewColumn.class);
+    public static final DescriptorList<ListViewColumn> LIST = new DescriptorList<>(ListViewColumn.class);
 
     /**
      * Whether this column will be shown by default.
@@ -152,7 +152,7 @@ public abstract class ListViewColumn implements ExtensionPoint, Describable<List
     private static List<ListViewColumn> createDefaultInitialColumnList(List<Descriptor<ListViewColumn>> descriptors) {
         // OK, set up default list of columns:
         // create all instances
-        ArrayList<ListViewColumn> r = new ArrayList<ListViewColumn>();
+        ArrayList<ListViewColumn> r = new ArrayList<>();
         final JSONObject emptyJSON = new JSONObject();
         for (Descriptor<ListViewColumn> d : descriptors)
             try {
diff --git a/core/src/main/java/hudson/views/MyViewsTabBar.java b/core/src/main/java/hudson/views/MyViewsTabBar.java
index c3b49c268f..faf74f5e30 100644
--- a/core/src/main/java/hudson/views/MyViewsTabBar.java
+++ b/core/src/main/java/hudson/views/MyViewsTabBar.java
@@ -83,7 +83,7 @@ public abstract class MyViewsTabBar extends AbstractDescribableImpl<MyViewsTabBa
     @SuppressWarnings("unused") // invoked from stapler view
     public List<View> sort(@Nonnull List<? extends View> views) {
         List<View> result = new ArrayList<>(views);
-        Collections.sort(result, new Comparator<View>() {
+        result.sort(new Comparator<View>() {
             @Override
             public int compare(View o1, View o2) {
                 return o1.getDisplayName().compareTo(o2.getDisplayName());
diff --git a/core/src/main/java/hudson/views/ViewsTabBar.java b/core/src/main/java/hudson/views/ViewsTabBar.java
index 1456596937..2244274186 100644
--- a/core/src/main/java/hudson/views/ViewsTabBar.java
+++ b/core/src/main/java/hudson/views/ViewsTabBar.java
@@ -84,8 +84,8 @@ public abstract class ViewsTabBar extends AbstractDescribableImpl<ViewsTabBar> i
     @Restricted(NoExternalUse.class)
     @SuppressWarnings("unused") // invoked from stapler view
     public List<View> sort(@Nonnull List<? extends View> views) {
-        List<View> result = new ArrayList<View>(views);
-        Collections.sort(result, new Comparator<View>() {
+        List<View> result = new ArrayList<>(views);
+        result.sort(new Comparator<View>() {
             @Override
             public int compare(View o1, View o2) {
                 return o1.getDisplayName().compareTo(o2.getDisplayName());
diff --git a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java
index eb1986e718..baa7c0341d 100644
--- a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java
@@ -60,7 +60,7 @@ public class BuildHistoryWidget<T> extends HistoryWidget<Task,T> {
      * Returns the queue item if the owner is scheduled for execution in the queue, in REVERSE ORDER
      */
     public List<Item> getQueuedItems() {
-        LinkedList<Item> list = new LinkedList<Item>();
+        LinkedList<Item> list = new LinkedList<>();
         for (Item item : Jenkins.getInstance().getQueue().getItems()) {
             if (item.task == owner) {
                 list.addFirst(item);
diff --git a/core/src/main/java/hudson/widgets/HistoryWidget.java b/core/src/main/java/hudson/widgets/HistoryWidget.java
index f9472768d8..24c976b45b 100644
--- a/core/src/main/java/hudson/widgets/HistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/HistoryWidget.java
@@ -164,9 +164,9 @@ public class HistoryWidget<O extends ModelObject,T> extends Widget {
             return Collections.emptyList();
         }
 
-        List<HistoryPageEntry<T>> pageEntries = new ArrayList<HistoryPageEntry<T>>();
+        List<HistoryPageEntry<T>> pageEntries = new ArrayList<>();
         while (iterator.hasNext()) {
-            pageEntries.add(new HistoryPageEntry<T>(iterator.next()));
+            pageEntries.add(new HistoryPageEntry<>(iterator.next()));
         }
 
         return pageEntries;
@@ -184,7 +184,7 @@ public class HistoryWidget<O extends ModelObject,T> extends Widget {
     }
 
     protected HistoryPageFilter<T> newPageFilter() {
-        HistoryPageFilter<T> historyPageFilter = new HistoryPageFilter<T>(THRESHOLD);
+        HistoryPageFilter<T> historyPageFilter = new HistoryPageFilter<>(THRESHOLD);
 
         if (newerThan != null) {
             historyPageFilter.setNewerThan(newerThan);
@@ -220,7 +220,7 @@ public class HistoryWidget<O extends ModelObject,T> extends Widget {
         rsp.setContentType("text/html;charset=UTF-8");
 
         // pick up builds to send back
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
 
         if (n != null) {
             String nn=null; // we'll compute next n here
diff --git a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
index 05c3611a86..712cf83b1a 100644
--- a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
+++ b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
@@ -63,15 +63,15 @@ public class RenderOnDemandClosure {
     private final String[] adjuncts;
 
     public RenderOnDemandClosure(JellyContext context, String attributesToCapture) {
-        List<Script> bodyStack = new ArrayList<Script>();
+        List<Script> bodyStack = new ArrayList<>();
         for (JellyContext c = context; c!=null; c=c.getParent()) {
             Script script = (Script) c.getVariables().get("org.apache.commons.jelly.body");
             if(script!=null) bodyStack.add(script);
         }
-        this.bodyStack = bodyStack.toArray(new Script[bodyStack.size()]);
+        this.bodyStack = bodyStack.toArray(new Script[0]);
         assert !bodyStack.isEmpty();    // there must be at least one, which is the direct child of <l:renderOnDemand>
 
-        Map<String,Object> variables = new HashMap<String, Object>();
+        Map<String,Object> variables = new HashMap<>();
         for (String v : Util.fixNull(attributesToCapture).split(","))
             variables.put(v.intern(),context.getVariable(v));
 
@@ -106,9 +106,7 @@ public class RenderOnDemandClosure {
                             }
                             try {
                                 AdjunctsInPage.get().assumeIncluded(adjuncts);
-                            } catch (IOException e) {
-                                LOGGER.log(Level.WARNING, "Failed to resurrect adjunct context",e);
-                            } catch (SAXException e) {
+                            } catch (IOException | SAXException e) {
                                 LOGGER.log(Level.WARNING, "Failed to resurrect adjunct context",e);
                             }
                             return context;
diff --git a/core/src/main/java/jenkins/FilePathFilterAggregator.java b/core/src/main/java/jenkins/FilePathFilterAggregator.java
index f81ce2f77f..96285d0128 100644
--- a/core/src/main/java/jenkins/FilePathFilterAggregator.java
+++ b/core/src/main/java/jenkins/FilePathFilterAggregator.java
@@ -18,7 +18,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * @since 1.587 / 1.580.1
  */
 class FilePathFilterAggregator extends FilePathFilter {
-    private final CopyOnWriteArrayList<Entry> all = new CopyOnWriteArrayList<Entry>();
+    private final CopyOnWriteArrayList<Entry> all = new CopyOnWriteArrayList<>();
 
     private class Entry implements Comparable<Entry> {
         final FilePathFilter filter;
@@ -139,7 +139,7 @@ class FilePathFilterAggregator extends FilePathFilter {
         return "FilePathFilterAggregator" + all;
     }
 
-    static final ChannelProperty<FilePathFilterAggregator> KEY = new ChannelProperty<FilePathFilterAggregator>(FilePathFilterAggregator.class, "FilePathFilters");
+    static final ChannelProperty<FilePathFilterAggregator> KEY = new ChannelProperty<>(FilePathFilterAggregator.class, "FilePathFilters");
 
     public static final int DEFAULT_ORDINAL = 0;
 }
diff --git a/core/src/main/java/jenkins/InitReactorRunner.java b/core/src/main/java/jenkins/InitReactorRunner.java
index aa6ef83ab7..fd76f91214 100644
--- a/core/src/main/java/jenkins/InitReactorRunner.java
+++ b/core/src/main/java/jenkins/InitReactorRunner.java
@@ -41,7 +41,7 @@ public class InitReactorRunner {
         ExecutorService es;
         if (Jenkins.PARALLEL_LOAD)
             es = new ThreadPoolExecutor(
-                TWICE_CPU_NUM, TWICE_CPU_NUM, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new DaemonThreadFactory());
+                TWICE_CPU_NUM, TWICE_CPU_NUM, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new DaemonThreadFactory());
         else
             es = Executors.newSingleThreadExecutor(new NamingThreadFactory(new DaemonThreadFactory(), "InitReactorRunner"));
         try {
diff --git a/core/src/main/java/jenkins/PluginSubtypeMarker.java b/core/src/main/java/jenkins/PluginSubtypeMarker.java
index 71e0413c93..41622a5fe9 100644
--- a/core/src/main/java/jenkins/PluginSubtypeMarker.java
+++ b/core/src/main/java/jenkins/PluginSubtypeMarker.java
@@ -91,13 +91,10 @@ public class PluginSubtypeMarker extends AbstractProcessor {
             }
 
             return false;
-        } catch (RuntimeException e) {
+        } catch (RuntimeException | Error e) {
             // javac sucks at reporting errors in annotation processors
             e.printStackTrace();
             throw e;
-        } catch (Error e) {
-            e.printStackTrace();
-            throw e;
         }
     }
 
diff --git a/core/src/main/java/jenkins/diagnosis/HsErrPidList.java b/core/src/main/java/jenkins/diagnosis/HsErrPidList.java
index c497206431..cfe514be76 100644
--- a/core/src/main/java/jenkins/diagnosis/HsErrPidList.java
+++ b/core/src/main/java/jenkins/diagnosis/HsErrPidList.java
@@ -41,7 +41,7 @@ public class HsErrPidList extends AdministrativeMonitor {
     /**
      * hs_err_pid files that we think belong to us.
      */
-    /*package*/ final List<HsErrPidFile> files = new ArrayList<HsErrPidFile>();
+    /*package*/ final List<HsErrPidFile> files = new ArrayList<>();
 
     /**
      * Used to keep a marker file memory-mapped, so that we can find hs_err_pid files that belong to us.
diff --git a/core/src/main/java/jenkins/install/InstallUtil.java b/core/src/main/java/jenkins/install/InstallUtil.java
index 8ee5f1a57b..256d812906 100644
--- a/core/src/main/java/jenkins/install/InstallUtil.java
+++ b/core/src/main/java/jenkins/install/InstallUtil.java
@@ -316,7 +316,7 @@ public class InstallUtil {
 		return;
 	}
 	LOGGER.fine("Writing install state to: " + installingPluginsFile.getAbsolutePath());
-	Map<String,String> statuses = new HashMap<String,String>();
+	Map<String,String> statuses = new HashMap<>();
 	for(UpdateCenterJob j : installingPlugins) {
 		if(j instanceof InstallationJob && j.getCorrelationId() != null) { // only include install jobs with a correlation id (directly selected)
 			InstallationJob ij = (InstallationJob)j;
diff --git a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java b/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java
index 4e621ab53b..fd3c5edd6e 100644
--- a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java
+++ b/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java
@@ -47,7 +47,7 @@ public abstract class AsynchronousAdministrativeMonitor extends AdministrativeMo
      * Used to URL-bind {@link AnnotatedLargeText}.
      */
     public AnnotatedLargeText getLogText() {
-        return new AnnotatedLargeText<AsynchronousAdministrativeMonitor>(
+        return new AnnotatedLargeText<>(
                 getLogFile(), Charset.defaultCharset(),
                 !isFixingActive(), this);
     }
diff --git a/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java b/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java
index cb411800d9..3b5ce11b8e 100644
--- a/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java
+++ b/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java
@@ -45,7 +45,7 @@ public class ArtifactManagerConfiguration extends GlobalConfiguration implements
         return GlobalConfiguration.all().getInstance(ArtifactManagerConfiguration.class);
     }
 
-    private final DescribableList<ArtifactManagerFactory,ArtifactManagerFactoryDescriptor> artifactManagerFactories = new DescribableList<ArtifactManagerFactory,ArtifactManagerFactoryDescriptor>(this);
+    private final DescribableList<ArtifactManagerFactory,ArtifactManagerFactoryDescriptor> artifactManagerFactories = new DescribableList<>(this);
 
     private Object readResolve() {
         artifactManagerFactories.setOwner(this);
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 5f363a6f40..389453de3e 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -437,7 +437,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     /**
      * All {@link Item}s keyed by their {@link Item#getName() name}s.
      */
-    /*package*/ transient final Map<String,TopLevelItem> items = new CopyOnWriteMap.Tree<String,TopLevelItem>(CaseInsensitiveComparator.INSTANCE);
+    /*package*/ transient final Map<String,TopLevelItem> items = new CopyOnWriteMap.Tree<>(CaseInsensitiveComparator.INSTANCE);
 
     /**
      * The sole instance.
@@ -460,7 +460,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      */
     private transient static FileBoolean STARTUP_MARKER_FILE;
 
-    private volatile List<JDK> jdks = new ArrayList<JDK>();
+    private volatile List<JDK> jdks = new ArrayList<>();
 
     private transient volatile DependencyGraph dependencyGraph;
     private final transient AtomicBoolean dependencyGraphDirty = new AtomicBoolean();
@@ -490,7 +490,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     /**
      * {@link Computer}s in this Jenkins system. Read-only.
      */
-    protected transient final Map<Node,Computer> computers = new CopyOnWriteMap.Hash<Node,Computer>();
+    protected transient final Map<Node,Computer> computers = new CopyOnWriteMap.Hash<>();
 
     /**
      * Active {@link Cloud}s.
@@ -548,7 +548,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     /**
      * {@link View}s.
      */
-    private final CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<View>();
+    private final CopyOnWriteArrayList<View> views = new CopyOnWriteArrayList<>();
 
     /**
      * Name of the primary view.
@@ -583,7 +583,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     /**
      * List of registered {@link SCMListener}s.
      */
-    private transient final CopyOnWriteList<SCMListener> scmListeners = new CopyOnWriteList<SCMListener>();
+    private transient final CopyOnWriteList<SCMListener> scmListeners = new CopyOnWriteList<>();
 
     /**
      * TCP agent port.
@@ -652,7 +652,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * All labels known to Jenkins. This allows us to reuse the same label instances
      * as much as possible, even though that's not a strict requirement.
      */
-    private transient final ConcurrentHashMap<String,Label> labels = new ConcurrentHashMap<String,Label>();
+    private transient final ConcurrentHashMap<String,Label> labels = new ConcurrentHashMap<>();
 
     /**
      * Load statistics of the entire system.
@@ -696,17 +696,17 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * Transient action list. Useful for adding navigation items to the navigation bar
      * on the left.
      */
-    private transient final List<Action> actions = new CopyOnWriteArrayList<Action>();
+    private transient final List<Action> actions = new CopyOnWriteArrayList<>();
 
     /**
      * List of master node properties
      */
-    private DescribableList<NodeProperty<?>,NodePropertyDescriptor> nodeProperties = new DescribableList<NodeProperty<?>,NodePropertyDescriptor>(this);
+    private DescribableList<NodeProperty<?>,NodePropertyDescriptor> nodeProperties = new DescribableList<>(this);
 
     /**
      * List of global properties
      */
-    private DescribableList<NodeProperty<?>,NodePropertyDescriptor> globalNodeProperties = new DescribableList<NodeProperty<?>,NodePropertyDescriptor>(this);
+    private DescribableList<NodeProperty<?>,NodePropertyDescriptor> globalNodeProperties = new DescribableList<>(this);
 
     /**
      * {@link AdministrativeMonitor}s installed on this system.
@@ -1633,7 +1633,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * @return The plugin instances.
      */
     public <P extends Plugin> List<P> getPlugins(Class<P> clazz) {
-        List<P> result = new ArrayList<P>();
+        List<P> result = new ArrayList<>();
         for (PluginWrapper w: pluginManager.getPlugins(clazz)) {
             result.add((P)w.getPlugin());
         }
@@ -1729,7 +1729,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      */
     @Exported(name="jobs")
     public List<TopLevelItem> getItems() {
-        List<TopLevelItem> viewableItems = new ArrayList<TopLevelItem>();
+        List<TopLevelItem> viewableItems = new ArrayList<>();
         for (TopLevelItem item : items.values()) {
             if (item.hasPermission(Item.READ))
                 viewableItems.add(item);
@@ -1753,7 +1753,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * Gets just the immediate children of {@link Jenkins} but of the given type.
      */
     public <T> List<T> getItems(Class<T> type) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
         for (TopLevelItem i : getItems())
             if (type.isInstance(i))
                  r.add(type.cast(i));
@@ -1778,10 +1778,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * Gets the names of all the {@link Job}s.
      */
     public Collection<String> getJobNames() {
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         for (Job j : allItems(Job.class))
             names.add(j.getFullName());
-        Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
+        names.sort(String.CASE_INSENSITIVE_ORDER);
         return names;
     }
 
@@ -1793,7 +1793,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * Gets the names of all the {@link TopLevelItem}s.
      */
     public Collection<String> getTopLevelItemNames() {
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         for (TopLevelItem j : items.values())
             names.add(j.getName());
         return names;
@@ -1916,7 +1916,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * Gets the read-only list of all {@link Computer}s.
      */
     public Computer[] getComputers() {
-        Computer[] r = computers.values().toArray(new Computer[computers.size()]);
+        Computer[] r = computers.values().toArray(new Computer[0]);
         Arrays.sort(r,new Comparator<Computer>() {
             @Override public int compare(Computer lhs, Computer rhs) {
                 if(lhs.getNode()==Jenkins.this)  return -1;
@@ -1986,7 +1986,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * Gets all the active labels in the current system.
      */
     public Set<Label> getLabels() {
-        Set<Label> r = new TreeSet<Label>();
+        Set<Label> r = new TreeSet<>();
         for (Label l : labels.values()) {
             if(!l.isEmpty())
                 r.add(l);
@@ -1995,7 +1995,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     }
 
     public Set<LabelAtom> getLabelAtoms() {
-        Set<LabelAtom> r = new TreeSet<LabelAtom>();
+        Set<LabelAtom> r = new TreeSet<>();
         for (Label l : labels.values()) {
             if(!l.isEmpty() && l instanceof LabelAtom)
                 r.add((LabelAtom)l);
@@ -2024,7 +2024,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      */
     @Restricted(NoExternalUse.class)
     public void setJDKs(Collection<? extends JDK> jdks) {
-        this.jdks = new ArrayList<JDK>(jdks);
+        this.jdks = new ArrayList<>(jdks);
     }
 
     /**
@@ -3137,7 +3137,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         }
         File[] subdirs = projectsDir.listFiles();
 
-        final Set<String> loadedNames = Collections.synchronizedSet(new HashSet<String>());
+        final Set<String> loadedNames = Collections.synchronizedSet(new HashSet<>());
 
         TaskGraphBuilder g = new TaskGraphBuilder();
         Handle loadJenkins = g.requires(EXTENSIONS_AUGMENTED).attains(JOB_LOADED).add("Loading global config", new Executable() {
@@ -3170,7 +3170,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
             }));
         }
 
-        g.requires(loadJobs.toArray(new Handle[loadJobs.size()])).attains(JOB_LOADED).add("Cleaning up obsolete items deleted from the disk", new Executable() {
+        g.requires(loadJobs.toArray(new Handle[0])).attains(JOB_LOADED).add("Cleaning up obsolete items deleted from the disk", new Executable() {
             public void run(Reactor reactor) throws Exception {
                 // anything we didn't load from disk, throw them away.
                 // doing this after loading from disk allows newly loaded items
@@ -3403,9 +3403,6 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
                     LOGGER.log(lv, s);
                 }
             });
-        } catch (InterruptedException | ReactorException | IOException e) {
-            LOGGER.log(SEVERE, "Failed to execute termination",e);
-            errors.add(e);
         } catch (OutOfMemoryError e) {
             // we should just propagate this, no point trying to log
             throw e;
@@ -3421,7 +3418,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
 
     private Set<Future<?>> _cleanUpDisconnectComputers(final List<Throwable> errors) {
         LOGGER.log(Main.isUnitTest ? Level.FINE : Level.INFO, "Starting node disconnection");
-        final Set<Future<?>> pending = new HashSet<Future<?>>();
+        final Set<Future<?>> pending = new HashSet<>();
         // JENKINS-28840 we know we will be interrupting all the Computers so get the Queue lock once for all
         Queue.withLock(new Runnable() {
             @Override
@@ -3874,7 +3871,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         checkPermission(ADMINISTER);
 
         // issue the requests all at once
-        Map<String,Future<Map<String,String>>> future = new HashMap<String, Future<Map<String, String>>>();
+        Map<String,Future<Map<String,String>>> future = new HashMap<>();
 
         for (Computer c : getComputers()) {
             try {
@@ -3891,7 +3888,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         // this is a precaution against hang nodes
         long endTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(5);
 
-        Map<String,Map<String,String>> r = new HashMap<String, Map<String, String>>();
+        Map<String,Map<String,String>> r = new HashMap<>();
         for (Entry<String, Future<Map<String, String>>> e : future.entrySet()) {
             try {
                 r.put(e.getKey(), e.getValue().get(endTime-System.currentTimeMillis(), TimeUnit.MILLISECONDS));
@@ -3899,7 +3896,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
                 r.put(e.getKey(), Collections.singletonMap("Failed to retrieve thread dump", Functions.printThrowable(x)));
             }
         }
-        return Collections.unmodifiableSortedMap(new TreeMap<String, Map<String, String>>(r));
+        return Collections.unmodifiableSortedMap(new TreeMap<>(r));
     }
 
     @RequirePOST
@@ -4167,7 +4164,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         checkPermission(ADMINISTER);
 
         System.out.println("Creating artificial OutOfMemoryError situation");
-        List<Object> args = new ArrayList<Object>();
+        List<Object> args = new ArrayList<>();
         //noinspection InfiniteLoopStatement
         while (true)
             args.add(new byte[1024*1024]);
@@ -4599,8 +4596,8 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * Extension list that {@link #doResources(StaplerRequest, StaplerResponse)} can serve.
      * This set is mutable to allow plugins to add additional extensions.
      */
-    public static final Set<String> ALLOWED_RESOURCE_EXTENSIONS = new HashSet<String>(Arrays.asList(
-        "js|css|jpeg|jpg|png|gif|html|htm".split("\\|")
+    public static final Set<String> ALLOWED_RESOURCE_EXTENSIONS = new HashSet<>(Arrays.asList(
+            "js|css|jpeg|jpg|png|gif|html|htm".split("\\|")
     ));
 
     /**
@@ -4748,7 +4745,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * @since 1.495
      */
     public Collection<String> getUnprotectedRootActions() {
-        Set<String> names = new TreeSet<String>();
+        Set<String> names = new TreeSet<>();
         names.add("jnlpJars"); // TODO cleaner to refactor doJnlpJars into a URA
         // TODO consider caching (expiring cache when actions changes)
         for (Action a : getActions()) {
@@ -4992,7 +4989,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      */
     /*package*/ transient final ExecutorService threadPoolForLoad = new ThreadPoolExecutor(
         TWICE_CPU_NUM, TWICE_CPU_NUM,
-        5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new NamingThreadFactory(new DaemonThreadFactory(), "Jenkins load"));
+        5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new NamingThreadFactory(new DaemonThreadFactory(), "Jenkins load"));
 
 
     private static void computeVersion(ServletContext context) {
diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
index 3073ebb84d..e20e71289c 100644
--- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
+++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
@@ -66,7 +66,7 @@ public interface ModelObjectWithContextMenu extends ModelObject {
          * The actual contents of the menu.
          */
         @Exported(inline=true)
-        public final List<MenuItem> items = new ArrayList<MenuItem>();
+        public final List<MenuItem> items = new ArrayList<>();
         
         public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object o) throws IOException, ServletException {
             rsp.serveExposedBean(req,this,Flavor.JSON);
diff --git a/core/src/main/java/jenkins/model/Nodes.java b/core/src/main/java/jenkins/model/Nodes.java
index 24f9ac7431..adb08863b4 100644
--- a/core/src/main/java/jenkins/model/Nodes.java
+++ b/core/src/main/java/jenkins/model/Nodes.java
@@ -73,7 +73,7 @@ public class Nodes implements Saveable {
     /**
      * The map of nodes.
      */
-    private final ConcurrentMap<String, Node> nodes = new ConcurrentSkipListMap<String, Node>();
+    private final ConcurrentMap<String, Node> nodes = new ConcurrentSkipListMap<>();
 
     /**
      * Constructor, intended to be called only from {@link Jenkins}.
@@ -93,7 +93,7 @@ public class Nodes implements Saveable {
      */
     @Nonnull
     public List<Node> getNodes() {
-        return new ArrayList<Node>(nodes.values());
+        return new ArrayList<>(nodes.values());
     }
 
     /**
@@ -106,7 +106,7 @@ public class Nodes implements Saveable {
         Queue.withLock(new Runnable() {
             @Override
             public void run() {
-                Set<String> toRemove = new HashSet<String>(Nodes.this.nodes.keySet());
+                Set<String> toRemove = new HashSet<>(Nodes.this.nodes.keySet());
                 for (Node n : nodes) {
                     final String name = n.getNodeName();
                     toRemove.remove(name);
@@ -279,7 +279,7 @@ public class Nodes implements Saveable {
             return;
         }
         final File nodesDir = getNodesDir();
-        final Set<String> existing = new HashSet<String>();
+        final Set<String> existing = new HashSet<>();
         for (Node n : nodes.values()) {
             if (n instanceof EphemeralNode) {
                 continue;
@@ -322,7 +322,7 @@ public class Nodes implements Saveable {
                 return child.isDirectory();
             }
         });
-        final Map<String, Node> newNodes = new TreeMap<String, Node>();
+        final Map<String, Node> newNodes = new TreeMap<>();
         if (subdirs != null) {
             for (File subdir : subdirs) {
                 try {
@@ -339,11 +339,7 @@ public class Nodes implements Saveable {
         Queue.withLock(new Runnable() {
             @Override
             public void run() {
-                for (Iterator<Map.Entry<String, Node>> i = nodes.entrySet().iterator(); i.hasNext(); ) {
-                    if (!(i.next().getValue() instanceof EphemeralNode)) {
-                        i.remove();
-                    }
-                }
+                nodes.entrySet().removeIf(stringNodeEntry -> !(stringNodeEntry.getValue() instanceof EphemeralNode));
                 nodes.putAll(newNodes);
                 jenkins.updateComputerList();
                 jenkins.trimLabels();
diff --git a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
index 2f95dd4296..36d334b3ae 100644
--- a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
+++ b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
@@ -149,7 +149,7 @@ public abstract class ParameterizedJobMixIn<JobT extends Job<JobT, RunT> & Param
         if (!asJob().isBuildable())
             return null;
 
-        List<Action> queueActions = new ArrayList<Action>(actions);
+        List<Action> queueActions = new ArrayList<>(actions);
         if (isParameterized() && Util.filter(queueActions, ParametersAction.class).isEmpty()) {
             queueActions.add(new ParametersAction(getDefaultParametersValues()));
         }
@@ -158,7 +158,7 @@ public abstract class ParameterizedJobMixIn<JobT extends Job<JobT, RunT> & Param
 
     private List<ParameterValue> getDefaultParametersValues() {
         ParametersDefinitionProperty paramDefProp = asJob().getProperty(ParametersDefinitionProperty.class);
-        ArrayList<ParameterValue> defValues = new ArrayList<ParameterValue>();
+        ArrayList<ParameterValue> defValues = new ArrayList<>();
 
         /*
          * This check is made ONLY if someone will call this method even if isParametrized() is false.
@@ -285,7 +285,7 @@ public abstract class ParameterizedJobMixIn<JobT extends Job<JobT, RunT> & Param
      * @see #getBuildNowText
      * @since 1.624
      */
-    public static final AlternativeUiTextProvider.Message<ParameterizedJob> BUILD_NOW_TEXT = new AlternativeUiTextProvider.Message<ParameterizedJob>();
+    public static final AlternativeUiTextProvider.Message<ParameterizedJob> BUILD_NOW_TEXT = new AlternativeUiTextProvider.Message<>();
 
     /**
      * Suggested implementation of {@link ParameterizedJob#getBuildNowText}.
diff --git a/core/src/main/java/jenkins/model/PeepholePermalink.java b/core/src/main/java/jenkins/model/PeepholePermalink.java
index aa15eff6b2..4593c1da92 100644
--- a/core/src/main/java/jenkins/model/PeepholePermalink.java
+++ b/core/src/main/java/jenkins/model/PeepholePermalink.java
@@ -62,7 +62,7 @@ import org.apache.commons.io.FileUtils;
 public abstract class PeepholePermalink extends Permalink implements Predicate<Run<?,?>> {
 
     /** JENKINS-22822: avoids rereading symlinks */
-    static final Map<File,String> symlinks = new HashMap<File,String>();
+    static final Map<File,String> symlinks = new HashMap<>();
 
     /**
      * Checks if the given build satisfies the peep-hole criteria.
@@ -148,10 +148,7 @@ public abstract class PeepholePermalink extends Permalink implements Predicate<R
                 Util.createSymlink(job.getBuildDir(),b.getId(),target,TaskListener.NULL);
             }
             writeSymlink(cache, target);
-        } catch (IOException e) {
-            LOGGER.log(Level.WARNING, "Failed to update "+job+" "+getId()+" permalink for " + b, e);
-            cache.delete();
-        } catch (InterruptedException e) {
+        } catch (IOException | InterruptedException e) {
             LOGGER.log(Level.WARNING, "Failed to update "+job+" "+getId()+" permalink for " + b, e);
             cache.delete();
         }
diff --git a/core/src/main/java/jenkins/model/RunIdMigrator.java b/core/src/main/java/jenkins/model/RunIdMigrator.java
index 27482324fe..60e91ec48f 100644
--- a/core/src/main/java/jenkins/model/RunIdMigrator.java
+++ b/core/src/main/java/jenkins/model/RunIdMigrator.java
@@ -81,12 +81,12 @@ public final class RunIdMigrator {
     static final Logger LOGGER = Logger.getLogger(RunIdMigrator.class.getName());
     private static final String MAP_FILE = "legacyIds";
     /** avoids wasting a map for new jobs */
-    private static final Map<String,Integer> EMPTY = new TreeMap<String,Integer>();
+    private static final Map<String,Integer> EMPTY = new TreeMap<>();
 
     /**
      * Did we record "unmigrate" instruction for this $JENKINS_HOME? Yes if it's in the set.
      */
-    private static final Set<File> offeredToUnmigrate = Collections.synchronizedSet(new HashSet<File>());
+    private static final Set<File> offeredToUnmigrate = Collections.synchronizedSet(new HashSet<>());
 
     private @Nonnull Map<String,Integer> idToNumber = EMPTY;
 
@@ -103,7 +103,7 @@ public final class RunIdMigrator {
         if (f.length() == 0) {
             return true;
         }
-        idToNumber = new TreeMap<String,Integer>();
+        idToNumber = new TreeMap<>();
         try {
             for (String line : FileUtils.readLines(f)) {
                 int i = line.indexOf(' ');
@@ -190,10 +190,10 @@ public final class RunIdMigrator {
 
     private static final Pattern NUMBER_ELT = Pattern.compile("(?m)^  <number>(\\d+)</number>(\r?\n)");
     private void doMigrate(File dir) {
-        idToNumber = new TreeMap<String,Integer>();
+        idToNumber = new TreeMap<>();
         File[] kids = dir.listFiles();
         // Need to process symlinks first so we can rename to them.
-        List<File> kidsList = new ArrayList<File>(Arrays.asList(kids));
+        List<File> kidsList = new ArrayList<>(Arrays.asList(kids));
         Iterator<File> it = kidsList.iterator();
         while (it.hasNext()) {
             File kid = it.next();
diff --git a/core/src/main/java/jenkins/model/item_category/Categories.java b/core/src/main/java/jenkins/model/item_category/Categories.java
index fe188dafbe..4ae25096e6 100644
--- a/core/src/main/java/jenkins/model/item_category/Categories.java
+++ b/core/src/main/java/jenkins/model/item_category/Categories.java
@@ -55,7 +55,7 @@ public class Categories implements HttpResponse, Serializable {
     private List<Category> items;
 
     public Categories() {
-        items = new ArrayList<Category>();
+        items = new ArrayList<>();
     }
 
     @Exported(name = "categories")
diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
index b1d7ae6afe..6ede80cf59 100644
--- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
+++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
@@ -98,7 +98,7 @@ public abstract class AbstractLazyLoadRunMap<R> extends AbstractMap<Integer,R> i
      * Updated atomically. Once set to this field, the index object may not be modified.
      */
     private volatile Index index = new Index();
-    private LazyLoadRunMapEntrySet<R> entrySet = new LazyLoadRunMapEntrySet<R>(this);
+    private LazyLoadRunMapEntrySet<R> entrySet = new LazyLoadRunMapEntrySet<>(this);
 
     /**
      * Historical holder for map.
@@ -120,11 +120,11 @@ public abstract class AbstractLazyLoadRunMap<R> extends AbstractMap<Integer,R> i
         private final TreeMap<Integer,BuildReference<R>> byNumber;
 
         private Index() {
-            byNumber = new TreeMap<Integer,BuildReference<R>>(Collections.reverseOrder());
+            byNumber = new TreeMap<>(Collections.reverseOrder());
         }
 
         private Index(Index rhs) {
-            byNumber = new TreeMap<Integer,BuildReference<R>>(rhs.byNumber);
+            byNumber = new TreeMap<>(rhs.byNumber);
         }
     }
 
@@ -223,7 +223,7 @@ public abstract class AbstractLazyLoadRunMap<R> extends AbstractMap<Integer,R> i
      * Returns a read-only view of records that has already been loaded.
      */
     public SortedMap<Integer,R> getLoadedBuilds() {
-        return Collections.unmodifiableSortedMap(new BuildReferenceMapAdapter<R>(this, index.byNumber));
+        return Collections.unmodifiableSortedMap(new BuildReferenceMapAdapter<>(this, index.byNumber));
     }
 
     /**
@@ -249,7 +249,7 @@ public abstract class AbstractLazyLoadRunMap<R> extends AbstractMap<Integer,R> i
             assert i!=null;
         }
 
-        return Collections.unmodifiableSortedMap(new BuildReferenceMapAdapter<R>(this, index.byNumber.subMap(fromKey, toKey)));
+        return Collections.unmodifiableSortedMap(new BuildReferenceMapAdapter<>(this, index.byNumber.subMap(fromKey, toKey)));
     }
 
     public SortedMap<Integer, R> headMap(Integer toKey) {
@@ -532,7 +532,7 @@ public abstract class AbstractLazyLoadRunMap<R> extends AbstractMap<Integer,R> i
      * Allow subtype to capture a reference.
      */
     protected BuildReference<R> createReference(R r) {
-        return new BuildReference<R>(getIdOf(r),r);
+        return new BuildReference<>(getIdOf(r), r);
     }
 
 
diff --git a/core/src/main/java/jenkins/model/lazy/BuildReference.java b/core/src/main/java/jenkins/model/lazy/BuildReference.java
index 25f460b27f..7b6f0ec1de 100644
--- a/core/src/main/java/jenkins/model/lazy/BuildReference.java
+++ b/core/src/main/java/jenkins/model/lazy/BuildReference.java
@@ -115,7 +115,7 @@ public final class BuildReference<R> {
     private static <R> Holder<R> findHolder(R referent) {
         if (referent == null) {
             // AbstractBuild.NONE
-            return new DefaultHolderFactory.NoHolder<R>();
+            return new DefaultHolderFactory.NoHolder<>();
         }
         for (HolderFactory f : ExtensionList.lookup(HolderFactory.class)) {
             Holder<R> h = f.make(referent);
@@ -149,13 +149,13 @@ public final class BuildReference<R> {
 
         @Override public <R> Holder<R> make(R referent) {
             if (mode == null || mode.equals("soft")) {
-                return new SoftHolder<R>(referent);
+                return new SoftHolder<>(referent);
             } else if (mode.equals("weak")) {
-                return new WeakHolder<R>(referent);
+                return new WeakHolder<>(referent);
             } else if (mode.equals("strong")) {
-                return new StrongHolder<R>(referent);
+                return new StrongHolder<>(referent);
             } else if (mode.equals("none")) {
-                return new NoHolder<R>();
+                return new NoHolder<>();
             } else {
                 throw new IllegalStateException("unrecognized value of " + MODE_PROPERTY + ": " + mode);
             }
diff --git a/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java b/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java
index 362138a2ac..9ae3dce28b 100644
--- a/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java
+++ b/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java
@@ -56,15 +56,15 @@ class BuildReferenceMapAdapter<R> implements SortedMap<Integer,R> {
     }
 
     public SortedMap<Integer, R> subMap(Integer fromKey, Integer toKey) {
-        return new BuildReferenceMapAdapter<R>(loader,core.subMap(fromKey, toKey));
+        return new BuildReferenceMapAdapter<>(loader, core.subMap(fromKey, toKey));
     }
 
     public SortedMap<Integer, R> headMap(Integer toKey) {
-        return new BuildReferenceMapAdapter<R>(loader,core.headMap(toKey));
+        return new BuildReferenceMapAdapter<>(loader, core.headMap(toKey));
     }
 
     public SortedMap<Integer, R> tailMap(Integer fromKey) {
-        return new BuildReferenceMapAdapter<R>(loader,core.tailMap(fromKey));
+        return new BuildReferenceMapAdapter<>(loader, core.tailMap(fromKey));
     }
 
     public Integer firstKey() {
@@ -135,7 +135,7 @@ class BuildReferenceMapAdapter<R> implements SortedMap<Integer,R> {
     }
 
     @Override public String toString() {
-        return new LinkedHashMap<Integer,R>(this).toString();
+        return new LinkedHashMap<>(this).toString();
     }
 
     private class CollectionAdapter implements Collection<R> {
@@ -169,9 +169,8 @@ class BuildReferenceMapAdapter<R> implements SortedMap<Integer,R> {
         }
 
         public Object[] toArray() {
-            List<Object> list = new ArrayList<Object>();
-            for (R r : this)
-                list.add(r);
+            List<Object> list = new ArrayList<>();
+            list.addAll(this);
             return list.toArray();
         }
 
@@ -274,9 +273,8 @@ class BuildReferenceMapAdapter<R> implements SortedMap<Integer,R> {
         }
 
         public Object[] toArray() {
-            List<Object> list = new ArrayList<Object>();
-            for (Entry<Integer, R> r : this)
-                list.add(r);
+            List<Object> list = new ArrayList<>();
+            list.addAll(this);
             return list.toArray();
         }
 
diff --git a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
index b01c4a2431..43a5c251c3 100644
--- a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
+++ b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
@@ -62,7 +62,7 @@ public abstract class LazyBuildMixIn<JobT extends Job<JobT,RunT> & Queue.Task &
     private static final Logger LOGGER = Logger.getLogger(LazyBuildMixIn.class.getName());
 
     @SuppressWarnings("deprecation") // [JENKINS-15156] builds accessed before onLoad or onCreatedFromScratch called
-    private @Nonnull RunMap<RunT> builds = new RunMap<RunT>();
+    private @Nonnull RunMap<RunT> builds = new RunMap<>();
 
     /**
      * Initializes this mixin.
@@ -137,8 +137,9 @@ public abstract class LazyBuildMixIn<JobT extends Job<JobT,RunT> & Queue.Task &
     }
 
     private RunMap<RunT> createBuildRunMap() {
-        RunMap<RunT> r = new RunMap<RunT>(asJob().getBuildDir(), new RunMap.Constructor<RunT>() {
-            @Override public RunT create(File dir) throws IOException {
+        RunMap<RunT> r = new RunMap<>(asJob().getBuildDir(), new RunMap.Constructor<RunT>() {
+            @Override
+            public RunT create(File dir) throws IOException {
                 return loadBuild(dir);
             }
         });
@@ -163,14 +164,10 @@ public abstract class LazyBuildMixIn<JobT extends Job<JobT,RunT> & Queue.Task &
     public RunT loadBuild(File dir) throws IOException {
         try {
             return getBuildClass().getConstructor(asJob().getClass(), File.class).newInstance(asJob(), dir);
-        } catch (InstantiationException e) {
-            throw new Error(e);
-        } catch (IllegalAccessException e) {
+        } catch (InstantiationException | NoSuchMethodException | IllegalAccessException e) {
             throw new Error(e);
         } catch (InvocationTargetException e) {
             throw handleInvocationTargetException(e);
-        } catch (NoSuchMethodException e) {
-            throw new Error(e);
         }
     }
 
@@ -329,7 +326,7 @@ public abstract class LazyBuildMixIn<JobT extends Job<JobT,RunT> & Queue.Task &
          */
         public final synchronized BuildReference<RunT> createReference() {
             if (selfReference == null) {
-                selfReference = new BuildReference<RunT>(asRun().getId(), asRun());
+                selfReference = new BuildReference<>(asRun().getId(), asRun());
             }
             return selfReference;
         }
diff --git a/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java b/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java
index 48aada93e0..a102a0ddcd 100644
--- a/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java
+++ b/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java
@@ -28,7 +28,7 @@ class LazyLoadRunMapEntrySet<R> extends AbstractSet<Entry<Integer,R>> {
 
     private synchronized Set<Entry<Integer,R>> all() {
         if (all==null)
-            all = new BuildReferenceMapAdapter<R>(owner,owner.all()).entrySet();
+            all = new BuildReferenceMapAdapter<>(owner, owner.all()).entrySet();
         return all;
     }
 
@@ -78,7 +78,7 @@ class LazyLoadRunMapEntrySet<R> extends AbstractSet<Entry<Integer,R>> {
             }
 
             private Entry<Integer, R> entryOf(R r) {
-                return new SimpleImmutableEntry<Integer, R>(owner.getNumberOf(r),r);
+                return new SimpleImmutableEntry<>(owner.getNumberOf(r), r);
             }
 
             public void remove() {
diff --git a/core/src/main/java/jenkins/model/lazy/SortedList.java b/core/src/main/java/jenkins/model/lazy/SortedList.java
index fe66057693..7d7424222a 100644
--- a/core/src/main/java/jenkins/model/lazy/SortedList.java
+++ b/core/src/main/java/jenkins/model/lazy/SortedList.java
@@ -38,7 +38,7 @@ class SortedList<T extends Comparable<T>> extends AbstractList<T> {
     private List<T> data;
 
     public SortedList(List<T> data) {
-        this.data = new ArrayList<T>(data);
+        this.data = new ArrayList<>(data);
         assert isSorted();
     }
 
diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java
index 59ac7ceb2b..25e0466900 100644
--- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java
+++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java
@@ -142,14 +142,14 @@ public class InetAddressValidator implements Serializable {
         }
         String[] octets = inet6Address.split(":");
         if (containsCompressedZeroes) {
-            List<String> octetList = new ArrayList<String>(Arrays.asList(octets));
+            List<String> octetList = new ArrayList<>(Arrays.asList(octets));
             if (inet6Address.endsWith("::")) {
                 // String.split() drops ending empty segments
                 octetList.add("");
             } else if (inet6Address.startsWith("::") && !octetList.isEmpty()) {
                 octetList.remove(0);
             }
-            octets = octetList.toArray(new String[octetList.size()]);
+            octets = octetList.toArray(new String[0]);
         }
         if (octets.length > IPV6_MAX_HEX_GROUPS) {
             return false;
diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java
index 3d7e082f35..1e0b810f0b 100644
--- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java
+++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java
@@ -283,7 +283,7 @@ public class UrlValidator implements Serializable {
             if (schemes == null) {
                 schemes = DEFAULT_SCHEMES;
             }
-            allowedSchemes = new HashSet<String>(schemes.length);
+            allowedSchemes = new HashSet<>(schemes.length);
             for (String scheme : schemes) {
                 allowedSchemes.add(scheme.toLowerCase(Locale.ENGLISH));
             }
diff --git a/core/src/main/java/jenkins/security/ApiTokenProperty.java b/core/src/main/java/jenkins/security/ApiTokenProperty.java
index 9cb01b6268..c429c062cd 100644
--- a/core/src/main/java/jenkins/security/ApiTokenProperty.java
+++ b/core/src/main/java/jenkins/security/ApiTokenProperty.java
@@ -474,7 +474,7 @@ public class ApiTokenProperty extends UserProperty {
             
             final String tokenName;
             if (StringUtils.isBlank(newTokenName)) {
-                tokenName = String.format("Token created on %s", DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.now()));
+                tokenName = Messages.Token_Created_on(DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.now()));
             }else{
                 tokenName = newTokenName;
             }
diff --git a/core/src/main/java/jenkins/security/ExceptionTranslationFilter.java b/core/src/main/java/jenkins/security/ExceptionTranslationFilter.java
index 24755588b0..0d7bd1ee17 100644
--- a/core/src/main/java/jenkins/security/ExceptionTranslationFilter.java
+++ b/core/src/main/java/jenkins/security/ExceptionTranslationFilter.java
@@ -118,13 +118,9 @@ public class ExceptionTranslationFilter implements Filter, InitializingBean {
 
 			LOGGER.finer("Chain processed normally");
 		}
-		catch (AuthenticationException ex) {
+		catch (AuthenticationException | AccessDeniedException ex) {
 			handleException(request, response, chain, ex);
-		}
-		catch (AccessDeniedException ex) {
-			handleException(request, response, chain, ex);
-		}
-		catch (ServletException ex) {
+		} catch (ServletException ex) {
 			if (ex.getRootCause() instanceof AuthenticationException
 					|| ex.getRootCause() instanceof AccessDeniedException) {
 				handleException(request, response, chain, (AcegiSecurityException) ex.getRootCause());
diff --git a/core/src/main/java/jenkins/security/HMACConfidentialKey.java b/core/src/main/java/jenkins/security/HMACConfidentialKey.java
index 3d34dbb4ff..750f06e8f1 100644
--- a/core/src/main/java/jenkins/security/HMACConfidentialKey.java
+++ b/core/src/main/java/jenkins/security/HMACConfidentialKey.java
@@ -129,9 +129,7 @@ public class HMACConfidentialKey extends ConfidentialKey {
                             store(encoded=key.getEncoded());
                         }
                         key = new SecretKeySpec(encoded,ALGORITHM);
-                    } catch (IOException e) {
-                        throw new Error("Failed to load the key: "+getId(),e);
-                    } catch (NoSuchAlgorithmException e) {
+                    } catch (IOException | NoSuchAlgorithmException e) {
                         throw new Error("Failed to load the key: "+getId(),e);
                     }
                 }
diff --git a/core/src/main/java/jenkins/security/ImpersonatingUserDetailsService.java b/core/src/main/java/jenkins/security/ImpersonatingUserDetailsService.java
index 2df00eafa0..0c97d5d48c 100644
--- a/core/src/main/java/jenkins/security/ImpersonatingUserDetailsService.java
+++ b/core/src/main/java/jenkins/security/ImpersonatingUserDetailsService.java
@@ -28,9 +28,7 @@ public class ImpersonatingUserDetailsService implements UserDetailsService {
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException {
         try {
             return base.loadUserByUsername(username);
-        } catch (UserMayOrMayNotExistException e) {
-            return attemptToImpersonate(username, e);
-        } catch (DataAccessException e) {
+        } catch (UserMayOrMayNotExistException | DataAccessException e) {
             return attemptToImpersonate(username, e);
         }
     }
diff --git a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
index 2f851ac2d7..34a2064c5f 100644
--- a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
+++ b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
@@ -63,18 +63,18 @@ public class LastGrantedAuthoritiesProperty extends UserProperty {
             }
         }
 
-        return grantedAuthorities.toArray(new GrantedAuthority[grantedAuthorities.size()]);
+        return grantedAuthorities.toArray(new GrantedAuthority[0]);
     }
 
     /**
      * Persist the information with the new {@link UserDetails}.
      */
     public void update(@Nonnull Authentication auth) throws IOException {
-        List<String> roles = new ArrayList<String>();
+        List<String> roles = new ArrayList<>();
         for (GrantedAuthority ga : auth.getAuthorities()) {
             roles.add(ga.getAuthority());
         }
-        String[] a = roles.toArray(new String[roles.size()]);
+        String[] a = roles.toArray(new String[0]);
         if (!Arrays.equals(this.roles,a)) {
             this.roles = a;
             this.timestamp = System.currentTimeMillis();
diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java
index 4b5b15fb01..b814cc61d5 100644
--- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java
+++ b/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java
@@ -23,7 +23,7 @@ import java.util.List;
 @Extension @Symbol("queueItemAuthenticator")
 public class QueueItemAuthenticatorConfiguration extends GlobalConfiguration implements PersistentDescriptor {
     private final DescribableList<QueueItemAuthenticator,QueueItemAuthenticatorDescriptor> authenticators
-        = new DescribableList<QueueItemAuthenticator, QueueItemAuthenticatorDescriptor>(this);
+        = new DescribableList<>(this);
 
     private Object readResolve() {
         authenticators.setOwner(this);
diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
index dbdca64a1a..98572c825d 100644
--- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
+++ b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
@@ -41,7 +41,7 @@ public abstract class QueueItemAuthenticatorProvider implements ExtensionPoint {
                 if (provider == null) {
                     continue;
                 }
-                delegate = new ArrayList<QueueItemAuthenticator>(provider.getAuthenticators()).iterator();
+                delegate = new ArrayList<>(provider.getAuthenticators()).iterator();
             }
             return delegate != null && delegate.hasNext();
         }
diff --git a/core/src/main/java/jenkins/security/RSAConfidentialKey.java b/core/src/main/java/jenkins/security/RSAConfidentialKey.java
index c8a065f10b..b0d62e5b8b 100644
--- a/core/src/main/java/jenkins/security/RSAConfidentialKey.java
+++ b/core/src/main/java/jenkins/security/RSAConfidentialKey.java
@@ -90,9 +90,7 @@ public abstract class RSAConfidentialKey extends ConfidentialKey {
                 }
             }
             return priv;
-        } catch (IOException e) {
-            throw new Error("Failed to load the key: " + getId(), e);
-        } catch (GeneralSecurityException e) {
+        } catch (IOException | GeneralSecurityException e) {
             throw new Error("Failed to load the key: " + getId(), e);
         }
     }
diff --git a/core/src/main/java/jenkins/security/SecurityListener.java b/core/src/main/java/jenkins/security/SecurityListener.java
index 7b28bc5e07..21e5624c5f 100644
--- a/core/src/main/java/jenkins/security/SecurityListener.java
+++ b/core/src/main/java/jenkins/security/SecurityListener.java
@@ -93,7 +93,7 @@ public abstract class SecurityListener implements ExtensionPoint {
     /** @since 1.569 */
     public static void fireAuthenticated(@Nonnull UserDetails details) {
         if (LOGGER.isLoggable(Level.FINE)) {
-            List<String> groups = new ArrayList<String>();
+            List<String> groups = new ArrayList<>();
             for (GrantedAuthority auth : details.getAuthorities()) {
                 if (!auth.equals(SecurityRealm.AUTHENTICATED_AUTHORITY)) {
                     groups.add(auth.getAuthority());
diff --git a/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java b/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java
index ef376b0e5b..d19b2b8034 100644
--- a/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java
+++ b/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java
@@ -112,7 +112,7 @@ public class UpdateSiteWarningsMonitor extends AdministrativeMonitor {
             PluginWrapper plugin = Jenkins.getInstance().getPluginManager().getPlugin(pluginName);
 
             if (!activePluginWarningsByPlugin.containsKey(plugin)) {
-                activePluginWarningsByPlugin.put(plugin, new ArrayList<UpdateSite.Warning>());
+                activePluginWarningsByPlugin.put(plugin, new ArrayList<>());
             }
             activePluginWarningsByPlugin.get(plugin).add(warning);
         }
diff --git a/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java b/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java
index fecdfb7a1f..b9e4a453bb 100644
--- a/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java
+++ b/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java
@@ -27,7 +27,7 @@ public class CallableRejectionConfig extends ConfigFile<Class,Set<Class>> {
 
     @Override
     protected Set<Class> create() {
-        return new HashSet<Class>();
+        return new HashSet<>();
     }
 
     @Override
@@ -66,7 +66,7 @@ public class CallableRejectionConfig extends ConfigFile<Class,Set<Class>> {
      * Return the object that helps the UI rendering by providing the details.
      */
     public List<RejectedCallable> describe() {
-        List<RejectedCallable> l = new ArrayList<RejectedCallable>();
+        List<RejectedCallable> l = new ArrayList<>();
         for (Class c : get()) {
             if (!whitelist.contains(c.getName()))
                 l.add(new RejectedCallable(c));
diff --git a/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java b/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java
index a56d5f8b33..efc9f331f2 100644
--- a/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java
+++ b/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java
@@ -20,7 +20,7 @@ class CallableWhitelistConfig extends ConfigDirectory<String,Set<String>> {
 
     @Override
     protected Set<String> create() {
-        return new HashSet<String>();
+        return new HashSet<>();
     }
 
     @Override
diff --git a/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java b/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java
index 122d7e687d..0ebaa9a8a0 100644
--- a/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java
+++ b/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java
@@ -26,7 +26,7 @@ class FilePathRuleConfig extends ConfigDirectory<FilePathRule,List<FilePathRule>
 
     @Override
     protected List<FilePathRule> create() {
-        return new ArrayList<FilePathRule>();
+        return new ArrayList<>();
     }
 
     @Override
diff --git a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java
index e9495e9ec5..2a9645bd42 100644
--- a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java
+++ b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java
@@ -82,11 +82,7 @@ public class JnlpSlaveRestarterInstaller extends ComputerListener implements Ser
             }
 
             // filter out ones that doesn't apply
-            for (Iterator<SlaveRestarter> itr = restarters.iterator(); itr.hasNext(); ) {
-                SlaveRestarter r =  itr.next();
-                if (!r.canWork())
-                    itr.remove();
-            }
+            restarters.removeIf(r -> !r.canWork());
 
             e.addListener(new EngineListenerAdapter() {
                 @Override
diff --git a/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java b/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java
index 086c044efa..0a48762891 100644
--- a/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java
+++ b/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java
@@ -54,7 +54,7 @@ public class UnixSlaveRestarter extends SlaveRestarter {
 
         // exec to self
         String exe = Daemon.getCurrentExecutable();
-        LIBC.execv(exe, new StringArray(args.toArray(new String[args.size()])));
+        LIBC.execv(exe, new StringArray(args.toArray(new String[0])));
         throw new IOException("Failed to exec '" + exe + "' " + LIBC.strerror(Native.getLastError()));
     }
 
diff --git a/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java b/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java
index e2da11b2bf..20ead80606 100644
--- a/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java
+++ b/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java
@@ -82,7 +82,7 @@ public abstract class SimpleBuildWrapper extends BuildWrapper {
      */
     public static final class Context {
         private Disposer disposer;
-        private final Map<String,String> env = new HashMap<String,String>();
+        private final Map<String,String> env = new HashMap<>();
         public @Nonnull Map<String,String> getEnv() {
             return env;
         }
diff --git a/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java b/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
index c601cebc26..434a10c09d 100644
--- a/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
+++ b/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
@@ -266,11 +266,7 @@ public final class ReverseBuildTrigger extends Trigger<Job> implements Dependenc
                         if (upstream instanceof AbstractProject && downstream instanceof AbstractProject) {
                             continue; // handled specially
                         }
-                        Collection<ReverseBuildTrigger> triggers = result.get(upstream);
-                        if (triggers == null) {
-                            triggers = new LinkedList<>();
-                            result.put(upstream, triggers);
-                        }
+                        Collection<ReverseBuildTrigger> triggers = result.computeIfAbsent(upstream, k -> new LinkedList<>());
                         triggers.remove(trigger);
                         triggers.add(trigger);
                     }
diff --git a/core/src/main/java/jenkins/util/DirectedGraph.java b/core/src/main/java/jenkins/util/DirectedGraph.java
index ff7c1da0f2..4cf248d9f4 100644
--- a/core/src/main/java/jenkins/util/DirectedGraph.java
+++ b/core/src/main/java/jenkins/util/DirectedGraph.java
@@ -44,7 +44,7 @@ public abstract class DirectedGraph<N> {
          */
         public final int index;
 
-        private final List<N> members = new ArrayList<N>();
+        private final List<N> members = new ArrayList<>();
 
         public SCC(int index) {
             this.index = index;
@@ -94,12 +94,12 @@ public abstract class DirectedGraph<N> {
      * See http://en.wikipedia.org/wiki/Tarjan's_strongly_connected_components_algorithm
      */
     public List<SCC<N>> getStronglyConnectedComponents() {
-        final Map<N, Node> nodes = new HashMap<N, Node>();
+        final Map<N, Node> nodes = new HashMap<>();
         for (N n : nodes()) {
             nodes.put(n,new Node(n));
         }
 
-        final List<SCC<N>> sccs = new ArrayList<SCC<N>>();
+        final List<SCC<N>> sccs = new ArrayList<>();
 
         class Tarjan {
             int index = 0;
@@ -107,7 +107,7 @@ public abstract class DirectedGraph<N> {
             /**
              * Nodes not yet classified for the strongly connected components
              */
-            Stack<Node> pending = new Stack<Node>();
+            Stack<Node> pending = new Stack<>();
             
             void traverse() {
                 for (Node n : nodes.values()) {
@@ -133,7 +133,7 @@ public abstract class DirectedGraph<N> {
 
                 if (v.lowlink==v.index) {
                     // found a new SCC
-                    SCC<N> scc = new SCC<N>(sccIndex++);
+                    SCC<N> scc = new SCC<>(sccIndex++);
                     sccs.add(scc);
 
                     Node w;
diff --git a/core/src/main/java/jenkins/util/InterceptingExecutorService.java b/core/src/main/java/jenkins/util/InterceptingExecutorService.java
index 8af246cd05..2141ea9e53 100644
--- a/core/src/main/java/jenkins/util/InterceptingExecutorService.java
+++ b/core/src/main/java/jenkins/util/InterceptingExecutorService.java
@@ -75,7 +75,7 @@ public abstract class InterceptingExecutorService extends ForwardingExecutorServ
     }
 
     private <T> Collection<Callable<T>> wrap(Collection<? extends Callable<T>> callables) {
-        List<Callable<T>> r = new ArrayList<Callable<T>>();
+        List<Callable<T>> r = new ArrayList<>();
         for (Callable<T> c : callables) {
             r.add(wrap(c));
         }
diff --git a/core/src/main/java/jenkins/util/JSONSignatureValidator.java b/core/src/main/java/jenkins/util/JSONSignatureValidator.java
index ec6f20da9b..60e925cb27 100644
--- a/core/src/main/java/jenkins/util/JSONSignatureValidator.java
+++ b/core/src/main/java/jenkins/util/JSONSignatureValidator.java
@@ -65,7 +65,7 @@ public class JSONSignatureValidator {
             }
             o.remove("signature");
 
-            List<X509Certificate> certs = new ArrayList<X509Certificate>();
+            List<X509Certificate> certs = new ArrayList<>();
             {// load and verify certificates
                 CertificateFactory cf = CertificateFactory.getInstance("X509");
                 for (Object cert : signature.getJSONArray("certificates")) {
@@ -243,7 +243,7 @@ public class JSONSignatureValidator {
     protected Set<TrustAnchor> loadTrustAnchors(CertificateFactory cf) throws IOException {
         // if we trust default root CAs, we end up trusting anyone who has a valid certificate,
         // which isn't useful at all
-        Set<TrustAnchor> anchors = new HashSet<TrustAnchor>(); // CertificateUtil.getDefaultRootCAs();
+        Set<TrustAnchor> anchors = new HashSet<>(); // CertificateUtil.getDefaultRootCAs();
         Jenkins j = Jenkins.getInstance();
         for (String cert : (Set<String>) j.servletContext.getResourcePaths("/WEB-INF/update-center-rootCAs")) {
             if (cert.endsWith("/") || cert.endsWith(".txt"))  {
diff --git a/core/src/main/java/jenkins/util/ProgressiveRendering.java b/core/src/main/java/jenkins/util/ProgressiveRendering.java
index e675b945f4..e3f74770ab 100644
--- a/core/src/main/java/jenkins/util/ProgressiveRendering.java
+++ b/core/src/main/java/jenkins/util/ProgressiveRendering.java
@@ -161,7 +161,7 @@ public abstract class ProgressiveRendering {
     private static RequestImpl createMockRequest() {
         RequestImpl currentRequest = (RequestImpl) Stapler.getCurrentRequest();
         HttpServletRequest original = (HttpServletRequest) currentRequest.getRequest();
-        final Map<String,Object> getters = new HashMap<String,Object>();
+        final Map<String,Object> getters = new HashMap<>();
         for (Method method : HttpServletRequest.class.getMethods()) {
             String m = method.getName();
             if ((m.startsWith("get") || m.startsWith("is")) && method.getParameterTypes().length == 0) {
diff --git a/core/src/main/java/jenkins/util/TreeString.java b/core/src/main/java/jenkins/util/TreeString.java
index 09ea85a93e..6d54889144 100644
--- a/core/src/main/java/jenkins/util/TreeString.java
+++ b/core/src/main/java/jenkins/util/TreeString.java
@@ -26,7 +26,6 @@ package jenkins.util;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.thoughtworks.xstream.XStream;
@@ -125,7 +124,9 @@ public final class TreeString implements Serializable {
     public int hashCode() {
         int h = parent == null ? 0 : parent.hashCode();
 
-        h = 31 * h + ArrayUtils.hashCode(label);
+        for (char c : label) {
+            h = 31 * h + c;
+        }
 
         assert toString().hashCode() == h;
         return h;
diff --git a/core/src/main/java/jenkins/util/VirtualFile.java b/core/src/main/java/jenkins/util/VirtualFile.java
index 0cce3d1a65..80a747143b 100644
--- a/core/src/main/java/jenkins/util/VirtualFile.java
+++ b/core/src/main/java/jenkins/util/VirtualFile.java
@@ -855,7 +855,7 @@ public abstract class VirtualFile implements Comparable<VirtualFile>, Serializab
             if (includes.isEmpty()) { // see Glob class Javadoc, and list(String, String, boolean) note
                 return Collections.emptyList();
             }
-            final List<String> paths = new ArrayList<String>();
+            final List<String> paths = new ArrayList<>();
             new DirScanner.Glob(includes, excludes, useDefaultExcludes).scan(f, new FileVisitor() {
                 @Override
                 public void visit(File f, String relativePath) throws IOException {
diff --git a/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java b/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java
index 4f15ed4965..4032541fe2 100644
--- a/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java
+++ b/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java
@@ -83,7 +83,7 @@ public class GroovyHookScript {
         Set<String> resources = servletContext.getResourcePaths("/WEB-INF/"+ hookGroovyD +"/");
         if (resources!=null) {
             // sort to execute them in a deterministic order
-            for (String res : new TreeSet<String>(resources)) {
+            for (String res : new TreeSet<>(resources)) {
                 try {
                     URL bundled = servletContext.getResource(res);
                     execute(bundled);
diff --git a/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java b/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java
index 81048283de..bc2d3ad5d1 100644
--- a/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java
+++ b/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java
@@ -52,7 +52,7 @@ public class FilteredFunctionContext implements FunctionContext {
     /**
      * Default set of "bad" function names.
      */
-    private static final Set<String> DEFAULT_ILLEGAL_FUNCTIONS = Collections.unmodifiableSet(new HashSet<String>(
+    private static final Set<String> DEFAULT_ILLEGAL_FUNCTIONS = Collections.unmodifiableSet(new HashSet<>(
             Arrays.asList("document")
     ));
     private final FunctionContext base;
diff --git a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java
index 2b2ed1621b..b5735b0178 100644
--- a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java
+++ b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java
@@ -181,13 +181,14 @@ public class XStreamDOM {
     public XStreamDOM expandMacro(VariableResolver<String> vars) {
         String[] newAttributes = new String[attributes.length];
         for (int i=0; i<attributes.length; i+=2) {
+            //noinspection PointlessArithmeticExpression
             newAttributes[i+0] = attributes[i]; // name
             newAttributes[i+1] = Util.replaceMacro(attributes[i+1],vars);
         }
 
         List<XStreamDOM> newChildren = null;
         if (children!=null) {
-            newChildren = new ArrayList<XStreamDOM>(children.size());
+            newChildren = new ArrayList<>(children.size());
             for (XStreamDOM d : children)
                 newChildren.add(d.expandMacro(vars));
         }
@@ -274,7 +275,7 @@ public class XStreamDOM {
     }
 
     public Map<String, String> getAttributeMap() {
-        Map<String,String> r = new HashMap<String, String>();
+        Map<String,String> r = new HashMap<>();
         for (int i=0; i<attributes.length; i+=2)
             r.put(attributes[i],attributes[i+1]);
         return r;
@@ -315,7 +316,7 @@ public class XStreamDOM {
             }
         }
 
-        private final Stack<Pointer> pointers = new Stack<Pointer>();
+        private final Stack<Pointer> pointers = new Stack<>();
 
 
         public ReaderImpl(XStreamDOM current) {
diff --git a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java
index 521ace8b79..f152e6b05e 100644
--- a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java
+++ b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java
@@ -235,7 +235,7 @@ public class HistoryPageFilter<T> {
         // Queue items can start building out of order with how they got added to the queue. Sorting them
         // before adding to the page. They'll still get displayed before the building items coz they end
         // up in a different list in HistoryPageFilter.
-        Collections.sort(items, new Comparator<Object>() {
+        items.sort(new Comparator<Object>() {
             @Override
             public int compare(Object o1, Object o2) {
                 long o1QID = HistoryPageEntry.getEntryId(o1);
diff --git a/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java b/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java
index b7ec216f1a..045a6da585 100644
--- a/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java
+++ b/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java
@@ -47,7 +47,7 @@ public abstract class RunListProgressiveRendering extends ProgressiveRendering {
      * but then like Zeno’s paradox we will never seem to finish until we actually do.
      */
     private static final double MAX_LIKELY_RUNS = 20;
-    private final List<JSONObject> results = new ArrayList<JSONObject>();
+    private final List<JSONObject> results = new ArrayList<>();
     private Iterable<? extends Run<?,?>> builds;
 
     /** Jelly cannot call a constructor with arguments. */
diff --git a/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly b/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
index 85471432ae..879acdca5a 100644
--- a/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
+++ b/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
@@ -39,6 +39,8 @@ THE SOFTWARE.
   <st:header name="X-Instance-Identity" value="${app.tcpSlaveAgentListener.identityPublicKey}" />
   <!-- reduce the number of client connection attempts during protocol negotiation -->
   <st:header name="X-Jenkins-Agent-Protocols" value="${app.tcpSlaveAgentListener.agentProtocolNames}"/>
+  <!-- publish minimum supported version of remoting agent -->
+  <st:header name="X-Remoting-Minimum-Version" value="${app.tcpSlaveAgentListener.remotingMinimumVersion}"/>
 
   Jenkins
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/PasswordParameterDefinition/help.html b/core/src/main/resources/hudson/model/PasswordParameterDefinition/help.html
new file mode 100644
index 0000000000..0b9e3662e5
--- /dev/null
+++ b/core/src/main/resources/hudson/model/PasswordParameterDefinition/help.html
@@ -0,0 +1,5 @@
+<div>
+    Pass a password to your build.
+    The password entered here is made available to the build in plain text as an environment variable like a string parameter would be.
+    The value will be stored encrypted on the Jenkins master, similar to passwords in Jenkins configuration.
+</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
index c6a016f60e..05c9901b91 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson"
   xmlns:f="/lib/form">
   <f:entry field="allowsSignup">
-    <f:checkbox default="true" title="${%Allow users to sign up}"/>
+    <f:checkbox default="false" title="${%Allow users to sign up}"/>
   </f:entry>
   <j:if test="${size(h.captchaSupportDescriptors) gt 0}">
     <f:entry>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup.html
index cb7b6fa7f1..f6e881e3fe 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup.html
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup.html
@@ -1,7 +1,6 @@
 <div>
-  By default, Jenkins allows users to create accounts by themselves, via the "sign up" link on the top right shoulder of the page.
-  But if you'd like to prevent random users from creating accounts, and instead tightly control how user accounts are created,
-  uncheck this box.
+  This option allows users to create accounts by themselves, via the "sign up" link on the top right shoulder of the page.
+  <strong>Make sure to not grant significant permissions to authenticated users, as anyone on the network will be able to get them.</strong>
   <p>
   When this checkbox is unchecked, someone with the administrator role would have to create accounts. 
   <p>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_bg.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_bg.html
deleted file mode 100644
index 686e4f9b81..0000000000
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_bg.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div>
-  Стандартно Jenkins позволява на потребителите да си създават регистрации чрез
-  връзката за това в горния, десен ъгъл.
-  Ако не искате произволни хора да се регистрират, оставете полето правно.
-  <p>
-  В такъв случай някой с административни права ще трябва да създава
-  регистрациите.
-  <p>
-  Стандартно Jenkins не използва графична защита, че човек, а не скрипт създава
-  регистрацията. Ако такава функционалност ви трябва, инсталирайте съответната
-  приставка, напр.
-  <a href="https://plugins.jenkins.io/jcaptcha-plugin">JCaptcha
-      Plugin</a>.
-</div>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_de.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_de.html
deleted file mode 100644
index a6b22ac696..0000000000
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_de.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-  In den Standardeinstellungen erlaubt es Jenkins allen Anwendern, über den
-  "Registrieren"-Verweis in der rechten, oberen Seitenecke neue Benutzerkonten
-  anzulegen. Wenn Sie dies nicht möchten und stattdessen lieber das Anlegen
-  neuer Benutzerkonten gezielt kontrollieren wollen, wählen Sie diese Option ab.
-
-  <p>
-  Ist diese Option abgewählt, müssen neue Benutzerkonten von einem Anwender in
-  der Administratoren-Rolle angelegt werden.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_fr.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_fr.html
deleted file mode 100644
index cc20696379..0000000000
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_fr.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-  Par défaut, Jenkins permet aux utilisateurs de se créer un compte eux-mêmes, à l'aide du lien "S'inscrire"
-  en haut à droite de la page.
-  Mais si vous souhaitez éviter que n'importe puisse créer des comptes et si vous préférez contrôler précisément
-  comment les comptes utilisateurs sont créés, alors décochez cette option.
-
-  <p>
-  Quand la case est décochée, une personne possédant le rôle administrateur devra créer ces comptes.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_it.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_it.html
deleted file mode 100644
index 7d64e7f1fd..0000000000
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_it.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-  Per impostazione predefinita, Jenkins consente agli utenti di creare account autonomamente tramite il collegamento "Registrati"
-  in alto a destra nella pagina. Se, tuttavia, si desidera impedire a utenti casuali di creare account e di controllare in modo
-  rigido la creazione degli account utente, deselezionare questa casella di controllo.
-  <p>
-  Quando questa casella di controllo è deselezionata, la creazione degli account utente sarà compito di un utente con il ruolo
-  di amministratore.
-  <p>
-  Per impostazione predefinita, Jenkins non utilizza una verifica CAPTCHA se un utente crea un account autonomamente.
-  Se si desidera abilitare la verifica CAPTCHA, installare un plugin di supporto CAPTCHA, ad esempio il
-  <a href="https://plugins.jenkins.io/jcaptcha-plugin">plugin JCaptcha</a> di Jenkins.
-</div>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_ja.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_ja.html
deleted file mode 100644
index 1683892ba1..0000000000
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_ja.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  デフォルトでは、画面の右上の"サインアップ"リンクで、ユーザーは自分でアカウントを作成できます。
-  しかし、勝手にアカウントを作らせたくなかったり、アカウントの作成を厳しく管理したいのであれば、チェックをはずしてください。
-
-  <p>
-  このチェックボックスをチェックしない場合、管理者権限を持つユーザーがアカウントを作成する必要があります。
-</div>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_tr.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_tr.html
deleted file mode 100644
index 1d7c95c153..0000000000
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_tr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div>
-  Varsay&#305;lan ayarlar&#305;nda, Jenkins kullan&#305;c&#305;lar&#305;n, sayfan&#305;n sa&#287; &#252;st k&#246;&#351;esindeki "kay&#305;t ol" linkini kullanarak, kendileri i&#231;in hesap yaratmalar&#305;na olanak tan&#305;r. 
-  Fakat, rasgele kullan&#305;c&#305;lar&#305;n kendi ba&#351;lar&#305;na hesap a&#231;malar&#305;n&#305; &#246;nlemek ve kullan&#305;c&#305; hesaplar&#305;n&#305;n nas&#305;l olu&#351;turulmas&#305; gerekti&#287;ini
-  kontrol etmek istiyorsan&#305;z, bu kutucu&#287;un &#252;zerindeki i&#351;areti kald&#305;rman&#305;z gerekir.
-
-  <p>
-  Bu kutucuk i&#351;aretlendi&#287;inde, administrator rol&#252;ne sahip kullan&#305;c&#305;lar, kullan&#305;c&#305; yaratma yetkisine sahip olacaklard&#305;r.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_CN.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_CN.html
deleted file mode 100644
index 1b17b96005..0000000000
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_CN.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  Jenkins默认允许用户自己注册一个新账号,通过点击页面右上角的"注册"链接进行操作.
-  但如果你想禁止任意注册新账号,而使用严格的方式控制账号创建,那么取消这个选框。
-
-  <p> 
-  当这个选框被取消,就必须使用系统管理员来创建账号.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_TW.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_TW.html
deleted file mode 100644
index 81d911bda1..0000000000
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_TW.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-  Jenkins 預設可以讓使用者透過頁面左上的「註冊」功能自已建立帳號。
-  如果您不讓想隨便人都能開帳號，想嚴格控制使用者帳號，請不要選用這項功能。
-  <p>
-  沒有勾選核取方塊時，具有系統管理員角色的人必須要負擇建立帳號。
-  <p>
-  預設情況下，Jenkins 不會使用 CAPTCHA 驗證使用者帳號是不是由真的人建立。
-  如果您想要使用 CAPTCHA 驗證機制，請安裝 CAPTCHA 外掛程式，例如 Jenkins
-  <a href="https://plugins.jenkins.io/jcaptcha-plugin">JCaptcha Plugin</a>。
-</div>
diff --git a/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts.html
index d4cc5236f5..215d0ba8df 100644
--- a/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts.html
+++ b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts.html
@@ -1,7 +1,8 @@
 <div>
    You can use wildcards like 'module/dist/**/*.zip'.
    See <a href='http://ant.apache.org/manual/Types/fileset.html'>
-   the includes attribute of Ant fileset</a> for the exact format.
+   the includes attribute of Ant fileset</a> for the exact format
+   -- except that <tt>","</tt> (<em>comma</em>) is the only supported separator.
    The base directory is <a href='ws/'>the workspace</a>.
    You can only archive files that are located in your workspace.
-</div>
\ No newline at end of file
+</div>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help.jelly b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help.jelly
index b94f900169..837dc55a9f 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help.jelly
@@ -35,8 +35,8 @@ THE SOFTWARE.
         ${%For this feature to work, the following conditions need to be met:}
       </p>
       <ol>
-        <li>${%The upstream project records the fingerprints of its build artifacts}</li>
-        <li>${%The downstream project records the fingerprints of the upstream files it uses}</li>
+        <li>${%The upstream project records the fingerprints of its build artifacts.}</li>
+        <li>${%The downstream project records the fingerprints of the upstream files it uses.}</li>
       </ol>
       <p>
         ${%This allows Jenkins to correlate two projects.}
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_bg.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_bg.properties
index 60264c429d..1aecee88e4 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_bg.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_bg.properties
@@ -33,12 +33,12 @@ body=\
  \u0434\u0430\u043d\u043d\u0438 \u043e\u0442\
  <a href="https://jenkins.io/redirect/fingerprint">\u0446\u0438\u0444\u0440\u043e\u0432\u0438\u0442\u0435\
  \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u044a\u0446\u0438</a>.
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=\
- \u041f\u043e\u0441\u043b\u0435\u0434\u0432\u0430\u0449\u0438\u044f\u0442 \u043f\u0440\u043e\u0435\u043a\u0442 \u043f\u0430\u0437\u0438 \u0446\u0438\u0444\u0440\u043e\u0432\u0438\u0442\u0435 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u044a\u0446\u0438 \u043d\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438\u0442\u0435 \u043e\u0442 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0438\u044f\u0442\u0430
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=\
+ \u041f\u043e\u0441\u043b\u0435\u0434\u0432\u0430\u0449\u0438\u044f\u0442 \u043f\u0440\u043e\u0435\u043a\u0442 \u043f\u0430\u0437\u0438 \u0446\u0438\u0444\u0440\u043e\u0432\u0438\u0442\u0435 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u044a\u0446\u0438 \u043d\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438\u0442\u0435 \u043e\u0442 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0438\u044f\u0442\u0430.
 # What\u2019s "project relationship"?
 Title=\
  \u0412\u0440\u044a\u0437\u043a\u0438 \u0441 \u0434\u0440\u0443\u0433\u0438\u0442\u0435 \u043f\u0440\u043e\u0435\u043a\u0442\u0438
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=\
- \u041f\u0440\u0435\u0434\u0448\u0435\u0441\u0442\u0432\u0430\u0449\u0438\u044f\u0442 \u043f\u0440\u043e\u0435\u043a\u0442 \u043f\u0430\u0437\u0438 \u0446\u0438\u0444\u0440\u043e\u0432\u0438\u0442\u0435 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u044a\u0446\u0438 \u043d\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438\u0442\u0435 \u043e\u0442 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0438\u044f\u0442\u0430
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=\
+ \u041f\u0440\u0435\u0434\u0448\u0435\u0441\u0442\u0432\u0430\u0449\u0438\u044f\u0442 \u043f\u0440\u043e\u0435\u043a\u0442 \u043f\u0430\u0437\u0438 \u0446\u0438\u0444\u0440\u043e\u0432\u0438\u0442\u0435 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u044a\u0446\u0438 \u043d\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438\u0442\u0435 \u043e\u0442 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0438\u044f\u0442\u0430.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=\
  \u0422\u043e\u0432\u0430 \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0432\u0430 \u043d\u0430 Jenkins \u0434\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438 \u0432\u0440\u044a\u0437\u043a\u0438\u0442\u0435 \u043c\u0435\u0436\u0434\u0443 \u0434\u0432\u0430\u0442\u0430 \u043f\u0440\u043e\u0435\u043a\u0442\u0430.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_da.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_da.properties
index 93e7cb4a0d..d54a3be29d 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_da.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_da.properties
@@ -22,9 +22,9 @@
 
 Title=Hvad er et "projektforhold"?
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=For at denne feature fungerer skal f\u00f8lgende v\u00e6re opfyldt:
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=Downstream projektet opsamler filfingeraftryk af de upstream filer det benytter
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=Downstream projektet opsamler filfingeraftryk af de upstream filer det benytter.
 body=\
 Har du projekter der er afh\u00e6ngige af hinanden kan Jenkins f\u00f8lge hvilket byg af upstreamprojektet \
 der bruges af hvilket byg af downstream projektet ved at bruge filfingeraftyrk
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Dette tillader Jenkins at korrelere to projekter.
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=Upstream projektet opsamler filfingeraftryk af sine byggeartifakter
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=Upstream projektet opsamler filfingeraftryk af sine byggeartifakter.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_de.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_de.properties
index 4bdff159fc..26330f50c2 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_de.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_de.properties
@@ -26,6 +26,6 @@ body=\
   eines vorgelagerten Projektes f�r welchen Build eines nachgelagerten Projektes verwendet wurde. Dies geschieht �ber \
   gespeicherte "Fingerabdr�cke", die mit Hilfe der <a href="https://jenkins.io/redirect/fingerprint">Fingerabdruck-Funktion</a> erzeugt wurden.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=Um Projektbeziehungen nachzuverfolgen, m�ssen folgende Bedingungen erf�llt sein:
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=Das vorgelagerte Projekt zeichnet Fingerabdr�cke seiner Build-Artefakte auf.
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=Das nachgelagerte Projekt zeichnet Fingerabdr�cke der verwendeten Dateien aus vorgelagerten Projekten auf.
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=Das vorgelagerte Projekt zeichnet Fingerabdr�cke seiner Build-Artefakte auf.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=Das nachgelagerte Projekt zeichnet Fingerabdr�cke der verwendeten Dateien aus vorgelagerten Projekten auf.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Diese Aufzeichnungen erlauben es Jenkins, zwei Projekte zueinander in Beziehung zu setzen.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_es.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_es.properties
index 165c1ab751..fd34299623 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_es.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_es.properties
@@ -24,6 +24,6 @@ Title=
 body=Cuando hay proyectos que dependen unos de otros, Jenkins puede hacer un seguimiento de  qu\u00E9 proyectos padres est\u00E1n siendo utilizado por otros proyectos hijos usando un registro de firmas de los ficheros generados. Echa un vistazo a esta pagina:  <a href="https://jenkins.io/redirect/fingerprint">the fingerprint support</a>.
 
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Esto facilita que Jenkins pueda correlacionar los dos proyectos
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=Que el proyecto padre registre la firma de todos los ficheros que genera.
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=Que el proyecto padre registre la firma de todos los ficheros que genera.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=Para esta funcionalidad, son necesarias las siguientes condiciones:
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=El proyecto hijo almacena las firmas de los ficheros o artefactos que necesita y que fueron generados por otros proyectos padres.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=El proyecto hijo almacena las firmas de los ficheros o artefactos que necesita y que fueron generados por otros proyectos padres.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_et.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_et.properties
index 99238f34ce..f16d6f0955 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_et.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_et.properties
@@ -1,8 +1,8 @@
 # This file is under the MIT License by authors
 
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met:=Selle funktsiooni t\u00F6\u00F6tamiseks peavad olema t\u00E4idetud j\u00E4rgnevad tingimused:
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=Allavoolu projekt salvestab nende \u00FClesvoolu failide s\u00F5rmej\u00E4ljed mida ta kasutab
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=\u00DClesvoolu projekt salvestab oma j\u00E4rkude tulemuste s\u00F5rmej\u00E4ljed
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=Allavoolu projekt salvestab nende \u00FClesvoolu failide s\u00F5rmej\u00E4ljed mida ta kasutab.
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=\u00DClesvoolu projekt salvestab oma j\u00E4rkude tulemuste s\u00F5rmej\u00E4ljed.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=See lubab Jenkinsil seostada kaks projekti.
 Title=Mis on "projektide seosed"?
 body=Kui teil on kaks projekti mis s\u00F5ltuvad \u00FCksteisest, siis suudab Jenkins j\u00E4lgida seda millist \u00FClesvoolu projekti j\u00E4rku kasutatakse mingi allavoolu projekti j\u00E4rgu jaoks, kasutades <a href="https://jenkins.io/redirect/fingerprint">s\u00F5rmej\u00E4lje toe</a> poolt loodud kirjeid.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_fr.properties
index 05a92c5a82..95eabb720b 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_fr.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_fr.properties
@@ -27,8 +27,8 @@ body=\
     les enregistrements cr��s par \
     <a href="https://jenkins.io/redirect/fingerprint">le support de l''empreinte num�rique</a>.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=Pour que cette fonctionnalit� marche, les conditions suivantes sont requises:
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=Le projet en amont enregistre les empreintes num�riques de ses artefacts de build
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=Le projet en aval enregistre les empreintes num\u00E9riques des fichiers amont qu''il utilise
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ jar\ files\ it\ uses=Le projet en aval enregistre les empreintes num�riques des fichiers jar en amont qu''il utilise
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=Le projet en amont enregistre les empreintes num�riques de ses artefacts de build.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=Le projet en aval enregistre les empreintes num\u00E9riques des fichiers amont qu''il utilise.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ jar\ files\ it\ uses.=Le projet en aval enregistre les empreintes num�riques des fichiers jar en amont qu''il utilise.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Cela permet � Jenkins de mettre en corr�lation deux projets.
 
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_it.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_it.properties
index 83183391b5..c209d27940 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_it.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_it.properties
@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=Il progetto downstream registra le impronte dei file upstream che utilizza
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=Il progetto downstream registra le impronte dei file upstream che utilizza.
 Title=Che cos''� una "relazione fra progetti"?
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=Il progetto upstream registra le impronte dei propri artefatti di compilazione
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=Il progetto upstream registra le impronte dei propri artefatti di compilazione.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Ci� consente a Jenkins di correlare due progetti.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=Per far s� che questa funzionalit� sia operativa devono essere soddisfatte le seguenti condizioni:
 body=\
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ja.properties
index 1b333b466d..9e672b26b8 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ja.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ja.properties
@@ -30,11 +30,11 @@ body=\
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=\
   \u3053\u306e\u6a5f\u80fd\u306e\u305f\u3081\u306b\u3001\u4e0b\u8a18\u306e\u6761\u4ef6\u3092\u6e80\u305f\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=\
-  \u4e0a\u6d41\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u6210\u679c\u7269\u3092\u30d3\u30eb\u30c9\u3057\u305f\u6307\u7d0b\u3092\u8a18\u9332\u3057\u307e\u3059\u3002
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=\
+  \u4e0a\u6d41\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u6210\u679c\u7269\u3092\u30d3\u30eb\u30c9\u3057\u305f\u6307\u7d0b\u3092\u8a18\u9332\u3057\u307e\u3059\u3002.
 
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=\
-  \u4e0b\u6d41\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u4f7f\u7528\u3057\u3066\u3044\u308b\u4e0a\u6d41\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u6307\u7d0b\u3092\u8a18\u9332\u3057\u307e\u3059\u3002
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=\
+  \u4e0b\u6d41\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u4f7f\u7528\u3057\u3066\u3044\u308b\u4e0a\u6d41\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u6307\u7d0b\u3092\u8a18\u9332\u3057\u307e\u3059\u3002.
 
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=\
   \u3053\u308c\u306fJenkins\u306b\u4e8c\u3064\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u76f8\u4e92\u306b\u95a2\u9023\u3055\u305b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_lt.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_lt.properties
index 8a336276e7..1a4336fef8 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_lt.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_lt.properties
@@ -3,7 +3,7 @@ body=\
     Kai turite projektus, kurie priklauso vienas nuo kito, naudodamas \u012fra\u0161us, sukurtus \
     <a href="https://jenkins.io/redirect/fingerprint">pir\u0161t\u0173 antspaud\u0173 palaikymo</a> Jenkinsas gali sekti, kuris ankstesnio projekto vykdymas \
     naudojamas kuriame \u017eemesnio projekto vykdyme.
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=V\u0117lesnis projektas registruoja panaudot\u0173 ankstesniojo projekto fail\u0173 antspaudus
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=Ankstesnis projektas registruoja savo vykdymo rezultat\u0173 antspaudus
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=V\u0117lesnis projektas registruoja panaudot\u0173 ankstesniojo projekto fail\u0173 antspaudus.
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=Ankstesnis projektas registruoja savo vykdymo rezultat\u0173 antspaudus.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Tai leid\u017eia Jenkinsus koreliuoti projektus.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=Kad veikt\u0173 \u0161i savyb\u0117, turi b\u016bti patenkintos \u0161ios s\u0105lygos:
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_nl.properties
index 09800fd118..d679641c60 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_nl.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_nl.properties
@@ -27,7 +27,7 @@ body=\
   de hand van de geregistreerd <a href="https://jenkins.io/redirect/fingerprint">elektronische vingerafdrukken</a> van \
   de door een bouwpoging opgeleverde artefacten.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=De volgende voorwaarden dienen voldaan te worden om met deze functionaliteit te werken:
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=Het bovenliggende project registreert elektronische vingerafdrukken van zijn bouwartefacten.
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=Het onderliggend project registreert de vingerafdrukken van de bestanden van het bovenliggende project
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ jar\ files\ it\ uses=Het onderliggende project registreert de elektronische vingerafdrukken van de gebruikte jar bestanden van bovenliggende projecten.
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=Het bovenliggende project registreert elektronische vingerafdrukken van zijn bouwartefacten.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=Het onderliggend project registreert de vingerafdrukken van de bestanden van het bovenliggende project.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ jar\ files\ it\ uses.=Het onderliggende project registreert de elektronische vingerafdrukken van de gebruikte jar bestanden van bovenliggende projecten.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Dit stelt Jenkins in staat om 2 projecten met elkaar in verband te brengen.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties
index d42583d14a..9940c38ec7 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties
@@ -26,8 +26,8 @@ body=\
     usando os registros criados pelo \
     <a href="https://jenkins.io/redirect/fingerprint">suporte de fingerprint</a>.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=Para esta caracter\u00edstica funcionar, as seguintes condi\u00e7\u00f5es s\u00e3o necess\u00e1rias
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=O projeto pai grava os fingerprints de seus artefatos de build
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=O projeto pai grava os fingerprints de seus artefatos de build.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Isto permite que o Jenkins correlacione dois projetos.
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=O projeto filho grava o registro no fingerprint do projeto pai
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=O projeto filho grava o registro no fingerprint do projeto pai.
 
 
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ru.properties
index 362972d0fa..0a75984528 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ru.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ru.properties
@@ -21,8 +21,8 @@
 # THE SOFTWARE.
 
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=\u0427\u0442\u043e\u0431\u044b \u0437\u0430\u0440\u0430\u0431\u043e\u0442\u0430\u043b\u0430 \u044d\u0442\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u044f \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u0443\u0434\u043e\u0432\u043b\u0435\u0442\u0432\u043e\u0440\u0435\u043d\u044b \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u0443\u0441\u043b\u043e\u0432\u0438\u044f:
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=\u0412\u043e\u0441\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u044f\u0435\u0442 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u043a\u0438 (fingrprints) \u0441\u0432\u043e\u0438\u0445 \u0430\u0440\u0442\u0435\u0444\u0430\u043a\u0442\u043e\u0432.
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=\u041d\u0438\u0441\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u044f\u0435\u0442 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u043a\u0438 (fingrprints) \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0445 \u0430\u0440\u0442\u0435\u0444\u0430\u043a\u0442\u043e\u0432 \u0432\u043e\u0441\u0445\u043e\u0434\u044f\u0449\u0435\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430.
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=\u0412\u043e\u0441\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u044f\u0435\u0442 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u043a\u0438 (fingrprints) \u0441\u0432\u043e\u0438\u0445 \u0430\u0440\u0442\u0435\u0444\u0430\u043a\u0442\u043e\u0432.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=\u041d\u0438\u0441\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u044f\u0435\u0442 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u043a\u0438 (fingrprints) \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0445 \u0430\u0440\u0442\u0435\u0444\u0430\u043a\u0442\u043e\u0432 \u0432\u043e\u0441\u0445\u043e\u0434\u044f\u0449\u0435\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=\u042d\u0442\u043e \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 Jenkins \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u0435 \u043c\u0435\u0436\u0434\u0443 \u0434\u0432\u0443\u043c\u044f \u043f\u0440\u043e\u0435\u043a\u0442\u0430\u043c\u0438.
 Title=\u0427\u0442\u043e \u0442\u0430\u043a\u043e\u0435 "\u043e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u044f \u043f\u0440\u043e\u0435\u043a\u0442\u043e\u0432"?
 body=\
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_sr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_sr.properties
index d4ba3a84a7..5b3cc081f2 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_sr.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_sr.properties
@@ -3,8 +3,8 @@
 Title=\u0428\u0442\u0430 \u0458\u0435 "\u0432\u0435\u0437\u0430 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430"?
 body=Jenkins \u043C\u043E\u0436\u0435 \u043F\u0440\u0430\u0442\u0438\u0442\u0438 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0443 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0435 \u043A\u043E\u0458\u0438 \u0437\u0430\u0432\u0438\u0441\u0435 \u0458\u0435\u0434\u0430\u043D \u043E\u0434 \u0434\u0440\u0443\u0433\u043E\u0433 \u043A\u043E\u0440\u0438\u0441\u0442\u0435\u045B\u0438 <a href="https://jenkins.io/redirect/fingerprint">\u0434\u0438\u0433\u0438\u0442\u0430\u043B\u043D\u0438 \u043E\u0442\u0438\u0441\u0430\u043A</a>.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=\u0414\u0430 \u0431\u0438 \u0442\u043E \u0440\u0430\u0434\u0438\u043B\u043E, \u0442\u0440\u0435\u0431\u0430 \u043E\u0431\u0435\u0437\u0431\u0435\u0434\u0438\u0442\u0438:
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=Upstream \u043F\u0440\u043E\u0458\u0435\u043A\u0430\u0442 \u0447\u0443\u0432\u0430 \u043E\u0442\u0438\u0441\u043A\u0435 \u0441\u0432\u043E\u0458\u0438\u0445 \u0430\u0440\u0442\u0438\u0444\u0430\u043A\u0430\u0442\u0438 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0435.
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=Downstream \u043F\u0440\u043E\u0458\u0435\u043A\u0430\u0442 \u0431\u0435\u043B\u0435\u0436\u0438 \u0434\u0438\u0433\u0438\u0442\u0430\u043B\u043D\u0435 \u043E\u0442\u0438\u0441\u043A\u0435 \u0434\u0430\u0442\u043E\u0442\u0435\u043A\u0430 \u043E\u0434 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430 \u043E\u0434 \u043A\u043E\u0433\u0430 \u0437\u0430\u0432\u0438\u0441\u0438.
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=Upstream \u043F\u0440\u043E\u0458\u0435\u043A\u0430\u0442 \u0447\u0443\u0432\u0430 \u043E\u0442\u0438\u0441\u043A\u0435 \u0441\u0432\u043E\u0458\u0438\u0445 \u0430\u0440\u0442\u0438\u0444\u0430\u043A\u0430\u0442\u0438 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0435.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=Downstream \u043F\u0440\u043E\u0458\u0435\u043A\u0430\u0442 \u0431\u0435\u043B\u0435\u0436\u0438 \u0434\u0438\u0433\u0438\u0442\u0430\u043B\u043D\u0435 \u043E\u0442\u0438\u0441\u043A\u0435 \u0434\u0430\u0442\u043E\u0442\u0435\u043A\u0430 \u043E\u0434 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430 \u043E\u0434 \u043A\u043E\u0433\u0430 \u0437\u0430\u0432\u0438\u0441\u0438.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=\u041E\u0432\u043E \u043E\u043C\u043E\u0433\u0443\u045B\u0430\u0432\u0430 Jenkins-\u0443 \u0434\u0430 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438 \u0432\u0435\u0437\u0443 \u0438\u0437\u043C\u0435\u0452\u0443 \u0434\u0432\u043E\u0458\u0435 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met=\u0414\u0430 \u0431\u0438 \u0442\u043E \u0440\u0430\u0434\u0438\u043B\u043E, \u043C\u043E\u0440\u0430\u0442\u0435 \u043E\u0431\u0435\u0437\u0431\u0435\u0434\u0438\u0442\u0438:
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ jar\ files\ it\ uses=Downstream \u043F\u0440\u043E\u0458\u0435\u043A\u0430\u0442 \u0431\u0435\u043B\u0435\u0436\u0438 \u0434\u0438\u0433\u0438\u0442\u0430\u043B\u043D\u0435 \u043E\u0442\u0438\u0441\u043A\u0435 jar \u0430\u0440\u0445\u0438\u0432\u0435 \u043E\u0434 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430 \u043E\u0434 \u043A\u043E\u0433\u0430 \u0437\u0430\u0432\u0438\u0441\u0438.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ jar\ files\ it\ uses.=Downstream \u043F\u0440\u043E\u0458\u0435\u043A\u0430\u0442 \u0431\u0435\u043B\u0435\u0436\u0438 \u0434\u0438\u0433\u0438\u0442\u0430\u043B\u043D\u0435 \u043E\u0442\u0438\u0441\u043A\u0435 jar \u0430\u0440\u0445\u0438\u0432\u0435 \u043E\u0434 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430 \u043E\u0434 \u043A\u043E\u0433\u0430 \u0437\u0430\u0432\u0438\u0441\u0438.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_tr.properties
index e9f0e66118..9885e1fb9c 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_tr.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_tr.properties
@@ -26,6 +26,6 @@ body=\
     ile olu\u015fturulan kay\u0131tlar\u0131 kullanarak hangi upstream projenin hangi downstream proje taraf\u0131ndan\
     kullan\u0131ld\u0131\u011f\u0131n\u0131 takip edebilir.
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=Bu\ \u00f6zelli\u011fin\ \u00e7al\u0131\u015fabilmesi\ i\u00e7in\ devam\u0131ndaki\ \u015fartlar\u0131n\ sa\u011flanmas\u0131\ gerekir:
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=Upstream\ proje\, kendi yap\u0131land\u0131rma artefaktlar\u0131n\u0131n\ parmakizlerini\ kaydeder
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ jar\ files\ it\ uses=Downstream\ proje,\ upstream\ projeden\ kulland\u0131\u011f\u0131\ jar\'lar\u0131n\ parmakizini\ kaydeder
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=Upstream\ proje\, kendi yap\u0131land\u0131rma artefaktlar\u0131n\u0131n\ parmakizlerini\ kaydeder.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ jar\ files\ it\ uses.=Downstream\ proje,\ upstream\ projeden\ kulland\u0131\u011f\u0131\ jar\'lar\u0131n\ parmakizini\ kaydeder.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Bu,\ Jenkins\'a\ iki\ projeyi\ kar\u015f\u0131l\u0131kl\u0131\ ili\u015fkilendirme\ yetene\u011fini\ verir.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_zh_TW.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_zh_TW.properties
index 1f690fe28c..2fcffa4ddb 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_zh_TW.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_zh_TW.properties
@@ -27,6 +27,6 @@ body=\
   \u9019\u500b\u529f\u80fd\u662f\u7d93\u7531<a href="https://jenkins.io/redirect/fingerprint">\u6a94\u6848\u6307\u7d0b\u529f\u80fd</a>\u6240\u7522\u751f\u7684\u8a18\u9304\u4f86\u9054\u6210\u3002
 
 For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=\u7b26\u5408\u4e0b\u5217\u689d\u4ef6\u624d\u80fd\u4f7f\u7528\u9019\u500b\u529f\u80fd:
-The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=\u4e0a\u6e38\u5c08\u6848\u8981\u8a18\u9304\u5efa\u7f6e\u6210\u54c1\u7684\u6307\u7d0b
-The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=\u4e0b\u6e38\u5c08\u6848\u8981\u8a18\u9304\u7528\u5230\u7684\u4e0a\u6e38\u6a94\u6848\u6307\u7d0b
+The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts.=\u4e0a\u6e38\u5c08\u6848\u8981\u8a18\u9304\u5efa\u7f6e\u6210\u54c1\u7684\u6307\u7d0b.
+The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses.=\u4e0b\u6e38\u5c08\u6848\u8981\u8a18\u9304\u7528\u5230\u7684\u4e0a\u6e38\u6a94\u6848\u6307\u7d0b.
 This\ allows\ Jenkins\ to\ correlate\ two\ projects.=\u5982\u6b64\u4e00\u4f86 Jenkins \u5c31\u80fd\u81ea\u52d5\u95dc\u806f\u9019\u5169\u500b\u5c08\u6848\u3002
diff --git a/core/src/main/resources/jenkins/security/Messages.properties b/core/src/main/resources/jenkins/security/Messages.properties
index 0f4887f68b..e9a8685477 100644
--- a/core/src/main/resources/jenkins/security/Messages.properties
+++ b/core/src/main/resources/jenkins/security/Messages.properties
@@ -30,3 +30,4 @@ ApiTokenProperty.NoLegacyToken=This user currently does not have a legacy token
 RekeySecretAdminMonitor.DisplayName=Re-keying
 UpdateSiteWarningsMonitor.DisplayName=Update Site Warnings
 QueueItemAuthenticatorMonitor.DisplayName=Access Control for Builds
+Token.Created.on=Token created on {0}
diff --git a/core/src/main/resources/jenkins/security/Messages_zh_CN.properties b/core/src/main/resources/jenkins/security/Messages_zh_CN.properties
index 5f47ee3166..74d95fea6d 100644
--- a/core/src/main/resources/jenkins/security/Messages_zh_CN.properties
+++ b/core/src/main/resources/jenkins/security/Messages_zh_CN.properties
@@ -29,3 +29,4 @@ ApiTokenProperty.LegacyTokenName=\u9057\u7559 Token
 ApiTokenProperty.NoLegacyToken=\u5F53\u524D\u7528\u6237\u6CA1\u6709\u9057\u7559 Token
 RekeySecretAdminMonitor.DisplayName=Re-keying
 UpdateSiteWarningsMonitor.DisplayName=\u7AD9\u70B9\u66F4\u65B0\u8B66\u544A
+Token.Created.on=Token \u521B\u5EFA\u4E8E {0}
diff --git a/core/src/main/resources/lib/form/secretTextarea.jelly b/core/src/main/resources/lib/form/secretTextarea.jelly
new file mode 100644
index 0000000000..5d476d0c0f
--- /dev/null
+++ b/core/src/main/resources/lib/form/secretTextarea.jelly
@@ -0,0 +1,109 @@
+<?jelly escape-by-default='true'?>
+<!--
+  ~ The MIT License
+  ~
+  ~ Copyright (c) 2019 CloudBees, Inc.
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in
+  ~ all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  ~ THE SOFTWARE.
+  -->
+
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
+    <st:documentation><![CDATA[
+Enhanced version of <f:textarea/> for editing multi-line secrets.
+
+Example usage:
+
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+    <f:entry title="Secret" field="secret">
+        <f:secretTextarea/>
+    </f:entry>
+    <f:entry title="Secret 2">
+        <f:secretTextarea field="secret2"/>
+    </f:entry>
+    <f:entry title="Another Secret">
+        <f:secretTextarea name="foo" value="${it.foo}"/>
+    </f:entry>
+</j:jelly>
+    ]]>
+        <st:attribute name="field">
+            Used for databinding. Must be compatible with hudson.util.Secret for round-trip ciphertext.
+        </st:attribute>
+        <st:attribute name="name">
+            Name to use for form input name. Calculated from @field by default.
+        </st:attribute>
+        <st:attribute name="value">
+            Value of the secret. Calculated from instance[@field] by default.
+            This value must be of type hudson.util.Secret.
+            The value will be encrypted when sent to the client if the client has Item.CONFIGURE permissions.
+        </st:attribute>
+        <st:attribute name="placeholder">
+            Placeholder text for input field when displayed.
+        </st:attribute>
+    </st:documentation>
+
+    <f:prepareDatabinding/>
+    <j:set var="name" value="${attrs.name ?: '_.'+attrs.field}"/>
+    <j:set var="value" value="${h.getPasswordValue(attrs.value ?: instance[attrs.field])}"/>
+    <j:set var="addText" value="${%Add}"/>
+    <j:set var="replaceText" value="${%Replace}"/>
+    <j:set var="buttonText" value="${value == null ? addText : replaceText}"/>
+
+    <st:adjunct includes="lib.form.secretTextarea.secret"/>
+    <div class="secret" data-name="${name}" data-placeholder="${attrs.placeholder ?: ''}" data-prompt="${%EnterSecret}">
+        <div class="secret-header">
+            <div class="secret-legend">
+                <j:choose>
+                    <j:when test="${value == null}">
+                        <span>${%NoStoredValue}</span>
+                    </j:when>
+                    <j:otherwise>
+                        <svg width="25px" height="32px" viewBox="0 0 25 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+                            <!--
+                                Based on Material Design.
+
+                                Licensed 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.
+                            -->
+                            <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                                <g transform="translate(-504.000000, -199.000000)" fill="#788594">
+                                    <path d="M520.914667,209.666667 L511.466667,209.666667 L511.466667,206.619333 C511.466667,204.014 513.584667,201.895333 516.190667,201.895333 C518.796667,201.895333 520.914667,204.014 520.914667,206.619333 L520.914667,209.666667 Z M516.190667,223.381333 C514.514,223.381333 513.143333,222.01 513.143333,220.333333 C513.143333,218.657333 514.514,217.286 516.190667,217.286 C517.867333,217.286 519.238,218.657333 519.238,220.333333 C519.238,222.01 517.867333,223.381333 516.190667,223.381333 Z M516.190667,199 C511.984667,199 508.571333,202.414 508.571333,206.619333 L508.571333,209.666667 L507.048,209.666667 C505.372,209.666667 504,211.038 504,212.714667 L504,227.952667 C504,229.628667 505.372,231 507.048,231 L525.334,231 C527.01,231 528.380667,229.628667 528.380667,227.952667 L528.380667,212.714667 C528.380667,211.038 527.01,209.666667 525.334,209.666667 L523.81,209.666667 L523.81,206.619333 C523.81,202.414 520.396667,199 516.190667,199 Z"/>
+                                </g>
+                            </g>
+                        </svg>
+                        <span>${%Concealed}</span>
+                        <input type="hidden" name="${name}" value="${value}"/>
+                    </j:otherwise>
+                </j:choose>
+            </div>
+            <div class="secret-update">
+                <input type="button" class="secret-update-btn" value="${buttonText}"/>
+            </div>
+        </div>
+    </div>
+
+</j:jelly>
diff --git a/core/src/main/resources/lib/form/secretTextarea.properties b/core/src/main/resources/lib/form/secretTextarea.properties
new file mode 100644
index 0000000000..ebd0491095
--- /dev/null
+++ b/core/src/main/resources/lib/form/secretTextarea.properties
@@ -0,0 +1,29 @@
+#
+# The MIT License
+#
+# Copyright (c) 2019 CloudBees, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+Add=Add
+Replace=Replace
+EnterSecret=Enter New Secret Below
+Concealed=Concealed for Confidentiality
+NoStoredValue=No Stored Value
diff --git a/core/src/main/resources/lib/form/secretTextarea/secret.css b/core/src/main/resources/lib/form/secretTextarea/secret.css
new file mode 100644
index 0000000000..4960c64aed
--- /dev/null
+++ b/core/src/main/resources/lib/form/secretTextarea/secret.css
@@ -0,0 +1,77 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2019 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+.secret-header {
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    background: #f9f9f9;
+    display: flex;
+    justify-content: space-around;
+}
+
+.secret-header:not(:only-child) {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.secret-header > div {
+    flex-grow: 1;
+    display: inline-flex;
+    align-items: center;
+    padding: 1.5em 1.75em;
+}
+
+.secret-legend > svg {
+    margin-right: 1em;
+}
+
+.secret-update {
+    justify-content: flex-end;
+}
+
+.secret-input {
+    border: solid 1px #ccc;
+    border-top: none;
+    border-radius: 0 0 3px 3px;
+}
+
+.secret-input textarea {
+    width: 100%;
+    font-family: monospace;
+    border: none;
+    padding: 1em;
+}
+
+.secret input[type='button'] {
+    background: #4b99d0;
+    color: #fff;
+    border-radius: 4px;
+    border: none;
+    padding: 1em 2em;
+}
+
+.secret input[type='button']:hover {
+    background: #5092be;
+    cursor: pointer;
+}
diff --git a/core/src/main/resources/lib/form/secretTextarea/secret.js b/core/src/main/resources/lib/form/secretTextarea/secret.js
new file mode 100644
index 0000000000..c2b3121440
--- /dev/null
+++ b/core/src/main/resources/lib/form/secretTextarea/secret.js
@@ -0,0 +1,77 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2019 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+Behaviour.specify('.secret', 'secret-button', 0, function (e) {
+    var secretUpdateBtn = e.querySelector('.secret-update-btn');
+    if (secretUpdateBtn === null) return;
+
+    var id = 'secret-' + (iota++);
+    var name = e.getAttribute('data-name');
+    var placeholder = e.getAttribute('data-placeholder');
+    var prompt = e.getAttribute('data-prompt');
+
+    var appendSecretInput = function () {
+        var textarea = document.createElement('textarea');
+        textarea.setAttribute('id', id);
+        textarea.setAttribute('name', name);
+        if (placeholder !== null && placeholder !== '') {
+            textarea.setAttribute('placeholder', placeholder);
+        }
+        var secretInput = document.createElement('div');
+        secretInput.setAttribute('class', 'secret-input');
+        secretInput.appendChild(textarea);
+        e.appendChild(secretInput);
+    }
+
+    var clearSecretValue = function () {
+        var secretValue = e.querySelector('input[type="hidden"]');
+        if (secretValue !== null) {
+            secretValue.parentNode.removeChild(secretValue);
+        }
+    }
+
+    var replaceUpdateButton = function () {
+        var secretLabel = document.createElement('label');
+        secretLabel.setAttribute('for', id);
+        secretLabel.appendChild(document.createTextNode(prompt));
+        secretUpdateBtn.parentNode.replaceChild(secretLabel, secretUpdateBtn);
+    }
+
+    var removeSecretLegendLabel = function () {
+        var secretLegend = e.querySelector('.secret-legend');
+        var secretLegendText = secretLegend.querySelector('span');
+        if (secretLegendText !== null) {
+            secretLegend.removeChild(secretLegendText);
+        }
+    }
+
+    secretUpdateBtn.onclick = function () {
+        appendSecretInput();
+        clearSecretValue();
+        replaceUpdateButton();
+        removeSecretLegendLabel();
+        // fix UI bug when DOM changes
+        Event.fire(window, 'jenkins:bottom-sticker-adjust');
+    };
+});
diff --git a/pom.xml b/pom.xml
index e05adb4008..b2ba0dae7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@ THE SOFTWARE.
   <licenses>
     <license>
       <name>The MIT license</name>
-      <url>http://www.opensource.org/licenses/mit-license.php</url>
+      <url>https://www.opensource.org/licenses/mit</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
@@ -76,7 +76,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.170</revision>
+    <revision>2.172</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <!-- *.html files are in UTF-8, and *.properties are in iso-8859-1, so this configuration is actually incorrect,
@@ -123,7 +123,7 @@ THE SOFTWARE.
   <repositories>
     <repository>
       <id>repo.jenkins-ci.org</id>
-      <url>http://repo.jenkins-ci.org/public/</url>
+      <url>https://repo.jenkins-ci.org/public/</url>
       <!-- allow snapshots -->
     </repository>
   </repositories>
@@ -131,7 +131,7 @@ THE SOFTWARE.
   <pluginRepositories>
     <pluginRepository>
       <id>repo.jenkins-ci.org</id>
-      <url>http://repo.jenkins-ci.org/public/</url>
+      <url>https://repo.jenkins-ci.org/public/</url>
     </pluginRepository>
   </pluginRepositories>
 
diff --git a/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java b/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java
index 43ca1aee54..6473ded740 100644
--- a/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java
+++ b/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java
@@ -79,7 +79,7 @@ public class AnnotatedLargeTextTest {
         StringWriter w = new StringWriter();
         text.writeHtmlTo(0, w);
         assertEquals("hellothere\n", w.toString());
-        assertThat(logging.getMessages(), hasItem("Failed to resurrect annotation")); // TODO assert that this is IOException: Refusing to deserialize unsigned note from an old log.
+        assertThat(logging.getMessages(), hasItem("Failed to resurrect annotation from \"\\u001B[8mha:AAAAwR+LCAAAAAAAAP9dzLEOwVAUxvHThtiNprYxsGiMQhiwNSIhMR/tSZXr3Lr3oJPwPt7FM5hM3gFh8i3/5Bt+1yeUrYH6ap9Yza1Ys9WKWuMiR05wqWhEgpmyEy306Jxvwb19ccGNoBJjLplmgWq0xgOGCjkNZ2IyTrsRlFayVTs4gVMYqP3pw28/JnznuABF/rYWyIyeJfLQe1vxZiDQ7NnYZLn0UZGRRjA9MiV+0OyFv3+utadQyH8B+aJxVM4AAAA=\\u001B[0mthere\\n\"")); // TODO assert that this is IOException: Refusing to deserialize unsigned note from an old log.
         ConsoleNote.INSECURE = true;
         try {
             w = new StringWriter();
@@ -102,7 +102,7 @@ public class AnnotatedLargeTextTest {
         StringWriter w = new StringWriter();
         text.writeHtmlTo(0, w);
         assertEquals("Go back to your home.\n", w.toString());
-        assertThat(logging.getMessages(), hasItem("Failed to resurrect annotation")); // TODO assert that this is IOException: MAC mismatch
+        assertThat(logging.getMessages(), hasItem("Failed to resurrect annotation from \"\\u001B[8mha:////4ByIhqPpAc43AbrEtyDUDc1/UEOXsoY6LeoHSeSlb1d7AAAAlR+LCAAAAAAAAP9b85aBtbiIQS+jNKU4P08vOT+vOD8nVc8xLy+/JLEkNcUnsSg9NSS1oiQktbhEBUT45ZekCpys9xWo8J3KxMDkycCWk5qXXpLhw8BcWpRTwiDkk5VYlqifk5iXrh9cUpSZl25dUcQghWaBM4QGGcYAAYxMDAwVBUAGZwkDq35Rfn4JABmN28qcAAAA\\u001B[0myour home.\\n\"")); // TODO assert that this is IOException: MAC mismatch
     }
 
     /** Simplified version of {@link HyperlinkNote}. */
diff --git a/test/src/test/java/hudson/model/UpdateCenter2Test.java b/test/src/test/java/hudson/model/UpdateCenter2Test.java
index 671d10ca47..3abf854db1 100644
--- a/test/src/test/java/hudson/model/UpdateCenter2Test.java
+++ b/test/src/test/java/hudson/model/UpdateCenter2Test.java
@@ -27,6 +27,7 @@ import hudson.model.UpdateCenter.DownloadJob;
 import hudson.model.UpdateCenter.DownloadJob.Success;
 import hudson.model.UpdateCenter.DownloadJob.Failure;
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeNotNull;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -48,7 +49,9 @@ public class UpdateCenter2Test {
     @Test public void install() throws Exception {
         UpdateSite.neverUpdate = false;
         j.jenkins.pluginManager.doCheckUpdatesServer(); // load the metadata
-        DownloadJob job = (DownloadJob) j.jenkins.getUpdateCenter().getPlugin("changelog-history").deploy().get(); // this seems like one of the smallest plugin
+        UpdateSite.Plugin plugin = j.jenkins.getUpdateCenter().getPlugin("changelog-history");
+        assumeNotNull(plugin);
+        DownloadJob job = (DownloadJob) plugin.deploy().get(); // this seems like one of the smallest plugin
         System.out.println(job.status);
         assertTrue(job.status instanceof Success);
     }
@@ -66,8 +69,10 @@ public class UpdateCenter2Test {
         String wrongChecksum = "ABCDEFG1234567890";
 
         // usually the problem is the file having a wrong checksum, but changing the expected one works just the same
-        j.jenkins.getUpdateCenter().getSite("default").getPlugin("changelog-history").sha512 = wrongChecksum;
-        DownloadJob job = (DownloadJob) j.jenkins.getUpdateCenter().getPlugin("changelog-history").deploy().get();
+        UpdateSite.Plugin plugin = j.jenkins.getUpdateCenter().getSite("default").getPlugin("changelog-history");
+        assumeNotNull(plugin);
+        plugin.sha512 = wrongChecksum;
+        DownloadJob job = (DownloadJob) plugin.deploy().get();
         assertTrue(job.status instanceof Failure);
         assertTrue("error message references checksum", ((Failure) job.status).problem.getMessage().contains(wrongChecksum));
     }
diff --git a/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java b/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java
index fe651a8263..cae5ae3f98 100644
--- a/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java
+++ b/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java
@@ -26,7 +26,7 @@ package hudson.model;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.junit.Assert;
-import org.junit.Assume;
+import static org.junit.Assume.*;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -44,10 +44,14 @@ public class UpdateCenterPluginInstallTest {
     @Rule
     public JenkinsRule jenkinsRule = new JenkinsRule();
 
-    public void setup() throws IOException {
-        jenkinsRule.jenkins.getUpdateCenter().getSite(UpdateCenter.ID_DEFAULT).updateDirectlyNow(false);
+    private void setup() {
+        try {
+            jenkinsRule.jenkins.getUpdateCenter().getSite(UpdateCenter.ID_DEFAULT).updateDirectlyNow(false);
+        } catch (Exception x) {
+            assumeNoException(x);
+        }
         InetSocketAddress address = new InetSocketAddress("updates.jenkins-ci.org", 80);
-        Assume.assumeFalse("Unable to resolve updates.jenkins-ci.org. Skip test.", address.isUnresolved());
+        assumeFalse("Unable to resolve updates.jenkins-ci.org. Skip test.", address.isUnresolved());
     }
 
     @Test
diff --git a/test/src/test/java/lib/form/SecretTextareaTest.java b/test/src/test/java/lib/form/SecretTextareaTest.java
new file mode 100644
index 0000000000..93cc37bda5
--- /dev/null
+++ b/test/src/test/java/lib/form/SecretTextareaTest.java
@@ -0,0 +1,175 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2019 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package lib.form;
+
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlHiddenInput;
+import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+import hudson.model.AbstractProject;
+import hudson.model.Project;
+import hudson.tasks.BuildStepDescriptor;
+import hudson.tasks.Builder;
+import hudson.util.Secret;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.JenkinsRule.WebClient;
+import org.jvnet.hudson.test.TestExtension;
+import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class SecretTextareaTest {
+
+    private Project<?, ?> project;
+    private WebClient wc;
+
+    @Rule public JenkinsRule j = new JenkinsRule();
+
+    @Before
+    public void setUp() throws IOException {
+        project = j.createFreeStyleProject();
+        project.getBuildersList().add(TestBuilder.newDefault());
+        wc = j.createWebClient();
+    }
+
+    @Test
+    public void addEmptySecret() throws Exception {
+        j.configRoundtrip(project);
+        assertTestBuilderDataBoundEqual(TestBuilder.newDefault());
+    }
+
+    @Test
+    public void addSecret() throws Exception {
+        setProjectSecret("testValue");
+        assertTestBuilderDataBoundEqual(TestBuilder.fromString("testValue"));
+    }
+
+    @Test
+    public void addSecretAndUpdateDescription() throws Exception {
+        setProjectSecret("Original Value");
+        assertTestBuilderDataBoundEqual(TestBuilder.fromString("Original Value"));
+        HtmlForm configForm = goToConfigForm();
+        HtmlTextInput description = configForm.getInputByName("_.description");
+        description.setText("New description");
+        j.submit(configForm);
+        assertTestBuilderDataBoundEqual(TestBuilder.fromStringWithDescription("Original Value", "New description"));
+    }
+
+    @Test
+    public void addSecretAndUpdateSecretWithEmptyValue() throws Exception {
+        setProjectSecret("First");
+        assertTestBuilderDataBoundEqual(TestBuilder.fromString("First"));
+        HtmlForm configForm = goToConfigForm();
+        String hiddenValue = getHiddenSecretValue(configForm);
+        assertNotNull(hiddenValue);
+        assertNotEquals("First", hiddenValue);
+        assertEquals("First", Secret.fromString(hiddenValue).getPlainText());
+        clickSecretUpdateButton(configForm);
+        j.submit(configForm);
+        assertTestBuilderDataBoundEqual(TestBuilder.fromString(""));
+    }
+
+    private void assertTestBuilderDataBoundEqual(TestBuilder other) throws Exception {
+        j.assertEqualDataBoundBeans(other, project.getBuildersList().get(TestBuilder.class));
+    }
+
+    private void setProjectSecret(String secret) throws Exception {
+        HtmlForm configForm = goToConfigForm();
+        clickSecretUpdateButton(configForm);
+        configForm.getTextAreaByName("_.secret").setText(secret);
+        j.submit(configForm);
+    }
+
+    private HtmlForm goToConfigForm() throws IOException, SAXException {
+        return wc.getPage(project, "configure").getFormByName("config");
+    }
+
+    private static void clickSecretUpdateButton(HtmlForm configForm) throws IOException {
+        configForm.getOneHtmlElementByAttribute("input", "class", "secret-update-btn").click();
+    }
+
+    private static String getHiddenSecretValue(HtmlForm configForm) {
+        HtmlHiddenInput hiddenSecret = configForm.getInputByName("_.secret");
+        return hiddenSecret == null ? null : hiddenSecret.getValueAttribute();
+    }
+
+    public static class TestBuilder extends Builder {
+        private final Secret secret;
+        private String description = "";
+
+        private static TestBuilder newDefault() {
+            return new TestBuilder(null);
+        }
+
+        private static TestBuilder fromString(String secret) {
+            return new TestBuilder(Secret.fromString(secret));
+        }
+
+        private static TestBuilder fromStringWithDescription(String secret, String description) {
+            TestBuilder b = fromString(secret);
+            b.setDescription(description);
+            return b;
+        }
+
+        @DataBoundConstructor
+        public TestBuilder(Secret secret) {
+            this.secret = secret;
+        }
+
+        public Secret getSecret() {
+            return secret;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        @DataBoundSetter
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        @TestExtension
+        public static class DescriptorImpl extends BuildStepDescriptor<Builder> {
+            @Override
+            public String getDisplayName() {
+                return "Test Secret";
+            }
+
+            @Override
+            public boolean isApplicable(Class<? extends AbstractProject> jobType) {
+                return true;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/src/test/resources/lib/form/SecretTextareaTest/TestBuilder/config.jelly b/test/src/test/resources/lib/form/SecretTextareaTest/TestBuilder/config.jelly
new file mode 100644
index 0000000000..dfd396de7d
--- /dev/null
+++ b/test/src/test/resources/lib/form/SecretTextareaTest/TestBuilder/config.jelly
@@ -0,0 +1,33 @@
+<?jelly escape-by-default='true'?>
+<!--
+  ~ The MIT License
+  ~
+  ~ Copyright (c) 2019 CloudBees, Inc.
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in
+  ~ all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  ~ THE SOFTWARE.
+  -->
+
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+    <f:entry title="Secret" field="secret">
+        <f:secretTextarea/>
+    </f:entry>
+    <f:entry title="Description" field="description">
+        <f:textbox/>
+    </f:entry>
+</j:jelly>
diff --git a/war/src/main/js/util/jenkins.js b/war/src/main/js/util/jenkins.js
index 43c031fe33..cc962deff4 100644
--- a/war/src/main/js/util/jenkins.js
+++ b/war/src/main/js/util/jenkins.js
@@ -284,8 +284,11 @@ exports.buildFormPost = function($form) {
 	var wnd = exports.getWindow($form);
 	var form = $form[0];
 	if(wnd.buildFormTree(form)) {
-		return $form.serialize() +
-			'&core:apply=&Submit=Save&json=' + $form.find('input[name=json]').val();
+		return $form.serialize() + "&" + jquery.param({
+			'core:apply': '',
+			'Submit': 'Save',
+			'json': $form.find('input[name=json]').val()
+		});
 	}
 	return '';
 };