diff options
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | tests/org.eclipse.swt.tests.fragments.feature/.project | 17 | ||||
-rw-r--r-- | tests/org.eclipse.swt.tests.fragments.feature/build.properties | 16 | ||||
-rw-r--r-- | tests/org.eclipse.swt.tests.fragments.feature/feature.properties | 30 | ||||
-rw-r--r-- | tests/org.eclipse.swt.tests.fragments.feature/feature.xml | 88 | ||||
-rw-r--r-- | tests/org.eclipse.swt.tests.fragments.feature/pom.xml | 25 | ||||
-rw-r--r-- | tests/org.eclipse.swt.tests.gtk/pom.xml | 18 | ||||
-rw-r--r-- | tests/org.eclipse.swt.tests/pom.xml | 18 |
8 files changed, 1 insertions, 213 deletions
@@ -117,7 +117,7 @@ <module>examples/org.eclipse.swt.examples.launcher</module> <module>examples/org.eclipse.swt.examples.ole.win32</module> <module>examples/org.eclipse.swt.examples.views</module> - <module>tests/org.eclipse.swt.tests.fragments.feature</module> + <!--module>tests/org.eclipse.swt.tests.fragments.feature</module--> <module>tests/org.eclipse.swt.tests</module> <module>features/org.eclipse.swt.tools.feature</module> </modules> diff --git a/tests/org.eclipse.swt.tests.fragments.feature/.project b/tests/org.eclipse.swt.tests.fragments.feature/.project deleted file mode 100644 index ef53e6a0d4..0000000000 --- a/tests/org.eclipse.swt.tests.fragments.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.swt.tests.feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.swt.tests.fragments.feature/build.properties b/tests/org.eclipse.swt.tests.fragments.feature/build.properties deleted file mode 100644 index 4e6b01688e..0000000000 --- a/tests/org.eclipse.swt.tests.fragments.feature/build.properties +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################ -# Copyright (c) 2010, 2014 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
\ No newline at end of file diff --git a/tests/org.eclipse.swt.tests.fragments.feature/feature.properties b/tests/org.eclipse.swt.tests.fragments.feature/feature.properties deleted file mode 100644 index f9a82dfb59..0000000000 --- a/tests/org.eclipse.swt.tests.fragments.feature/feature.properties +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################### -# Copyright (c) 2014, 2016 Red Hat 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: -# Alexander Kurtakov <akurtako@redhat.com> - initial API and implementation -############################################################################### -featureName=SWT Tools -description=SWT Tools, including Sleak, SWT Spy Plugin, and JniGen. -descriptionURL=https://www.eclipse.org/swt/tools/ -providerName=Eclipse.org - -copyright=\ -Copyright (c) 2014, 2016 Red Hat 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\ - Red Hat Inc. - initial API and implementation\n diff --git a/tests/org.eclipse.swt.tests.fragments.feature/feature.xml b/tests/org.eclipse.swt.tests.fragments.feature/feature.xml deleted file mode 100644 index 5f506bd56c..0000000000 --- a/tests/org.eclipse.swt.tests.fragments.feature/feature.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.swt.tests.fragments.feature" - label="%featureName" - version="3.106.0.qualifier" - provider-name="%providerName" - license-feature="org.eclipse.license" - license-feature-version="0.0.0"> - - <description url="%descriptionURL"> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <plugin - id="org.eclipse.swt.gtk.linux.x86_64" - os="linux" - ws="gtk" - arch="x86_64" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.swt.gtk.linux.ppc64le" - os="linux" - ws="gtk" - arch="ppc64le" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.swt.gtk.linux.aarch64" - os="linux" - ws="gtk" - arch="aarch64" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.swt.win32.win32.x86_64" - os="win32" - ws="win32" - arch="x86_64" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.swt.cocoa.macosx.x86_64" - os="macosx" - ws="cocoa" - arch="x86_64" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.swt.cocoa.macosx.aarch64" - os="macosx" - ws="cocoa" - arch="aarch64" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - -</feature> diff --git a/tests/org.eclipse.swt.tests.fragments.feature/pom.xml b/tests/org.eclipse.swt.tests.fragments.feature/pom.xml deleted file mode 100644 index f358e6d0ba..0000000000 --- a/tests/org.eclipse.swt.tests.fragments.feature/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2014 Red Hat Inc. 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: - Alexander Kurtakov <akurtako@redhat.com> - initial implementation ---> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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> - <artifactId>eclipse.platform.swt</artifactId> - <groupId>eclipse.platform.swt</groupId> - <version>4.23.0-SNAPSHOT</version> - <relativePath>../../</relativePath> - </parent> - <groupId>org.eclipse.swt.tests</groupId> - <artifactId>org.eclipse.swt.tests.fragments.feature</artifactId> - <version>3.106.0-SNAPSHOT</version> - <packaging>eclipse-feature</packaging> -</project> diff --git a/tests/org.eclipse.swt.tests.gtk/pom.xml b/tests/org.eclipse.swt.tests.gtk/pom.xml index 7baaab386c..8e4d84a5d9 100644 --- a/tests/org.eclipse.swt.tests.gtk/pom.xml +++ b/tests/org.eclipse.swt.tests.gtk/pom.xml @@ -29,24 +29,6 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <configuration> - <!-- Make all platform-specific fragments available (and optional) via a feature --> - <dependency-resolution> - <extraRequirements> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.swt.tests.fragments.feature</id> - <versionRange>0.0.0</versionRange> - </requirement> - </extraRequirements> - </dependency-resolution> - <!-- but only resolve against current environment as we don't want all fragments simultaneously in test --> - <environments combine.self="override"/> <!-- we only want platform specific artifacts here --> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> <skipTests>true</skipTests> <!-- Skip all tests on build servers, because it contains platform specific code --> diff --git a/tests/org.eclipse.swt.tests/pom.xml b/tests/org.eclipse.swt.tests/pom.xml index 3a2666e9b4..264d236f70 100644 --- a/tests/org.eclipse.swt.tests/pom.xml +++ b/tests/org.eclipse.swt.tests/pom.xml @@ -30,24 +30,6 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <configuration> - <!-- Make all platform-specific fragments available (and optional) via a feature --> - <dependency-resolution> - <extraRequirements> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.swt.tests.fragments.feature</id> - <versionRange>0.0.0</versionRange> - </requirement> - </extraRequirements> - </dependency-resolution> - <!-- but only resolve against current environment as we don't want all fragments simultaneously in test --> - <environments combine.self="override"/> <!-- we only want platform specific artifacts here --> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> <skipTests>true</skipTests> <!-- Use maven surefire --> |