Skip to content

Commit

Permalink
Move entirely from the old Orbit repos to the new aggregated ones (#486)
Browse files Browse the repository at this point in the history 
I have also removed the now unused dependencies.
  • Loading branch information
@jonahgraham
jonahgraham authored Aug 2, 2023
1 parent e069e97 commit 9920d7a
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 31 deletions.
8 changes: 3 additions & 5 deletions debug/org.eclipse.cdt.debug.application.product/debug.product
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,13 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="com.sun.jna"/>
<plugin id="com.sun.jna.platform"/>
<plugin id="com.sun.xml.bind"/>
<plugin id="jakarta.activation-api"/>
<plugin id="jakarta.servlet-api"/>
<plugin id="jakarta.xml.bind"/>
<plugin id="javax.activation" version="1.2.2.v20221203-1659"/>
<plugin id="javax.activation" version="2.0.0.v20221203-1659"/>
<plugin id="jakarta.xml.bind-api"/>
<plugin id="javax.annotation"/>
<plugin id="javax.el-api"/>
<plugin id="javax.inject"/>
<plugin id="javax.servlet.jsp-api"/>
<plugin id="javax.xml"/>
<plugin id="javax.xml.stream"/>
<plugin id="org.apache.aries.spifly.dynamic.bundle"/>
<plugin id="org.apache.batik.constants"/>
<plugin id="org.apache.batik.css"/>
Expand Down Expand Up @@ -430,6 +427,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="org.osgi.util.xml"/>
<plugin id="org.sat4j.core"/>
<plugin id="org.sat4j.pb"/>
<plugin id="org.slf4j.api"/>
<plugin id="org.tukaani.xz"/>
<plugin id="org.w3c.css.sac"/>
<plugin id="org.w3c.dom.events"/>
Expand Down
55 changes: 29 additions & 26 deletions releng/org.eclipse.cdt.target/cdt.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="cdt" sequenceNumber="142">
<target name="cdt" sequenceNumber="143">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/cbi/updates/license/" />
Expand Down Expand Up @@ -50,22 +50,6 @@
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/0.15.0/" />
<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/" />
<unit id="com.sun.xml.bind" version="2.3.3.v20221203-1659" />
<unit id="javax.activation" version="1.2.2.v20221203-1659" />
<unit id="jakarta.xml.bind" version="2.3.3.v20221203-1659" />
<unit id="org.hamcrest" version="2.2.0.v20210711-0821" />
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519" />
<unit id="org.junit" version="4.13.2.v20211018-1956" />
<unit id="javax.activation" version="2.0.0.v20221203-1659" />
<unit id="javax.xml" version="1.4.1.v20220503-2331" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201118194144/repository/" />
<unit id="javax.xml.stream" version="0.0.0" />
<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0" />
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="DirectFromMaven" missingManifest="error" type="Maven">
<dependencies>
<dependency>
Expand Down Expand Up @@ -153,9 +137,15 @@
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<version>1.0.1</version>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -192,16 +182,29 @@
<version>9.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.2</version>
</dependency>
</dependencies>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly"/>
<!-- failureaccess is causing resolution issues when referenced from Maven directly, so rely on the already p2-ifed repo to access it.
But to make sure it ends up in orbit-aggregation we need to list it in the maven dependencies too.
See https://github.com/eclipse-pde/eclipse.pde/issues/675
-->
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
<!-- failureaccess is needed because the Linuxtools depends on it but doesn't republish it - https://github.com/eclipse-linuxtools/org.eclipse.linuxtools/issues/232
This dep can't be added to maven section because of https://github.com/eclipse-pde/eclipse.pde/issues/675 -->
<unit id="com.google.guava.failureaccess" version="0.0.0" />

<unit id="javax.inject" version="0.0.0" />
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740" />
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246" />
<unit id="org.junit" version="4.13.2.v20230725-0701" />
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17" />
Expand Down

0 comments on commit 9920d7a

Please sign in to comment.