Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2014-01-21 10:42:11 -0500
committerGerrit Code Review @ Eclipse.org2014-01-28 11:07:48 -0500
commit14a32ee6d3f278e07227201d038fc9a10e214dd0 (patch)
tree1395be3acbfe06f785528c6c526ea40c9bf1b401
parentdc47d11a77a291434ef0b9936648580deddd633f (diff)
downloadeclipse.platform.team-14a32ee6d3f278e07227201d038fc9a10e214dd0.tar.gz
eclipse.platform.team-14a32ee6d3f278e07227201d038fc9a10e214dd0.tar.xz
eclipse.platform.team-14a32ee6d3f278e07227201d038fc9a10e214dd0.zip
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
-rw-r--r--examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF1
-rw-r--r--examples/org.eclipse.compare.examples.xml/build.properties7
-rw-r--r--examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF1
-rw-r--r--examples/org.eclipse.compare.examples/build.properties7
-rw-r--r--examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF1
-rw-r--r--examples/org.eclipse.team.examples.filesystem/build.properties7
-rw-r--r--tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.compare.tests/build.properties7
-rw-r--r--tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.team.tests.core/build.properties7
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/build.properties7
12 files changed, 24 insertions, 24 deletions
diff --git a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
index fd1a06d07..6942c517f 100644
--- a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.examples.xml; singleton:=true
Bundle-Version: 3.3.400.qualifier
-Bundle-ClassPath: xmlcompareexamples.jar
Bundle-Activator: org.eclipse.compare.examples.xml.XMLPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/examples/org.eclipse.compare.examples.xml/build.properties b/examples/org.eclipse.compare.examples.xml/build.properties
index c86c3af9b..43053da6c 100644
--- a/examples/org.eclipse.compare.examples.xml/build.properties
+++ b/examples/org.eclipse.compare.examples.xml/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 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
###############################################################################
-source.xmlcompareexamples.jar = src/
+source.. = src/
bin.includes = doc-html/,\
about.html,\
plugin.properties,\
plugin.xml,\
icons/,\
- xmlcompareexamples.jar,\
+ .,\
META-INF/
src.includes = about.html
diff --git a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
index bda65b26a..70c9503ae 100644
--- a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.examples; singleton:=true
Bundle-Version: 3.1.400.qualifier
-Bundle-ClassPath: compareexamples.jar
Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/examples/org.eclipse.compare.examples/build.properties b/examples/org.eclipse.compare.examples/build.properties
index 598a4ad74..999b5985f 100644
--- a/examples/org.eclipse.compare.examples/build.properties
+++ b/examples/org.eclipse.compare.examples/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 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,14 +7,15 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
-source.compareexamples.jar = src/
+source.. = src/
bin.includes = doc-html/,\
about.html,\
plugin.properties,\
plugin.xml,\
- compareexamples.jar,\
+ .,\
META-INF/
src.includes = about.html
diff --git a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
index 24dbd70f0..288a21f65 100644
--- a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.examples.filesystem; singleton:=true
Bundle-Version: 3.4.300.qualifier
-Bundle-ClassPath: teamfilesystem.jar
Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/examples/org.eclipse.team.examples.filesystem/build.properties b/examples/org.eclipse.team.examples.filesystem/build.properties
index 893b8339e..690a9df4e 100644
--- a/examples/org.eclipse.team.examples.filesystem/build.properties
+++ b/examples/org.eclipse.team.examples.filesystem/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 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,14 +7,15 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
# Eclipse build contribution
-source.teamfilesystem.jar=src/
+source..=src/
src.includes=about.html
bin.includes = about.html,\
icons/,\
doc-html/,\
plugin.xml,\
plugin.properties,\
- *.jar,\
+ .,\
META-INF/
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/,\

Back to the top