nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java
equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. Oracle designates this |
7 * published by the Free Software Foundation. Oracle designates this |
39 /** |
39 /** |
40 * The current version number as a string. |
40 * The current version number as a string. |
41 * @return version string |
41 * @return version string |
42 */ |
42 */ |
43 public static String version() { |
43 public static String version() { |
44 return version("release"); // mm.nn.oo[-milestone] |
44 return version("version_short"); // E.g. "9-internal" or "9.1.2" |
45 } |
45 } |
46 |
46 |
47 /** |
47 /** |
48 * The current full version number as a string. |
48 * The current full version number as a string. |
49 * @return full version string |
49 * @return full version string |
50 */ |
50 */ |
51 public static String fullVersion() { |
51 public static String fullVersion() { |
52 return version("full"); // mm.mm.oo[-milestone]-build |
52 return version("version_string"); // E.g. "9.1.2.3-ea-4+nashorn-testing" |
53 } |
53 } |
54 |
54 |
55 private static final String VERSION_RB_NAME = "jdk.nashorn.internal.runtime.resources.version"; |
55 private static final String VERSION_RB_NAME = "jdk.nashorn.internal.runtime.resources.version"; |
56 private static ResourceBundle versionRB; |
56 private static ResourceBundle versionRB; |
57 |
57 |