From b89f8ee63bb13c4ff0087ba150fcdf5e996e2c51 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Tue, 5 Dec 2023 22:54:36 +0100
Subject: [PATCH] Revert "Run some pde.build tests with Tycho"

This reverts commit 6e5138acab9998128905e533edf5d573b58196a3 as it will
introduce cyclic build error in the aggregator build.

See https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1639
See https://github.com/eclipse-pde/eclipse.pde/pull/980
---
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../META-INF/p2.inf                           |  2 -
 .../build.properties                          |  1 +
 build/org.eclipse.pde.build.tests/pom.xml     | 57 -------------------
 4 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 build/org.eclipse.pde.build.tests/META-INF/p2.inf
 delete mode 100644 build/org.eclipse.pde.build.tests/pom.xml

diff --git a/build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF b/build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
index 6cbfcb4966..e61b1de30b 100644
--- a/build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
@@ -14,8 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.apache.ant,
  org.eclipse.debug.core,
  org.eclipse.equinox.p2.publisher;bundle-version="1.1.0",
- org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0",
- org.eclipse.equinox.p2.repository.tools
+ org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
  org.eclipse.equinox.internal.p2.artifact.repository,
diff --git a/build/org.eclipse.pde.build.tests/META-INF/p2.inf b/build/org.eclipse.pde.build.tests/META-INF/p2.inf
deleted file mode 100644
index 747d90d2fd..0000000000
--- a/build/org.eclipse.pde.build.tests/META-INF/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-requires.0.namespace = org.eclipse.equinox.p2.iu
-requires.0.name = org.eclipse.osgi.compatibility.state
\ No newline at end of file
diff --git a/build/org.eclipse.pde.build.tests/build.properties b/build/org.eclipse.pde.build.tests/build.properties
index 7fca51dca4..5279318b69 100644
--- a/build/org.eclipse.pde.build.tests/build.properties
+++ b/build/org.eclipse.pde.build.tests/build.properties
@@ -20,4 +20,5 @@ bin.includes = META-INF/,\
                test.xml
 src.includes = about.html
 jars.compile.order = .
+pom.model.property.skipTests = true
 pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
diff --git a/build/org.eclipse.pde.build.tests/pom.xml b/build/org.eclipse.pde.build.tests/pom.xml
deleted file mode 100644
index 309d1c46db..0000000000
--- a/build/org.eclipse.pde.build.tests/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.pde</groupId>
-		<artifactId>eclipse.pde.build</artifactId>
-		<version>4.31.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.pde.build.tests</artifactId>
-	<version>1.4.300-SNAPSHOT</version>
-	<packaging>eclipse-test-plugin</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<configuration>
-					<dependency-resolution>
-						<extraRequirements>
-							<requirement>
-								<!-- The product -->
-								<type>p2-installable-unit</type>
-								<id>org.eclipse.sdk.ide</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-						</extraRequirements>
-					</dependency-resolution>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-surefire-plugin</artifactId>
-				<configuration>
-					<product>org.eclipse.sdk.ide</product>
-					<testRuntime>p2Installed</testRuntime>
-					<testClass>org.eclipse.pde.build.tests.PDEBuildTestSuite</testClass>
-					<systemProperties>
-						<pde.build.includeP2>false</pde.build.includeP2>
-					</systemProperties>
-				</configuration>
-				<executions>
-					<execution>
-						<id>p2-tests</id>
-						<goals><goal>test</goal></goals>
-						<configuration>
-							<testClass>org.eclipse.pde.build.tests.P2TestSuite</testClass>
-							<systemProperties/>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>