From ae1d26bc2beee26b9e2429902f3968673220067d Mon Sep 17 00:00:00 2001 From: Hannes Wellmann 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 @@ - - - - 4.0.0 - - eclipse.jdt.core - org.eclipse.jdt - 4.34.0-SNAPSHOT - - org.eclipse.jdt.annotation - 1.2.100-SNAPSHOT - eclipse-plugin - - - true - - - - - org.eclipse.tycho.extras - tycho-p2-extras-plugin - - - compare-attached-artifacts-with-release - - compare-version-with-baselines - - - true - - ${previous-release.baseline} - - zip - - - - - - - diff --git a/pom.xml b/pom.xml index 33be51567b2..ed9b192c1f8 100644 --- a/pom.xml +++ b/pom.xml @@ -91,30 +91,6 @@ - - org.eclipse.tycho.extras - tycho-p2-extras-plugin - ${tycho.version} - - - compare-attached-artifacts-with-release - - compare-version-with-baselines - - - ${compare-version-with-baselines.skip} - - ${previous-release.baseline} - - zip - - META-INF/ECLIPSE_.RSA - META-INF/ECLIPSE_.SF - - - - -