Skip to content

Commit

Permalink
Move back to Linux Tools Docker nightly
Browse files Browse the repository at this point in the history
The commit resolves the resolution error that was raised in
eclipse-linuxtools/org.eclipse.linuxtools#232

If I can reproduce this error more standalone I will raise it with
PDE as having to include failureaccess from a p2 site sounds like
a bug. Look in the PR associated with this commit for a link to the
PDE bug (if I raise one)
  • Loading branch information
jonahgraham committed Jul 21, 2023
1 parent c8c1d04 commit 27a5b0c
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion releng/org.eclipse.cdt.target/cdt.target
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<unit id="org.eclipse.egit.feature.group" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/linuxtools/update-docker" />
<repository location="https://download.eclipse.org/linuxtools/updates-docker-nightly" />
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
Expand Down Expand Up @@ -146,6 +146,18 @@
<version>5.13.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.1-jre</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<version>1.0.1</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="ASM" missingManifest="error" type="Maven">
Expand Down Expand Up @@ -182,6 +194,12 @@
</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. -->
<unit id="com.google.guava.failureaccess" version="0.0.0" />
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17" />
<launcherArgs>
Expand Down

0 comments on commit 27a5b0c

Please sign in to comment.