|
Lines 1-5
Link Here
|
| 1 |
/****************************************************************************** |
1 |
/****************************************************************************** |
| 2 |
* Copyright (c) 2010, 2014 Oracle |
2 |
* Copyright (c) 2010, 2017 Oracle |
| 3 |
* All rights reserved. This program and the accompanying materials |
3 |
* All rights reserved. This program and the accompanying materials |
| 4 |
* are made available under the terms of the Eclipse Public License v1.0 |
4 |
* are made available under the terms of the Eclipse Public License v1.0 |
| 5 |
* which accompanies this distribution, and is available at |
5 |
* which accompanies this distribution, and is available at |
|
Lines 7-12
Link Here
|
| 7 |
* |
7 |
* |
| 8 |
* Contributors: |
8 |
* Contributors: |
| 9 |
* Konstantin Komissarchik - initial implementation and ongoing maintenance |
9 |
* Konstantin Komissarchik - initial implementation and ongoing maintenance |
|
|
10 |
* Carl Anderson - Java 9 support |
| 10 |
******************************************************************************/ |
11 |
******************************************************************************/ |
| 11 |
|
12 |
|
| 12 |
package org.eclipse.jst.common.project.facet.core; |
13 |
package org.eclipse.jst.common.project.facet.core; |
|
Lines 35-40
Link Here
|
| 35 |
public static final IRuntimeComponentVersion VERSION_1_6 = TYPE.getVersion( "1.6" ); //$NON-NLS-1$ |
36 |
public static final IRuntimeComponentVersion VERSION_1_6 = TYPE.getVersion( "1.6" ); //$NON-NLS-1$ |
| 36 |
public static final IRuntimeComponentVersion VERSION_1_7 = TYPE.getVersion( "1.7" ); //$NON-NLS-1$ |
37 |
public static final IRuntimeComponentVersion VERSION_1_7 = TYPE.getVersion( "1.7" ); //$NON-NLS-1$ |
| 37 |
public static final IRuntimeComponentVersion VERSION_1_8 = TYPE.getVersion( "1.8" ); //$NON-NLS-1$ |
38 |
public static final IRuntimeComponentVersion VERSION_1_8 = TYPE.getVersion( "1.8" ); //$NON-NLS-1$ |
|
|
39 |
public static final IRuntimeComponentVersion VERSION_1_9 = TYPE.getVersion( "1.9" ); //$NON-NLS-1$ |
| 38 |
|
40 |
|
| 39 |
@Deprecated |
41 |
@Deprecated |
| 40 |
public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5; |
42 |
public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5; |
|
Lines 85-93
Link Here
|
| 85 |
{ |
87 |
{ |
| 86 |
rcv = StandardJreRuntimeComponent.VERSION_1_8; |
88 |
rcv = StandardJreRuntimeComponent.VERSION_1_8; |
| 87 |
} |
89 |
} |
|
|
90 |
else if( jvmver.startsWith( "1.9" ) ) //$NON-NLS-1$ |
| 91 |
{ |
| 92 |
rcv = StandardJreRuntimeComponent.VERSION_1_9; |
| 93 |
} |
| 88 |
else |
94 |
else |
| 89 |
{ |
95 |
{ |
| 90 |
rcv = StandardJreRuntimeComponent.VERSION_1_8; |
96 |
rcv = StandardJreRuntimeComponent.VERSION_1_9; |
| 91 |
} |
97 |
} |
| 92 |
|
98 |
|
| 93 |
final Map<String,String> properties = new HashMap<String,String>(); |
99 |
final Map<String,String> properties = new HashMap<String,String>(); |