Add required justj repositories to EPP Packages Oomph setup (#41)

eclipse-packaging · Aug 21, 2023 · 4d95cca · 4d95cca
1 parent b90775b
commit 4d95cca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/releng/org.eclipse.epp.config/oomph/EPP.setup b/releng/org.eclipse.epp.config/oomph/EPP.setup
@@ -7,11 +7,10 @@
     xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
     xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
-    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
     xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/WorkingSets.ecore"
     name="epp.packages"
     label="EPP Packages">
   <annotation
@@ -57,10 +56,6 @@
       name="eclipse.target.platform"
       value="${eclipse.target.platform.latest}"
       storageURI="scope://Workspace"/>
-  <setupTask
-      xsi:type="setup.p2:P2Task">
-    <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
-  </setupTask>
   <setupTask
       xsi:type="git:GitCloneTask"
       id="github.clone.epp.packages"
@@ -95,6 +90,10 @@
       <repositoryList>
         <repository
             url="https://download.eclipse.org/staging/${eclipse.target.platform}"/>
+        <repository
+            url="https://download.eclipse.org/justj/epp/milestone/latest"/>
+        <repository
+            url="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>
       </repositoryList>
     </targlet>
   </setupTask>

diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -85,12 +85,12 @@
       <layout>p2</layout>
     </repository>
     <repository>
-      <id>justj</id>
+      <id>justj</id><!-- Keep URL in sync with Oomph setup-->
       <url>https://download.eclipse.org/justj/jres/17/updates/release/latest/</url>
       <layout>p2</layout>
     </repository>
     <repository>
-      <id>justj-epp</id>
+      <id>justj-epp</id><!-- Keep URL in sync with Oomph setup-->
       <url>https://download.eclipse.org/justj/epp/milestone/latest/</url>
       <layout>p2</layout>
     </repository>