From 95c12554521fc22bd00034d5a6dc43d7231ce7b7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 5 May 2013 16:19:11 +0200
Subject: [PATCH] Updated JdkVersion regarding Java 9 support

 - JdkVersion#JAVA_19 is now properly set to 6 instead of 5.
 - Javadoc for getMajorJavaVersion() now references currently supported
   Java versions.
---
 .../org/springframework/core/JdkVersion.java   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/JdkVersion.java b/spring-core/src/main/java/org/springframework/core/JdkVersion.java
index a7c20f32c5..78ebc8b9f2 100644
--- a/spring-core/src/main/java/org/springframework/core/JdkVersion.java
+++ b/spring-core/src/main/java/org/springframework/core/JdkVersion.java
@@ -17,15 +17,16 @@
 package org.springframework.core;
 
 /**
- * Internal helper class used to find the Java/JVM version
- * that Spring is operating on, to allow for automatically
- * adapting to the present platform's capabilities.
+ * Internal helper class used to find the Java/JVM version that Spring is
+ * operating on, to allow for automatically adapting to the present platform's
+ * capabilities.
  *
  * <p>Note that Spring requires JVM 1.6 or higher, as of Spring 4.0.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Rick Evans
+ * @author Sam Brannen
  */
 public abstract class JdkVersion {
 
@@ -62,7 +63,7 @@ public abstract class JdkVersion {
 	/**
 	 * Constant identifying the 1.9 JVM (Java 9).
 	 */
-	public static final int JAVA_19 = 5;
+	public static final int JAVA_19 = 6;
 
 
 	private static final String javaVersion;
@@ -101,12 +102,11 @@ public abstract class JdkVersion {
 	/**
 	 * Get the major version code. This means we can do things like
 	 * {@code if (getMajorJavaVersion() >= JAVA_17)}.
-	 * @return a code comparable to the JAVA_XX codes in this class
-	 * @see #JAVA_13
-	 * @see #JAVA_14
-	 * @see #JAVA_15
+	 * @return a code comparable to the {@code JAVA_XX} codes in this class
 	 * @see #JAVA_16
-	 * @see #JAVA_17
+     * @see #JAVA_17
+     * @see #JAVA_18
+     * @see #JAVA_19
 	 */
 	public static int getMajorJavaVersion() {
 		return majorJavaVersion;