Attachment #270345 for bug #522750

View | Details | Raw Unified | Return to bug 522750
Collapse All | Expand All

Lines 3-9 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
3	Bundle-Vendor: %providerName	3	Bundle-Vendor: %providerName
4	Bundle-Name: %pluginName	4	Bundle-Name: %pluginName
5	Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true	5	Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true
6	Bundle-Version: 1.4.500.qualifier	6	Bundle-Version: 1.5.0.qualifier
7	Bundle-ClassPath: .	7	Bundle-ClassPath: .
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin
9	Export-Package: org.eclipse.jst.common.project.facet.core,	9	Export-Package: org.eclipse.jst.common.project.facet.core,

Lines 26-31 Link Here

(-)plugin.xml (+8 lines)
26	<runtime-component-version type="standard.jre" version="1.6"/>	26	<runtime-component-version type="standard.jre" version="1.6"/>
27	<runtime-component-version type="standard.jre" version="1.7"/>	27	<runtime-component-version type="standard.jre" version="1.7"/>
28	<runtime-component-version type="standard.jre" version="1.8"/>	28	<runtime-component-version type="standard.jre" version="1.8"/>
		29	<runtime-component-version type="standard.jre" version="1.9"/>
29		30
30	<supported>	31	<supported>
31	<facet id="java" version="1.3"/>	32	<facet id="java" version="1.3"/>
Lines 57-62 Link Here
57	<runtime-component id="standard.jre" version="[1.8"/>	58	<runtime-component id="standard.jre" version="[1.8"/>
58	</supported>	59	</supported>
59		60
		61	<supported>
		62	<facet id="java" version="1.9"/>
		63	<runtime-component id="standard.jre" version="[1.9"/>
		64	</supported>
		65
60	<adapter>	66	<adapter>
61	<runtime-component id="standard.jre"/>	67	<runtime-component id="standard.jre"/>
62	<factory class="org.eclipse.jst.common.project.facet.core.internal.StandardJreClasspathProvider$Factory"/>	68	<factory class="org.eclipse.jst.common.project.facet.core.internal.StandardJreClasspathProvider$Factory"/>
Lines 85-90 Link Here
85		91
86	<project-facet-version facet="java" version="1.8"/>	92	<project-facet-version facet="java" version="1.8"/>
87		93
		94	<project-facet-version facet="java" version="1.9"/>
		95
88	<action facet="java" type="install" id="java.install">	96	<action facet="java" type="install" id="java.install">
89	<delegate class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallDelegate"/>	97	<delegate class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallDelegate"/>
90	<config-factory class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallConfigFactory"/>	98	<config-factory class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallConfigFactory"/>

Lines 1-6 Link Here

(-)pom.xml (-2 / +2 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--	2	<!--
3	Copyright (c) 2012, 2013 Eclipse Foundation and others.	3	Copyright (c) 2012, 2017 Eclipse Foundation and others.
4	All rights reserved. This program and the accompanying materials	4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Distribution License v1.0	5	are made available under the terms of the Eclipse Distribution License v1.0
6	which accompanies this distribution, and is available at	6	which accompanies this distribution, and is available at
Lines 22-27 Link Here
22		22
23	<groupId>org.eclipse.webtools.common</groupId>	23	<groupId>org.eclipse.webtools.common</groupId>
24	<artifactId>org.eclipse.jst.common.project.facet.core</artifactId>	24	<artifactId>org.eclipse.jst.common.project.facet.core</artifactId>
25	<version>1.4.500-SNAPSHOT</version>	25	<version>1.5.0-SNAPSHOT</version>
26	<packaging>eclipse-plugin</packaging>	26	<packaging>eclipse-plugin</packaging>
27	</project>	27	</project>

Lines 1-5 Link Here

(-)src/org/eclipse/jst/common/project/facet/core/JavaFacet.java (-1 / +3 lines)
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 34-39 Link Here
34	public static final IProjectFacetVersion VERSION_1_6 = FACET.getVersion( "1.6" ); //$NON-NLS-1$	35	public static final IProjectFacetVersion VERSION_1_6 = FACET.getVersion( "1.6" ); //$NON-NLS-1$
35	public static final IProjectFacetVersion VERSION_1_7 = FACET.getVersion( "1.7" ); //$NON-NLS-1$	36	public static final IProjectFacetVersion VERSION_1_7 = FACET.getVersion( "1.7" ); //$NON-NLS-1$
36	public static final IProjectFacetVersion VERSION_1_8 = FACET.getVersion( "1.8" ); //$NON-NLS-1$	37	public static final IProjectFacetVersion VERSION_1_8 = FACET.getVersion( "1.8" ); //$NON-NLS-1$
		38	public static final IProjectFacetVersion VERSION_1_9 = FACET.getVersion( "1.9" ); //$NON-NLS-1$
37		39
38	@Deprecated	40	@Deprecated
39	public static final IProjectFacetVersion JAVA_13 = VERSION_1_3;	41	public static final IProjectFacetVersion JAVA_13 = VERSION_1_3;

Lines 1-5 Link Here

(-)src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java (-2 / +8 lines)
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>();

Return to bug 522750