Rely purely on Orbit for 3rd party dependencies

eclipse-simrel/simrel.build#438
merks · Jul 20, 2024 · bd66c37 · bd66c37
1 parent 584c832
commit bd66c37
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 29 deletions.
diff --git a/features/org.eclipse.rap.e4.equinox.target.feature/pom.xml b/features/org.eclipse.rap.e4.equinox.target.feature/pom.xml
@@ -41,11 +41,6 @@
       <layout>p2</layout>
       <url>${jetty-repo.url}</url>
     </repository>
-    <repository>
-      <id>rap-apache-fileupload-repo</id>
-      <layout>p2</layout>
-      <url>${rap-apache-fileupload-repo.url}</url>
-    </repository>
   </repositories>
 
 </project>
diff --git a/features/org.eclipse.rap.equinox.target.feature/pom.xml b/features/org.eclipse.rap.equinox.target.feature/pom.xml
@@ -41,11 +41,6 @@
       <layout>p2</layout>
       <url>${jetty-repo.url}</url>
     </repository>
-    <repository>
-      <id>rap-apache-fileupload-repo</id>
-      <layout>p2</layout>
-      <url>${rap-apache-fileupload-repo.url}</url>
-    </repository>
   </repositories>
 
 </project>
diff --git a/releng/org.eclipse.rap.build/pom.xml b/releng/org.eclipse.rap.build/pom.xml
@@ -30,8 +30,6 @@
     <jetty-repo.url>https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.11/</jetty-repo.url>
     <orbit-repo.url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09/</orbit-repo.url>
     <platform-repo.url>https://download.eclipse.org/eclipse/updates/4.33-I-builds/I20240704-1800/</platform-repo.url>
-    <rap-extra-repo.url>https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/</rap-extra-repo.url>
-    <rap-apache-fileupload-repo.url>https://download.eclipse.org/rt/rap/base-platforms/3.14/commons-fileupload2/</rap-apache-fileupload-repo.url>
     <license-repo.url>https://download.eclipse.org/cbi/updates/license/1.0.1.v20140414-1359/</license-repo.url>
     <!-- The build type, N for nighty builds, S for stable builds. S-builds will be signed. -->
     <buildType>N</buildType>
@@ -53,20 +51,15 @@
       <layout>p2</layout>
       <url>${jetty-repo.url}</url>
     </repository>
-    <repository>
-      <id>rap-extra-repo</id>
-      <layout>p2</layout>
-      <url>${rap-extra-repo.url}</url>
-    </repository>
     <repository>
       <id>license-repo</id>
       <layout>p2</layout>
       <url>${license-repo.url}</url>
     </repository>
     <repository>
-      <id>rap-apache-fileupload-repo</id>
+      <id>orbit-repo</id>
       <layout>p2</layout>
-      <url>${rap-apache-fileupload-repo.url}</url>
+      <url>${orbit-repo.url}</url>
     </repository>
   </repositories>
 

diff --git a/releng/org.eclipse.rap.build/repository.e4/pom.xml b/releng/org.eclipse.rap.build/repository.e4/pom.xml
@@ -40,11 +40,6 @@
       <layout>p2</layout>
       <url>${jetty-repo.url}</url>
     </repository>
-    <repository>
-      <id>rap-apache-fileupload-repo</id>
-      <layout>p2</layout>
-      <url>${rap-apache-fileupload-repo.url}</url>
-    </repository>
   </repositories>
 
   <build>

diff --git a/releng/org.eclipse.rap.build/repository/pom.xml b/releng/org.eclipse.rap.build/repository/pom.xml
@@ -40,11 +40,6 @@
       <layout>p2</layout>
       <url>${jetty-repo.url}</url>
     </repository>
-    <repository>
-      <id>rap-apache-fileupload-repo</id>
-      <layout>p2</layout>
-      <url>${rap-apache-fileupload-repo.url}</url>
-    </repository>
   </repositories>
 
   <build>