[Releng] Update for newer USS SDK.

eclipse-oomph · May 24, 2021 · 682d0c5 · 682d0c5
1 parent 5046886
commit 682d0c5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target b/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from Oomph" sequenceNumber="71">
+<target name="Generated from Oomph" sequenceNumber="72">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="javaewah" version="0.0.0"/>
       <unit id="net.i2p.crypto.eddsa" version="0.0.0"/>
       <unit id="org.apache.commons.compress" version="0.0.0"/>
       <unit id="org.apache.sshd.osgi" version="0.0.0"/>
       <unit id="org.apache.sshd.sftp" version="0.0.0"/>
-      <unit id="org.bouncycastle.bcpg" version="0.0.0"/>
-      <unit id="org.bouncycastle.bcprov" version="0.0.0"/>
       <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.security" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="0.0.0"/>
       <unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.mylyn.builds.sdk.feature.group" version="0.0.0"/>
@@ -26,9 +22,7 @@
       <unit id="org.eclipse.userstorage.oauth" version="0.0.0"/>
       <unit id="org.eclipse.userstorage.tests" version="0.0.0"/>
       <unit id="org.slf4j.api" version="0.0.0"/>
-      <unit id="slf4j.api" version="0.0.0"/>
       <repository location="http://download.eclipse.org/usssdk/updates/latest"/>
-      <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.37.v20210219"/>
       <repository location="http://download.eclipse.org/egit/updates"/>
       <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
       <repository location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>

diff --git a/setups/Oomph.setup b/setups/Oomph.setup
@@ -492,15 +492,6 @@
             name="2021-06">
           <repository
               url="http://download.eclipse.org/usssdk/updates/latest"/>
-          <repository
-              url="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.37.v20210219">
-            <annotation>
-              <detail
-                  key="justification">
-                <value>The usssdk tests depend on a old version of Jetty that it not in the 4.20 version of the platform so we need this until they provide a new build that works with a newer Jetty.</value>
-              </detail>
-            </annotation>
-          </repository>
           <repository
               url="http://download.eclipse.org/egit/updates"/>
           <repository