Attachment 270345 Details for Bug 522750 – Add in Java 9 support

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Add in Java 9 support

bug522750.patch (text/plain), 7.38 KB, created by Carl Anderson

on 2017-09-25 11:13:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2017-09-25 11:13:29 EDT

Size: 7.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.common.project.facet.core
>diff --git META-INF/MANIFEST.MF META-INF/MANIFEST.MF
>index 2811f14..c133d48 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.500.qualifier
>+Bundle-Version: 1.5.0.qualifier
> Bundle-ClassPath: .
> Bundle-Localization: plugin
> Export-Package: org.eclipse.jst.common.project.facet.core,
>diff --git plugin.xml plugin.xml
>index 559a733..19b787b 100644
>--- plugin.xml
>+++ plugin.xml
>@@ -26,6 +26,7 @@
>     <runtime-component-version type="standard.jre" version="1.6"/>
>     <runtime-component-version type="standard.jre" version="1.7"/>
>     <runtime-component-version type="standard.jre" version="1.8"/>
>+    <runtime-component-version type="standard.jre" version="1.9"/>
> 
>     <supported>
>       <facet id="java" version="1.3"/>
>@@ -57,6 +58,11 @@
>       <runtime-component id="standard.jre" version="[1.8"/>
>     </supported>
> 
>+    <supported>
>+      <facet id="java" version="1.9"/>
>+      <runtime-component id="standard.jre" version="[1.9"/>
>+    </supported>
>+
>     <adapter>
>       <runtime-component id="standard.jre"/>
>       <factory class="org.eclipse.jst.common.project.facet.core.internal.StandardJreClasspathProvider$Factory"/>
>@@ -85,6 +91,8 @@
> 
>     <project-facet-version facet="java" version="1.8"/>
> 
>+    <project-facet-version facet="java" version="1.9"/>
>+
>     <action facet="java" type="install" id="java.install">
>       <delegate class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallDelegate"/>
>       <config-factory class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallConfigFactory"/>
>diff --git pom.xml pom.xml
>index 225947e..9c2ed29 100644
>--- pom.xml
>+++ pom.xml
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
>-  Copyright (c) 2012, 2013 Eclipse Foundation and others.
>+  Copyright (c) 2012, 2017 Eclipse Foundation and others.
>   All rights reserved. This program and the accompanying materials
>   are made available under the terms of the Eclipse Distribution License v1.0
>   which accompanies this distribution, and is available at
>@@ -22,6 +22,6 @@
> 
>   <groupId>org.eclipse.webtools.common</groupId>
>   <artifactId>org.eclipse.jst.common.project.facet.core</artifactId>
>-  <version>1.4.500-SNAPSHOT</version>
>+  <version>1.5.0-SNAPSHOT</version>
>   <packaging>eclipse-plugin</packaging>
> </project>
>\ No newline at end of file
>diff --git src/org/eclipse/jst/common/project/facet/core/JavaFacet.java src/org/eclipse/jst/common/project/facet/core/JavaFacet.java
>index 552a1e0..ac591c5 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, 2014 Oracle
>+ * Copyright (c) 2010, 2017 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *    Konstantin Komissarchik - initial implementation and ongoing maintenance
>+ *    Carl Anderson - Java 9 support
>  ******************************************************************************/
> 
> package org.eclipse.jst.common.project.facet.core;
>@@ -34,6 +35,7 @@
>     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$
>+    public static final IProjectFacetVersion VERSION_1_9 = FACET.getVersion( "1.9" ); //$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 3f70bf2..1952486 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, 2014 Oracle
>+ * Copyright (c) 2010, 2017 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *    Konstantin Komissarchik - initial implementation and ongoing maintenance
>+ *    Carl Anderson - Java 9 support
>  ******************************************************************************/
> 
> package org.eclipse.jst.common.project.facet.core;
>@@ -35,6 +36,7 @@
>     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$
>+    public static final IRuntimeComponentVersion VERSION_1_9 = TYPE.getVersion( "1.9" ); //$NON-NLS-1$
> 
>     @Deprecated
>     public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5;
>@@ -85,9 +87,13 @@
>         {
>             rcv = StandardJreRuntimeComponent.VERSION_1_8;
>         }
>+        else if( jvmver.startsWith( "1.9" ) ) //$NON-NLS-1$
>+        {
>+            rcv = StandardJreRuntimeComponent.VERSION_1_9;
>+        }
>         else 
>         {
>-            rcv = StandardJreRuntimeComponent.VERSION_1_8;
>+            rcv = StandardJreRuntimeComponent.VERSION_1_9;
>         }
>         
>         final Map<String,String> properties = new HashMap<String,String>();
>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 e2a5723..f675be6 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, 2014 Oracle
>+ * Copyright (c) 2010, 2017 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *    Konstantin Komissarchik - initial implementation and ongoing maintenance
>+ *    Carl Anderson - Java 9 support
>  ******************************************************************************/
> 
> package org.eclipse.jst.common.project.facet.core.internal;
>@@ -61,6 +62,7 @@
>         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$
>+        FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_9, "JavaSE-1.9" ); //$NON-NLS-1$
>     }
>     
>     public static String getCompilerLevel()

Actions: View | Diff

Attachments on bug 522750: 270345