Skip to content

Commit

Permalink
[Build] Remove duplicated configuration of tycho-p2-extras-plugin
Browse files Browse the repository at this point in the history
Most parts of the configuration are already inherited from the
'eclipse-platform-parent'.
And leverage the new overwritable property to permanently disable the
baseline check, which is introduced in
eclipse-platform/eclipse.platform.releng.aggregator#2381
  • Loading branch information
HannesWell authored and akurtakov committed Sep 27, 2024
1 parent cb2ef5d commit 7cd2e50
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 73 deletions.
4 changes: 4 additions & 0 deletions org.eclipse.jdt.annotation_v1/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ bin.includes = META-INF/,\
src/,\
about.html
src.includes = about.html

# Disable all baseline and API checks for this older version of org.eclipse.jdt.annotation
pom.model.property.skipAPIAnalysis = true
pom.model.property.version.baseline.check.skip = true
49 changes: 0 additions & 49 deletions org.eclipse.jdt.annotation_v1/pom.xml

This file was deleted.

24 changes: 0 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,30 +91,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-p2-extras-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution> <!-- Checks versions are properly bumped from one stream to the other -->
<id>compare-attached-artifacts-with-release</id>
<goals>
<goal>compare-version-with-baselines</goal>
</goals>
<configuration>
<skip>${compare-version-with-baselines.skip}</skip>
<baselines>
<baseline>${previous-release.baseline}</baseline>
</baselines>
<comparator>zip</comparator>
<ignoredPatterns>
<pattern>META-INF/ECLIPSE_.RSA</pattern>
<pattern>META-INF/ECLIPSE_.SF</pattern>
</ignoredPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down

0 comments on commit 7cd2e50

Please sign in to comment.