From 248f20ffbdd8771549103211299cb24a6d1a89a3 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 12 May 2022 09:29:21 +0200 Subject: [PATCH] Move equinox.server.p2 into p2 repository (#42) This is the removal part of the move. --- .../org.eclipse.equinox.server.p2/.project | 17 -- .../.settings/org.eclipse.core.runtime.prefs | 2 - .../build.properties | 19 -- .../feature.properties | 39 ---- .../org.eclipse.equinox.server.p2/feature.xml | 180 ------------------ .../forceQualifierUpdate.txt | 26 --- pom.xml | 3 +- 7 files changed, 1 insertion(+), 285 deletions(-) delete mode 100644 features/org.eclipse.equinox.server.p2/.project delete mode 100644 features/org.eclipse.equinox.server.p2/.settings/org.eclipse.core.runtime.prefs delete mode 100644 features/org.eclipse.equinox.server.p2/build.properties delete mode 100644 features/org.eclipse.equinox.server.p2/feature.properties delete mode 100644 features/org.eclipse.equinox.server.p2/feature.xml delete mode 100644 features/org.eclipse.equinox.server.p2/forceQualifierUpdate.txt diff --git a/features/org.eclipse.equinox.server.p2/.project b/features/org.eclipse.equinox.server.p2/.project deleted file mode 100644 index 5f18981160..0000000000 --- a/features/org.eclipse.equinox.server.p2/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.equinox.server.p2 - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/org.eclipse.equinox.server.p2/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.equinox.server.p2/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2a..0000000000 --- a/features/org.eclipse.equinox.server.p2/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -line.separator=\n diff --git a/features/org.eclipse.equinox.server.p2/build.properties b/features/org.eclipse.equinox.server.p2/build.properties deleted file mode 100644 index a612354d8b..0000000000 --- a/features/org.eclipse.equinox.server.p2/build.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2011 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,\ - build.properties,\ - feature.properties -src.includes = build.properties,\ - feature.properties,\ - feature.xml diff --git a/features/org.eclipse.equinox.server.p2/feature.properties b/features/org.eclipse.equinox.server.p2/feature.properties deleted file mode 100644 index 229e65a629..0000000000 --- a/features/org.eclipse.equinox.server.p2/feature.properties +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################### -# Copyright (c) 2010, 2011 IBM, Composent, Inc. 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 - 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=p2 Server Feature - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse Equinox Project - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2010 IBM, Composent, Inc. and others.\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/ - -SPDX-License-Identifier: EPL-2.0\n\ -\n\ -Contributors:\n\ - IBM - initial API and implementation\n -################ end of copyright property #################################### \ No newline at end of file diff --git a/features/org.eclipse.equinox.server.p2/feature.xml b/features/org.eclipse.equinox.server.p2/feature.xml deleted file mode 100644 index 15141ae54d..0000000000 --- a/features/org.eclipse.equinox.server.p2/feature.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/features/org.eclipse.equinox.server.p2/forceQualifierUpdate.txt b/features/org.eclipse.equinox.server.p2/forceQualifierUpdate.txt deleted file mode 100644 index 107683b694..0000000000 --- a/features/org.eclipse.equinox.server.p2/forceQualifierUpdate.txt +++ /dev/null @@ -1,26 +0,0 @@ -# To force a version qualifier update add the bug here -Bug 403352 - Update all parent versions to match our build stream -Bug 406851 - Consume new SAT4J -Bug 406845 - Update repository of ECF in parent pom -Bug 406845 - Update repository of ECF in parent pom (new update) -Bug 409051 - Consume new SAT4J (2.3.5) -Bug 409868 - pickup new build of ECF -Bug 414457 - Comparator report indicates problem with org.eclipse.equinox.p2.ui.discovery -Bug 416293 - build failed due to issue in Starter Kit or p2.core.feature -Bug 423196 - Filetransfer update for Luna M5: httpcomponents 4.2.5/4.2.6 -Bug 419647 - React to ECF feature restructuring -Bug 429353 - change "includes ECF source" to "requires" in p2.sdk -Bug 432209 - needs to touch 3 equinox/p2 features, for qualifier change in org.sat4j.pb -Bug 434703 - equinox-sdk "product build" fails after ECF update -Bug 436039 - Hard to explain build failure in I20140528-0115 -Bug 436758 - Installing a bundle that requires Java 7 when running 6 with -clean cannot recover -Bug 444669 - Update to new ECF, with new HTTPComponents -Bug 453675 - touch org.eclipse.equinox.server.p2 for new httpcomponents -Bug 458346 - Unusual, hard to decipher error in I-build -Bug 462096 - Latest X-build fails on "equinox-sdk" product due to dependencies missing -Bug 506597 - Build failure on I20161026-2000 -Bug 528810 - Compilation failure in I20171214-2000 -Bug 444188 - EclipsePreferences is not thread safe -Bug 553238 - Unanticipated comparator errors in I20191119-1800 -Bug 568610 - 4.18 I-Build: I20201106-1800 - BUILD FAILED -[Features] Leverage transitive inclusion and build source-features: https://github.com/eclipse-equinox/equinox.bundles/pull/20 diff --git a/pom.xml b/pom.xml index ec638189c5..86a9ce674c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@