Skip to content

Commit

Permalink
Use final p2 repos for all CDT 11.6 dependencies
Browse files Browse the repository at this point in the history 
It is important we don't point at "latest" URLs for dependencies
as we want to ensure compatibility with 2024-06 and if some
project does a newer release we want to explicitly opt-in to
it on this CDT 11.6 branch
  • Loading branch information
@jonahgraham
jonahgraham committed Jun 24, 2024
1 parent 9f85daf commit d0d4135
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<tycho-version>4.0.6</tycho-version>
<cbi-plugins.version>1.4.3</cbi-plugins.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<cdt-site>https://ci.eclipse.org/cdt/job/cdt/job/main/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
<simrel-site>https://download.eclipse.org/staging/2024-06/</simrel-site>
<cdt-site>https://ci.eclipse.org/cdt/job/cdt/job/cdt_11_6/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
<simrel-site>https://download.eclipse.org/releases/2024-06//</simrel-site>
<repo-path>tools/cdt/builds/master/nightly</repo-path>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
Expand All @@ -40,9 +40,9 @@
<tycho.scmUrl>scm:git:https://github.com/eclipse-cdt/cdt</tycho.scmUrl>
<!-- Some old tests, like CDescriptorOldTests, fail due to reflection access. Therefore we add-opens to make that pass -->
<base.test.vmargs>-Xms256m -Xmx512m -ea --add-opens=java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED</base.test.vmargs>
<comparator.repo>https://download.eclipse.org/tools/cdt/builds/11.5/cdt-11.5.0-rc2/</comparator.repo>
<api-baseline.repo>https://download.eclipse.org/tools/cdt/builds/11.5/cdt-11.5.0-rc2/</api-baseline.repo>
<api-baseline.repo.simrel>https://download.eclipse.org/releases/2024-03/</api-baseline.repo.simrel>
<comparator.repo>https://download.eclipse.org/tools/cdt/releases/11.6/</comparator.repo>
<api-baseline.repo>https://download.eclipse.org/tools/cdt/releases/11.6/</api-baseline.repo>
<api-baseline.repo.simrel>https://download.eclipse.org/releases/2024-06/</api-baseline.repo.simrel>
<!-- these parameters are to control baseline replace and compare. On a local build you want
to avoid baseline replace and compare, especially if you have different versions of Java than
the baseline was built with. This is the default.
Expand Down
4 changes: 2 additions & 2 deletions releng/org.eclipse.cdt.target/cdt-baseline.target
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="cdt-baseline" sequenceNumber="37">
<target name="cdt-baseline" sequenceNumber="38">
<locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/cdt/builds/11.5/cdt-11.5.0-rc2/"/>
<repository location="https://download.eclipse.org/tools/cdt/releases/11.6/"/>
<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.build.crossgcc.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.cmake.feature.group" version="0.0.0"/>
Expand Down
20 changes: 10 additions & 10 deletions releng/org.eclipse.cdt.target/cdt.target
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="cdt" sequenceNumber="159">
<target name="cdt" sequenceNumber="160">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/cbi/updates/license/" />
<unit id="org.eclipse.license.feature.group" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds/" />
<repository location="https://download.eclipse.org/eclipse/updates/4.32/" />
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0" />
<unit id="org.eclipse.jdt.annotation" version="0.0.0" />
<unit id="org.eclipse.sdk.feature.group" version="0.0.0" />
<unit id="org.eclipse.test.feature.group" version="0.0.0" />
<unit id="org.eclipse.unittest.ui" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/mylyn/updates/release/latest/" />
<repository location="https://download.eclipse.org/mylyn/updates/release/4.3.0/" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/egit/updates" />
<repository location="https://download.eclipse.org/egit/updates-6.9/" />
<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/updates-docker-nightly" />
<repository location="https://download.eclipse.org/linuxtools/update-docker-5.15.0/" />
<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">
<repository location="https://download.eclipse.org/lsp4e/snapshots/" />
<repository location="https://download.eclipse.org/lsp4e/releases/0.26.2/" />
<unit id="org.eclipse.lsp4e" version="0.0.0" />
<unit id="org.eclipse.lsp4e.debug" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/" />
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.38.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/technology/swtbot/releases/latest" />
Expand All @@ -40,17 +40,17 @@
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tm4e/snapshots/" />
<repository location="https://download.eclipse.org/tm4e/releases/0.12.0/" />
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0" />
<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<!-- We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace. -->
<repository location="https://download.eclipse.org/tools/cdt/builds/11.5/cdt-11.5.0-rc2/" />
<repository location="https://download.eclipse.org/tools/cdt/releases/11.6/" />
<unit id="org.eclipse.cdt.feature.group" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/latest/" />
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.6/" />
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="DirectFromMaven" missingManifest="error" type="Maven">
<dependencies>
Expand Down

0 comments on commit d0d4135

Please sign in to comment.