### Eclipse Workspace Patch 1.0 #P org.eclipse.jst.common.fproj.enablement.jdt.feature.patch diff --git buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html index e98ba68..3d94d7f 100644 --- buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html +++ buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html @@ -4,16 +4,16 @@ -WTP 3.2.5 Patches +WTP 3.5.2 Patches -

WTP 3.2.5 Patches

WTP 3.5.2 Patches

org.eclipse.jst.common.fproj.enablement.jdt

Bug 373666. Adopter-only patch for allowing Static web project facets to coexist with Java facet

Bug 430637. [hotbug] Java Version 1.8 of project facet java does not exist in Kepler SR2

\ No newline at end of file diff --git feature.properties feature.properties index 1f3fb70..178c3a7 100644 --- feature.properties +++ feature.properties @@ -27,7 +27,7 @@ description=\ Contains fixes described in the following bugzilla(s):\n\ \n\ -Bug https://bugs.eclipse.org/373666 Adopter-only patch for allowing Static web project facets to coexist with Java facet\n\ +Bug https://bugs.eclipse.org/430637 [hotbug] Java Version 1.8 of project facet java does not exist in Kepler SR2\n\ \n\ # "copyright" property - text of the "Feature Update Copyright" copyright=\ diff --git feature.xml feature.xml index 4595e6d..6bb64c9 100644 --- feature.xml +++ feature.xml @@ -1,24 +1,31 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - + + + + + %description + + + + %copyright + + + + %license + + + + + + + #P org.eclipse.jst.common.project.facet.core diff --git META-INF/MANIFEST.MF META-INF/MANIFEST.MF index 09931a0..1682b85 100644 --- META-INF/MANIFEST.MF +++ META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-Vendor: %providerName Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true -Bundle-Version: 1.4.201.qualifier +Bundle-Version: 1.4.300.qualifier Bundle-ClassPath: . Bundle-Localization: plugin Export-Package: org.eclipse.jst.common.project.facet.core, diff --git plugin.xml plugin.xml index d0aafaf..559a733 100644 --- plugin.xml +++ plugin.xml @@ -25,6 +25,7 @@

+ @@ -49,6 +50,11 @@

+ + + + @@ -77,6 +83,8 @@ + +

diff --git src/org/eclipse/jst/common/project/facet/core/JavaFacet.java src/org/eclipse/jst/common/project/facet/core/JavaFacet.java index 850112e..552a1e0 100644 --- src/org/eclipse/jst/common/project/facet/core/JavaFacet.java +++ src/org/eclipse/jst/common/project/facet/core/JavaFacet.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010 Oracle + * Copyright (c) 2010, 2014 Oracle * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -33,6 +33,7 @@ public static final IProjectFacetVersion VERSION_1_5 = FACET.getVersion( "1.5" ); //$NON-NLS-1$ public static final IProjectFacetVersion VERSION_1_6 = FACET.getVersion( "1.6" ); //$NON-NLS-1$ public static final IProjectFacetVersion VERSION_1_7 = FACET.getVersion( "1.7" ); //$NON-NLS-1$ + public static final IProjectFacetVersion VERSION_1_8 = FACET.getVersion( "1.8" ); //$NON-NLS-1$ @Deprecated public static final IProjectFacetVersion JAVA_13 = VERSION_1_3; diff --git src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java index 99490af..3f70bf2 100644 --- src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java +++ src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010 Oracle + * Copyright (c) 2010, 2014 Oracle * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,6 +34,7 @@ public static final IRuntimeComponentVersion VERSION_1_5 = TYPE.getVersion( "1.5" ); //$NON-NLS-1$ public static final IRuntimeComponentVersion VERSION_1_6 = TYPE.getVersion( "1.6" ); //$NON-NLS-1$ public static final IRuntimeComponentVersion VERSION_1_7 = TYPE.getVersion( "1.7" ); //$NON-NLS-1$ + public static final IRuntimeComponentVersion VERSION_1_8 = TYPE.getVersion( "1.8" ); //$NON-NLS-1$ @Deprecated public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5; @@ -80,9 +81,13 @@ { rcv = StandardJreRuntimeComponent.VERSION_1_7; } + else if( jvmver.startsWith( "1.8" ) ) //$NON-NLS-1$ + { + rcv = StandardJreRuntimeComponent.VERSION_1_8; + } else { - rcv = StandardJreRuntimeComponent.VERSION_1_7; + rcv = StandardJreRuntimeComponent.VERSION_1_8; } final Map properties = new HashMap(); diff --git src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java index 576a6b0..414799d 100644 --- src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java +++ src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010 Oracle + * Copyright (c) 2010, 2014 Oracle * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -60,6 +60,7 @@ FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_5, "J2SE-1.5" ); //$NON-NLS-1$ FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_6, "JavaSE-1.6" ); //$NON-NLS-1$ FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_7, "JavaSE-1.7" ); //$NON-NLS-1$ + FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_8, "JavaSE-1.8" ); //$NON-NLS-1$ } public static String getCompilerLevel()