From 65e9f02ac1c73847ac78395d9fdc3b6f0ca78ccf Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Mon, 20 Apr 2026 17:06:14 +0200 Subject: [PATCH] [RelEng] Inline o.e.sdk.tests feature into eclipse-junit-tests p2-repo The feature is referenced nowhere else than in the eclipse-junit-tests p2-repository and therefore this indirection is not necessary. Follow-up on - https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/3772 - https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/3779 --- .../features/org.eclipse.sdk.tests/.project | 17 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - .../org.eclipse.sdk.tests/build.properties | 20 - .../org.eclipse.sdk.tests/feature.properties | 45 -- .../org.eclipse.sdk.tests/feature.xml | 398 ------------------ .../forceQualifierUpdate.txt | 15 - sites/eclipse-junit-tests/category.xml | 94 ++++- 8 files changed, 93 insertions(+), 500 deletions(-) delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk.tests/.project delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.resources.prefs delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.runtime.prefs delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk.tests/build.properties delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.properties delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk.tests/forceQualifierUpdate.txt diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.project b/eclipse.platform.releng/features/org.eclipse.sdk.tests/.project deleted file mode 100644 index e69e63bee79..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.sdk.tests (feature) - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2a7..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -line.separator=\n diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/build.properties b/eclipse.platform.releng/features/org.eclipse.sdk.tests/build.properties deleted file mode 100644 index 6230b466620..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2021 IBM Corporation and others. -# -# This program and the accompanying materials -# are made available under the terms of the Eclipse Public License 2.0 -# which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes = feature.xml,\ - feature.properties - -! https://bugs.eclipse.org/bugs/show_bug.cgi?id=458885 -! If there are no root files, you do *not* want to say there is. -! or, build will break. -!root=rootfiles diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.properties b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.properties deleted file mode 100644 index 16e368696f8..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.properties +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2020 IBM Corporation and others. -# -# This program and the accompanying materials -# are made available under the terms of the Eclipse Public License 2.0 -# which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -# feature.properties -# contains externalized strings for feature.xml -# "%foo" in feature.xml corresponds to the key "foo" in this file -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file should be translated. - -# "featureName" property - name of the feature -featureName=Eclipse SDK Tests - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "updateSiteName" property - label for the update site -updateSiteName=Eclipse.org update site - -# "description" property - description of the feature -description=Eclipse SDK test plug-ins. Used in conjunction with Eclipse Project SDK. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2021 IBM Corporation and others.\n\ -\n\ -This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License 2.0\n\ -which accompanies this distribution, and is available at\n\ -https://www.eclipse.org/legal/epl-2.0/\n\ -\n\ -SPDX-License-Identifier: EPL-2.0\n\ -\n\ -Contributors:\n\ - IBM Corporation - initial API and implementation\n -################ end of copyright property #################################### \ No newline at end of file diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml deleted file mode 100644 index d1d1dbf6e54..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +++ /dev/null @@ -1,398 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/forceQualifierUpdate.txt b/eclipse.platform.releng/features/org.eclipse.sdk.tests/forceQualifierUpdate.txt deleted file mode 100644 index c180b3aa000..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/forceQualifierUpdate.txt +++ /dev/null @@ -1,15 +0,0 @@ -# To force a version qualifier update add the bug here -Bug 403352 - Update all parent versions to match our build stream - -# added third party bundle so need to force update in qualifier. -Bug 407833 - equinox can/should express it's own need for org.aspectj.weaver -Bug 405911 - 3 p2 bundles don't produce (or, package) their .source -Bug 463632 - [releng] Version of 'weaver' is old, in Platform builds? -Bug 467268 - Update to Orbit RC1 URL -Bug 468331 - Update EGit/JGit compile-time dependencies to Mars level -Bug 480835 - Failures in build due to changes not being picked up by tests -Bug 566156 - 4.17 I-Build: I20200818-0600 - BUILD FAILED -4.20 I-Build: I20210518-0600 - BUILD FAILED -Bug 577522 - Update test framework dependencies -Failed https://ci.eclipse.org/releng/job/Builds/job/I-build-4.36/61/consoleFull -Failed https://ci.eclipse.org/releng/job/Builds/job/I-build-4.37/14/ \ No newline at end of file diff --git a/sites/eclipse-junit-tests/category.xml b/sites/eclipse-junit-tests/category.xml index c37ba6e0472..f19846ed04c 100644 --- a/sites/eclipse-junit-tests/category.xml +++ b/sites/eclipse-junit-tests/category.xml @@ -1,10 +1,102 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +