From 1e19b207ee4d36455eac0e0b648eebd1fb28f98b Mon Sep 17 00:00:00 2001 From: Sravan Kumar Lakkimsetti Date: Thu, 27 Jul 2017 13:33:37 +0530 Subject: Bug 518239 - [JUnit 5] Feature patch for JUnit 5 support on 4.7 Change-Id: I51860ba617a0e9d86d72d09c0a393a2a0a4085b4 Signed-off-by: Sravan Kumar Lakkimsetti --- eclipse-platform-parent/pom.xml | 5 +- .../junit5/org.eclipse.jdt-feature-dummy/.project | 17 - .../.settings/org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - .../org.eclipse.jdt-feature-dummy/build.properties | 13 - .../feature.properties | 36 - .../org.eclipse.jdt-feature-dummy/feature.xml | 29 - .../forceQualifierUpdate.txt | 3 - .../junit5/org.eclipse.jdt-feature-dummy/pom.xml | 24 - .../junit5/org.eclipse.jdt.dummy/.classpath | 7 - .../junit5/org.eclipse.jdt.dummy/.gitignore | 2 - .../junit5/org.eclipse.jdt.dummy/.project | 28 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../org.eclipse.jdt.dummy/META-INF/MANIFEST.MF | 6 - .../junit5/org.eclipse.jdt.dummy/build.properties | 4 - .../junit5/org.eclipse.jdt.dummy/pom.xml | 37 - .../junit5/org.eclipse.jdt.junit5/category.xml | 9 +- .../junit5/org.eclipse.jdt.junit5patch/.project | 17 - .../org.eclipse.jdt.junit5patch/build.properties | 13 - .../org.eclipse.jdt.junit5patch/feature.properties | 36 - .../junit5/org.eclipse.jdt.junit5patch/feature.xml | 68 -- .../forceQualifierUpdate.txt | 5 - .../junit5/org.eclipse.jdt.junit5patch/pom.xml | 73 -- .../sourceTemplateFeature/feature.properties | 36 - .../sourceTemplateFeature/p2.inf | 2 - .../junit5/pom.xml | 2 - .../.gitignore | 1 - .../eclipse.releng.repository.junit5patch/.project | 11 - .../antrunbuild.xml | 66 -- .../category.xml | 11 - .../example.content.xml | 955 --------------------- .../patchMatchVersion.xsl | 74 -- .../eclipse.releng.repository.junit5patch/pom.xml | 37 - .../testExactVersion.xml | 47 - .../org.eclipse.jdt-feature-dummy/.project | 17 - .../.settings/org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - .../org.eclipse.jdt-feature-dummy/build.properties | 13 - .../feature.properties | 36 - .../org.eclipse.jdt-feature-dummy/feature.xml | 29 - .../forceQualifierUpdate.txt | 3 - .../org.eclipse.jdt-feature-dummy/pom.xml | 24 - .../junit5patch/org.eclipse.jdt.dummy/.classpath | 7 - .../junit5patch/org.eclipse.jdt.dummy/.gitignore | 2 - .../junit5patch/org.eclipse.jdt.dummy/.project | 28 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../org.eclipse.jdt.dummy/META-INF/MANIFEST.MF | 6 - .../org.eclipse.jdt.dummy/build.properties | 4 - .../junit5patch/org.eclipse.jdt.dummy/pom.xml | 37 - .../org.eclipse.jdt.junit5patch/.project | 17 - .../org.eclipse.jdt.junit5patch/build.properties | 13 - .../org.eclipse.jdt.junit5patch/feature.properties | 36 - .../org.eclipse.jdt.junit5patch/feature.xml | 40 - .../forceQualifierUpdate.txt | 5 - .../org.eclipse.jdt.junit5patch/pom.xml | 74 -- .../sourceTemplateFeature/feature.properties | 36 - .../sourceTemplateFeature/p2.inf | 2 - .../junit5patch/pom.xml | 45 - production/master-build.sh | 9 +- 59 files changed, 9 insertions(+), 2170 deletions(-) delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.project delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/build.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/pom.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.classpath delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.gitignore delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.project delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/build.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/pom.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/.project delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/build.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/pom.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.gitignore delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.project delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/antrunbuild.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/category.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/example.content.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/patchMatchVersion.xsl delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/pom.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/testExactVersion.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.project delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/build.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/feature.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/feature.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/pom.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.classpath delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.gitignore delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.project delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/build.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/pom.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/.project delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/build.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/feature.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/feature.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/pom.xml delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/junit5patch/pom.xml diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index d227f767a..9cb4dd614 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -599,12 +599,9 @@ junit5patch - - 'v'yyyyMMdd-HHmm'_BETA_JUNIT5' - - eclipse-p2-repo-junit5patch47 + eclipse-p2-repo-junit5 http://download.eclipse.org/eclipse/updates/4.8-I-builds p2 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.project deleted file mode 100644 index 18dff936d..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.jdt-feature-dummy - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.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.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.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.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/build.properties deleted file mode 100644 index 9cac5adb0..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/build.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2016 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes=\ -feature.xml,\ -feature.properties diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.properties deleted file mode 100644 index ff73caca5..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2016 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# 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 Java Development Tools - Dummy, for build only. - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "description" property - description of the feature -description=Dummy feature for build-time constraint. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2017 IBM Corporation and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\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.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.xml deleted file mode 100644 index 9ba8b40b8..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt deleted file mode 100644 index b7a663775..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt +++ /dev/null @@ -1,3 +0,0 @@ -# To force a version qualifier update add the bug here -Copyright Change -[Bug 509505] Create Java9 patch build for Oxygen M4 \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/pom.xml deleted file mode 100644 index 9c31a446a..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng.junit5 - 4.8.0-SNAPSHOT - - org.eclipse.jdt.feature - org.eclipse.jdt - 3.13.0-SNAPSHOT - eclipse-feature - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.classpath b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.classpath deleted file mode 100644 index eca7bdba8..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.gitignore b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.gitignore deleted file mode 100644 index 5f875e59d..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# special case of ignoring "src" since this is a "dummy" plugin, with no source -/src/ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.project deleted file mode 100644 index 6de05941f..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.jdt.dummy - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dc..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF deleted file mode 100644 index f8d881a04..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF +++ /dev/null @@ -1,6 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Dummy -Bundle-SymbolicName: org.eclipse.jdt.dummy -Bundle-Version: 1.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/build.properties deleted file mode 100644 index 34d2e4d2d..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/pom.xml deleted file mode 100644 index 75b592810..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng.junit5 - 4.8.0-SNAPSHOT - - org.eclipse.jdt - org.eclipse.jdt.dummy - 0.0.1-SNAPSHOT - eclipse-plugin - - - - - org.eclipse.tycho - tycho-packaging-plugin - 1.1.0-SNAPSHOT - - - 'v20160301-1504' - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/category.xml index 3cf8fe293..03c526ad0 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/category.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/category.xml @@ -1,7 +1,10 @@ - - + + - + + + + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/.project deleted file mode 100644 index c9de8d73c..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.jdt.java9patch - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/build.properties deleted file mode 100644 index 583b21d9c..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/build.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2016 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation and others - initial API and implementation -############################################################################### -bin.includes = feature.xml,\ - feature.properties - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.properties deleted file mode 100644 index 4beb68a93..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2017 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation and others - 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 JDT (Java Development Tools) Patch with Java 9 support (BETA) for Oxygen development stream - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "description" property - description of the feature -description=Eclipse Java 9 Support (BETA) for Oxygen development stream - This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP. - This feature includes only runtime code. It is intended only for Oxygen development stream, and if used on other versions or streams, may cause bundles to be down-leveled or up-leveled.\n - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2017 IBM Corporation and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ -\n\ -Contributors:\n\ - IBM Corporation and others - initial API and implementation\n -################ end of copyright property #################################### \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.xml deleted file mode 100644 index 9fb198311..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt deleted file mode 100644 index 95d2526b5..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt +++ /dev/null @@ -1,5 +0,0 @@ -Bug 479660 - [BETA_JAVA9] Build Eclipse SDK from 'BETA_JAVA9' branches --- there are 4 or 6 places to modify when updating. -Bug 486749 - [BETA_JAVA9] Build Eclipse SDK patch from 'BETA_JAVA9' branches -Updating to Oxygen -[Bug 509505] Create Java9 patch build for Oxygen M4 \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/pom.xml deleted file mode 100644 index 5569122e4..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng.junit5 - 4.8.0-SNAPSHOT - - org.eclipse.jdt.feature - org.eclipse.jdt.junit5patch - 0.0.1-SNAPSHOT - eclipse-feature - - - - - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - - - package - source-feature - - source-feature - - - - - - - - org.eclipse.tycho - tycho-p2-plugin - 1.1.0-SNAPSHOT - - - attached-p2-metadata - package - - p2-metadata - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties deleted file mode 100644 index 33fd135a2..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2017 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation and others - 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 JDT (Java Development Tools) Source Patch with Junit 5 support (BETA) for Oxygen development stream - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "description" property - description of the feature -description=Eclipse Junit 5 Support (BETA) for Oxygen development stream - This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP. - This feature includes only runtime code and source bundles. It is intended only for Oxygen development stream, and if used on other versions or streams, may cause bundles to be down-leveled or up-leveled.\n - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2017 IBM Corporation and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ -\n\ -Contributors:\n\ - IBM Corporation and others - initial API and implementation\n -################ end of copyright property #################################### \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf deleted file mode 100644 index ae1a208ff..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf +++ /dev/null @@ -1,2 +0,0 @@ -properties.0.name = org.eclipse.equinox.p2.type.patch -properties.0.value = false \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/pom.xml index 8a1ee6932..a47c96e3f 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/pom.xml @@ -66,7 +66,5 @@ ../../eclipse.jdt/org.eclipse.jdt-feature ../../eclipse.jdt/org.eclipse.jdt org.eclipse.jdt.junit5 - org.eclipse.jdt.junit5patch - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.gitignore b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.gitignore deleted file mode 100644 index d769a2e0a..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/example.content.new.xml diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.project deleted file mode 100644 index b6283c2b0..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - eclipse.releng.repository.junit5patch - - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/antrunbuild.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/antrunbuild.xml deleted file mode 100644 index eb4be335e..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/antrunbuild.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/category.xml deleted file mode 100644 index a98d05fd3..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/category.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - Eclipse JUnit 5 Support (BETA) for Oxygen development stream - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/example.content.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/example.content.xml deleted file mode 100644 index 7e91422c6..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/example.content.xml +++ /dev/null @@ -1,955 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - (org.eclipse.update.install.features=true) - - - - - - uninstallFeature(feature:${artifact},featureId:default,featureVersion:default) - - - installFeature(feature:${artifact},featureId:default,featureVersion:default) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bundle-SymbolicName: org.eclipse.jdt.core.source Bundle-Version: 3.12.0.v20150831-1725_BETA_JAVA9 - - - - - - - - - - - - - - - - - - - - - - - - - - (org.eclipse.update.install.features=true) - - - - - - - - - true - - - - - - %license - - - - %copyright - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (&(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa)) - - - - - - addJvmArg(jvmArg:-XstartOnFirstThread);addJvmArg(jvmArg:-Dorg.eclipse.swt.internal.carbon.smallFonts); - - - removeJvmArg(jvmArg:-XstartOnFirstThread);removeJvmArg(jvmArg:-Dorg.eclipse.swt.internal.carbon.smallFonts); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bundle-SymbolicName: org.eclipse.jdt.ui.source Bundle-Version: 3.12.0.v20150831-1650_BETA_JAVA9 - - - - - - - - - - - - - - - - - - - - - - - removeSourceBundle(bundle:${artifact}) - - - addSourceBundle(bundle:${artifact}) - - - - - - - - - - - - - - - - - - (org.eclipse.update.install.features=true) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bundle-SymbolicName: org.eclipse.jdt.ui; singleton:=true Bundle-Version: 3.12.0.v20150831-1650_BETA_JAVA9 - - - - - - - - - - - - (&(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa)) - - - - - - - - - - - - - - - - - - - - - - - - - - (org.eclipse.update.install.features=true) - - - - - - - - - true - - - - - - %license - - - - %copyright - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (org.eclipse.update.install.features=true) - - - - - - - %license - - - - %copyright - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true Bundle-Version: 3.12.0.v20150831-1725_BETA_JAVA9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bundle-SymbolicName: org.eclipse.jdt.launching.source Bundle-Version: 3.8.0.v20150831-1702_BETA_JAVA9 - - - - - - - - - - - - - - - - - - - - - - - uninstallBundle(bundle:${artifact}) - - - installBundle(bundle:${artifact}) - - - setStartLevel(startLevel:4); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true Bundle-Version: 3.8.0.v20150831-1702_BETA_JAVA9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (org.eclipse.update.install.features=true) - - - - - - - %license - - - - %copyright - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/patchMatchVersion.xsl b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/patchMatchVersion.xsl deleted file mode 100644 index 112838c13..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/patchMatchVersion.xsl +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - $patchFeatureVersionRange - - - $patchFeatureIU - - - - " - - - ' - - - - - - - - This content.xml file was transformed to include "specific range match" - for the feature intended to be patched. - Feature (IU) to be patched: - - Version Range: - - - XSLT Version = - XSLT Vendor = - XSLT Vendor URL = - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/pom.xml deleted file mode 100644 index 792977a78..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng.junit5patch - 4.7.0-SNAPSHOT - ../ - - - eclipse.platform.releng - eclipse.releng.repository.junit5patch - 1.1.0-SNAPSHOT - eclipse-repository - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/testExactVersion.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/testExactVersion.xml deleted file mode 100644 index 1d343c1d3..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/testExactVersion.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.project deleted file mode 100644 index 18dff936d..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.jdt-feature-dummy - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.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.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/.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.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/build.properties deleted file mode 100644 index 9cac5adb0..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/build.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2016 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes=\ -feature.xml,\ -feature.properties diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/feature.properties deleted file mode 100644 index ff73caca5..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/feature.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2016 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# 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 Java Development Tools - Dummy, for build only. - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "description" property - description of the feature -description=Dummy feature for build-time constraint. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2017 IBM Corporation and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\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.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/feature.xml deleted file mode 100644 index c979e36ef..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/feature.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt deleted file mode 100644 index b7a663775..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt +++ /dev/null @@ -1,3 +0,0 @@ -# To force a version qualifier update add the bug here -Copyright Change -[Bug 509505] Create Java9 patch build for Oxygen M4 \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/pom.xml deleted file mode 100644 index 5a358aeae..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt-feature-dummy/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng.junit5patch - 4.7.0-SNAPSHOT - - org.eclipse.jdt.feature - org.eclipse.jdt - 3.13.0.v20170531-2000 - eclipse-feature - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.classpath b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.classpath deleted file mode 100644 index eca7bdba8..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.gitignore b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.gitignore deleted file mode 100644 index 5f875e59d..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# special case of ignoring "src" since this is a "dummy" plugin, with no source -/src/ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.project deleted file mode 100644 index 6de05941f..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.jdt.dummy - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dc..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF deleted file mode 100644 index f8d881a04..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF +++ /dev/null @@ -1,6 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Dummy -Bundle-SymbolicName: org.eclipse.jdt.dummy -Bundle-Version: 1.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/build.properties deleted file mode 100644 index 34d2e4d2d..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/pom.xml deleted file mode 100644 index 86fdddc9c..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.dummy/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng.junit5patch - 4.7.0-SNAPSHOT - - org.eclipse.jdt - org.eclipse.jdt.dummy - 1.0.1-SNAPSHOT - eclipse-plugin - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - 'v20160301-1504' - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/.project deleted file mode 100644 index 22a07839c..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.jdt.junit5patch - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/build.properties deleted file mode 100644 index 583b21d9c..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/build.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2016 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation and others - initial API and implementation -############################################################################### -bin.includes = feature.xml,\ - feature.properties - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/feature.properties deleted file mode 100644 index d035c1d1a..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/feature.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2017 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation and others - 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 JDT (Java Development Tools) Patch with JUnit 5 support (BETA) for Oxygen development stream - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "description" property - description of the feature -description=Eclipse JUnit 5 Support (BETA) for Oxygen development stream - This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP. - This feature includes only runtime code. It is intended only for Oxygen development stream, and if used on other versions or streams, may cause bundles to be down-leveled or up-leveled.\n - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2017 IBM Corporation and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ -\n\ -Contributors:\n\ - IBM Corporation and others - initial API and implementation\n -################ end of copyright property #################################### \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/feature.xml deleted file mode 100644 index 14452608a..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/feature.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt deleted file mode 100644 index 95d2526b5..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt +++ /dev/null @@ -1,5 +0,0 @@ -Bug 479660 - [BETA_JAVA9] Build Eclipse SDK from 'BETA_JAVA9' branches --- there are 4 or 6 places to modify when updating. -Bug 486749 - [BETA_JAVA9] Build Eclipse SDK patch from 'BETA_JAVA9' branches -Updating to Oxygen -[Bug 509505] Create Java9 patch build for Oxygen M4 \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/pom.xml deleted file mode 100644 index d37d34a44..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng.junit5patch - 4.7.0-SNAPSHOT - - org.eclipse.jdt.feature - org.eclipse.jdt.junit5patch - 1.0.0-SNAPSHOT - eclipse-feature - - - - - - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - - - package - source-feature - - source-feature - - - - - - - - org.eclipse.tycho - tycho-p2-plugin - ${tycho.version} - - - attached-p2-metadata - package - - p2-metadata - - - - - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties deleted file mode 100644 index 2d6b71e77..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2017 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation and others - 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 JDT (Java Development Tools) Source Patch with JUnit 5 support (BETA) for Oxygen development stream - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "description" property - description of the feature -description=Eclipse JUnit 5 Support (BETA) for Oxygen development stream - This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP. - This feature includes only runtime code and source bundles. It is intended only for Oxygen development stream, and if used on other versions or streams, may cause bundles to be down-leveled or up-leveled.\n - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2017 IBM Corporation and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ -\n\ -Contributors:\n\ - IBM Corporation and others - initial API and implementation\n -################ end of copyright property #################################### \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf deleted file mode 100644 index d4191713a..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf +++ /dev/null @@ -1,2 +0,0 @@ -properties.0.name = org.eclipse.equinox.p2.type.patch -properties.0.value = true \ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/pom.xml deleted file mode 100644 index 68fd7b925..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - - org.eclipse - eclipse-platform-parent - 4.7.0-SNAPSHOT - ../../eclipse-platform-parent - - - eclipse.platform.releng - eclipse.platform.releng.junit5patch - 4.7.0-SNAPSHOT - pom - - - scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator - - - - ../../eclipse.platform.releng.prereqs.sdk - ../../eclipse.jdt.ui/org.eclipse.jdt.ui - ../../eclipse.jdt.ui/org.eclipse.jdt.ui.tests - ../../eclipse.jdt.ui/org.eclipse.jdt.junit - ../../eclipse.jdt.ui/org.eclipse.jdt.junit.core - ../../eclipse.jdt.ui/org.eclipse.jdt.junit.runtime - ../../eclipse.jdt.ui/org.eclipse.jdt.junit4.runtime - ../../eclipse.jdt.ui/org.eclipse.jdt.junit5.runtime - ../../eclipse.jdt/org.eclipse.jdt-feature - eclipse.releng.repository.junit5patch - diff --git a/production/master-build.sh b/production/master-build.sh index 913e1c4a1..406560002 100755 --- a/production/master-build.sh +++ b/production/master-build.sh @@ -392,13 +392,8 @@ fi #then # echo "[WARNING] Did not run pom-version-updater due to other variable settings" #else - if [[ "junit5" == "${PATCH_BUILD}" ]] - then - echo "[WARNING] Did not run pom-version-updater due to other variable settings" - else - $SCRIPT_PATH/pom-version-updater.sh $BUILD_ENV_FILE 2>&1 | tee ${POM_VERSION_UPDATE_BUILD_LOG} - printf "%-35s %s\n" "Load after run-version-updater: " "$(uptime)" >> ${loadLog} - fi + $SCRIPT_PATH/pom-version-updater.sh $BUILD_ENV_FILE 2>&1 | tee ${POM_VERSION_UPDATE_BUILD_LOG} + printf "%-35s %s\n" "Load after run-version-updater: " "$(uptime)" >> ${loadLog} #fi # if file exists, pom update failed if [[ -f "${buildDirectory}/buildFailed-pom-version-updater" ]] -- cgit v1.2.3