Merge pull request sebastianbenz#33 from ghaith/master

Added oxygen support to the setup
ghaith · Jun 30, 2017 · e7beeaf · e7beeaf
2 parents a5a34de + e2e5c8b
commit e7beeaf
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/Jnario.setup b/Jnario.setup
@@ -16,8 +16,8 @@
     label="Jnario">
   <setupTask
       xsi:type="jdt:JRETask"
-      version="JavaSE-1.7"
-      location="${jre.location-1.7}">
+      version="JavaSE-1.8"
+      location="${jre.location-1.8}">
     <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
   </setupTask>
   <setupTask
@@ -43,15 +43,15 @@
   <setupTask
       xsi:type="setup.p2:P2Task">
     <requirement
-        name="org.eclipse.xtend.sdk.feature.group"
-        versionRange="[2.11.0,2.12.0)"/>
+        name="org.eclipse.xtend.sdk.feature.group"/>
     <requirement
-        name="org.eclipse.xtext.sdk.feature.group"
-        versionRange="[2.11.0,2.12.0)"/>
+        name="org.eclipse.xtext.sdk.feature.group"/>
     <repository
         url="http://download.eclipse.org/releases/neon"/>
     <repository
         url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones/"/>
+    <repository
+        url="http://download.eclipse.org/releases/oxygen"/>
     <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
   </setupTask>
   <setupTask
@@ -71,10 +71,10 @@
           name="org.eclipse.sdk.feature.group"/>
       <requirement
           name="org.eclipse.xtext.sdk.feature.group"
-          versionRange="[2.11.0,2.13.0)"/>
+          versionRange="[2.12.0,2.13.0)"/>
       <requirement
           name="org.eclipse.xtend.sdk.feature.group"
-          versionRange="[2.11.0,2.13.0)"/>
+          versionRange="[2.12.0,2.13.0)"/>
       <requirement
           name="org.objectweb.asm"/>
       <requirement
@@ -113,6 +113,19 @@
         <repository
             url="http://www.xpect-tests.org/updatesite/nightly/"/>
       </repositoryList>
+      <repositoryList
+          name="Oxygen">
+        <repository
+            url="http://download.eclipse.org/releases/oxygen"/>
+        <repository
+            url="http://download.eclipse.org/cbi/updates/license"/>
+        <repository
+            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
+        <repository
+            url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones/"/>
+        <repository
+            url="http://www.xpect-tests.org/updatesite/nightly/"/>
+      </repositoryList>
     </targlet>
   </setupTask>
   <setupTask