Skip to content

Commit ae1d26b

Browse files
HannesWellakurtakov
authored andcommitted
[Build] Remove duplicated configuration of tycho-p2-extras-plugin
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
1 parent cb2ef5d commit ae1d26b

File tree

3 files changed

+4
-73
lines changed

3 files changed

+4
-73
lines changed

org.eclipse.jdt.annotation_v1/build.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ bin.includes = META-INF/,\
2020
src/,\
2121
about.html
2222
src.includes = about.html
23+
24+
# Disable all baseline and API checks for this older version of org.eclipse.jdt.annotation
25+
pom.model.property.skipAPIAnalysis = true
26+
pom.model.property.version.baseline.check.skip = true

org.eclipse.jdt.annotation_v1/pom.xml

Lines changed: 0 additions & 49 deletions
This file was deleted.

pom.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,30 +91,6 @@
9191
</execution>
9292
</executions>
9393
</plugin>
94-
<plugin>
95-
<groupId>org.eclipse.tycho.extras</groupId>
96-
<artifactId>tycho-p2-extras-plugin</artifactId>
97-
<version>${tycho.version}</version>
98-
<executions>
99-
<execution> <!-- Checks versions are properly bumped from one stream to the other -->
100-
<id>compare-attached-artifacts-with-release</id>
101-
<goals>
102-
<goal>compare-version-with-baselines</goal>
103-
</goals>
104-
<configuration>
105-
<skip>${compare-version-with-baselines.skip}</skip>
106-
<baselines>
107-
<baseline>${previous-release.baseline}</baseline>
108-
</baselines>
109-
<comparator>zip</comparator>
110-
<ignoredPatterns>
111-
<pattern>META-INF/ECLIPSE_.RSA</pattern>
112-
<pattern>META-INF/ECLIPSE_.SF</pattern>
113-
</ignoredPatterns>
114-
</configuration>
115-
</execution>
116-
</executions>
117-
</plugin>
11894
</plugins>
11995
</pluginManagement>
12096
</build>

0 commit comments

Comments
 (0)