Skip to content

Commit 014d865

Browse files
committed
[Build] Unify and clean-up list of declared CBI plugin-repositories
From the three declared Eclipse CBI plugin repositories only the maven-plugins with groupId 'org.eclipse.cbi.maven.plugins' are obtained. And at least with respect to these mavne-plugins, the repository at https://repo.eclipse.org/content/repositories/cbi is the combination of the co-located 'cbi-releases' and 'cbi-snapshot' repository. Additionally remove superfluous enabled=true tags.
1 parent 6c6a9bc commit 014d865

File tree

2 files changed

+5
-45
lines changed

2 files changed

+5
-45
lines changed

eclipse-platform-parent/pom.xml

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
<buildTimestamp>${maven.build.timestamp}</buildTimestamp>
4343
<buildType>I</buildType>
4444
<buildId>${buildType}${buildTimestamp}</buildId>
45+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
46+
4547
<!--
4648
releaseName should match the yearly "release train" name.
4749
For example, "Mars", "Mars.1", "Luna SR2", etc.
@@ -84,19 +86,14 @@
8486
<!-- only used when Tycho snapshot repo is enabled in <pluginRepositories> further down -->
8587
<tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
8688

87-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8889
<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
8990
<cbi-ecj-version>3.40.0.v20241010-0623</cbi-ecj-version>
9091

9192
<!--
9293
repo for released versions of CBI. Note, we intentionally use as specific a repo as possible.
9394
See bug 471835.
9495
-->
95-
<eclipse-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-repo.url>
96-
<cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
97-
98-
<cbi-releases-repo.url>https://repo.eclipse.org/content/repositories/cbi-releases/</cbi-releases-repo.url>
99-
96+
<eclipse-cbi-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-cbi-repo.url>
10097

10198
<!--
10299
This eclipse-p2-repo.url is specifically for the build-individual-bundles profile.
@@ -180,50 +177,15 @@
180177
<pluginRepository>
181178
<id>tycho-snapshots</id>
182179
<url>${tycho-snapshot-repo.url}</url>
183-
<releases>
184-
<enabled>true</enabled>
185-
</releases>
186-
<snapshots>
187-
<enabled>true</enabled>
188-
</snapshots>
189180
</pluginRepository>
190181

191182
<pluginRepository>
192183
<id>cbi-jdt</id>
193184
<url>${cbi-jdt-repo.url}</url>
194-
<releases>
195-
<enabled>true</enabled>
196-
</releases>
197-
<snapshots>
198-
<enabled>true</enabled>
199-
</snapshots>
200-
</pluginRepository>
201-
<pluginRepository>
202-
<id>cbi-snapshots</id>
203-
<url>${cbi-snapshots-repo.url}</url>
204-
<snapshots>
205-
<enabled>true</enabled>
206-
</snapshots>
207-
</pluginRepository>
208-
<pluginRepository>
209-
<id>cbi-releases</id>
210-
<url>${cbi-releases-repo.url}</url>
211-
<releases>
212-
<enabled>true</enabled>
213-
</releases>
214-
<snapshots>
215-
<enabled>true</enabled>
216-
</snapshots>
217185
</pluginRepository>
218186
<pluginRepository>
219-
<id>eclipse</id>
220-
<url>${eclipse-repo.url}</url>
221-
<releases>
222-
<enabled>true</enabled>
223-
</releases>
224-
<snapshots>
225-
<enabled>true</enabled>
226-
</snapshots>
187+
<id>eclipse-cbi</id>
188+
<url>${eclipse-cbi-repo.url}</url>
227189
</pluginRepository>
228190
</pluginRepositories>
229191
<build>

eclipse-platform-parent/saveproperties/mavenproperties.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,4 @@ comparator.repo=${comparator.repo}
2626

2727
eclipse-p2-repo.url=${eclipse-p2-repo.url}
2828

29-
eclipse-repo.url=${eclipse-repo.url}
30-
3129
sun.java.command=${sun.java.command}

0 commit comments

Comments
 (0)