Bug 419528: Get rid of nested jarsI20140204-0800

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=419528
Signed-off-by: Mickael Istria <mistria@redhat.com>
Change-Id: I63a6e5a9c4b9a5c85e14148fe2ca79417d9f6118

6 files changed, 12 insertions, 12 deletions

diff --git a/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
index f432b58d2..b34f8aeaf 100644
--- a/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.tests;singleton:=true
 Bundle-Version: 3.5.500.qualifier
-Bundle-ClassPath: comparetests.jar
 Require-Bundle: org.junit,
  org.eclipse.compare,
  org.eclipse.jface.text,
diff --git a/tests/org.eclipse.compare.tests/build.properties b/tests/org.eclipse.compare.tests/build.properties
index c19c08f4a..687647417 100644
--- a/tests/org.eclipse.compare.tests/build.properties
+++ b/tests/org.eclipse.compare.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2014 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
@@ -7,15 +7,16 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
 ###############################################################################
 bin.includes = plugin.properties,\
                test.xml,\
                about.html,\
-               *.jar,\
+               .,\
                META-INF/,\
                patchdata/,\
                linereaderdata/
 
 src.includes = about.html
 
-source.comparetests.jar= src/
+source..= src/
diff --git a/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF b/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF
index 8285a7d8b..67b252c59 100644
--- a/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.tests.core; singleton:=true
 Bundle-Version: 3.7.200.qualifier
-Bundle-ClassPath: teamtests.jar
 Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.team.tests.core/build.properties b/tests/org.eclipse.team.tests.core/build.properties
index 597dfc01b..fd0aa1b90 100644
--- a/tests/org.eclipse.team.tests.core/build.properties
+++ b/tests/org.eclipse.team.tests.core/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2013 IBM Corporation and others.
+# Copyright (c) 2000, 2014 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
@@ -7,11 +7,12 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
 ###############################################################################
-source.teamtests.jar=src/
+source..=src/
 bin.includes = about.html,\
                plugin.xml,\
-               *.jar,\
+               .,\
                test.xml,\
                META-INF/,\
                plugin.properties
diff --git a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF
index 597db6d24..04ce570bf 100644
--- a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.tests.cvs.core; singleton:=true
 Bundle-Version: 3.3.500.qualifier
-Bundle-ClassPath: cvstests.jar
 Bundle-Activator: org.eclipse.team.tests.ccvs.core.TeamCVSTestPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.team.tests.cvs.core/build.properties b/tests/org.eclipse.team.tests.cvs.core/build.properties
index 3db205950..a5f557e53 100644
--- a/tests/org.eclipse.team.tests.cvs.core/build.properties
+++ b/tests/org.eclipse.team.tests.cvs.core/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2013 IBM Corporation and others.
+# Copyright (c) 2000, 2014 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
@@ -7,11 +7,12 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
 ###############################################################################
-source.cvstests.jar=src/
+source..=src/
 bin.includes = about.html,\
                plugin.xml,\
-               *.jar,\
+               .,\
                test.xml,\
                repository.properties,\
                resources/,\