From 7cd2e50b007ab39cc0f106cb10c47e5fb6fe8ad5 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 21 Sep 2024 15:47:57 +0200
Subject: [PATCH] [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
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/2381
---
 .../build.properties                          |  4 ++
 org.eclipse.jdt.annotation_v1/pom.xml         | 49 -------------------
 pom.xml                                       | 24 ---------
 3 files changed, 4 insertions(+), 73 deletions(-)
 delete mode 100644 org.eclipse.jdt.annotation_v1/pom.xml

diff --git a/org.eclipse.jdt.annotation_v1/build.properties b/org.eclipse.jdt.annotation_v1/build.properties
index 7e8b52d7d2e..369a33dfc1c 100644
--- a/org.eclipse.jdt.annotation_v1/build.properties
+++ b/org.eclipse.jdt.annotation_v1/build.properties
@@ -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
diff --git a/org.eclipse.jdt.annotation_v1/pom.xml b/org.eclipse.jdt.annotation_v1/pom.xml
deleted file mode 100644
index 82a5bf5ce5e..00000000000
--- a/org.eclipse.jdt.annotation_v1/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2021 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>eclipse.jdt.core</artifactId>
-    <groupId>org.eclipse.jdt</groupId>
-    <version>4.34.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>org.eclipse.jdt.annotation</artifactId>
-  <version>1.2.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
-  <properties>
-    <skipAPIAnalysis>true</skipAPIAnalysis>
-  </properties>
-  <build>
-    <plugins>
-      <plugin>
-       <groupId>org.eclipse.tycho.extras</groupId>
-       <artifactId>tycho-p2-extras-plugin</artifactId>
-       <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>true</skip>
-             <baselines>
-               <baseline>${previous-release.baseline}</baseline>
-             </baselines>
-             <comparator>zip</comparator>
-           </configuration>
-         </execution>
-       </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/pom.xml b/pom.xml
index 33be51567b2..ed9b192c1f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>