Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2013-09-11 16:44:17 +0000
committerMickael Istria2014-01-08 11:42:34 +0000
commit7d9897e952812db5005bffdb93fc0fd00291314b (patch)
treef104e16212470e3314988ebd34c4b6ca5a3c6df7
parent7aafdaf1409fb94d4f21706c534322f24aa897cf (diff)
downloadeclipse.platform.resources-7d9897e952812db5005bffdb93fc0fd00291314b.tar.gz
eclipse.platform.resources-7d9897e952812db5005bffdb93fc0fd00291314b.tar.xz
eclipse.platform.resources-7d9897e952812db5005bffdb93fc0fd00291314b.zip
Bug 417025: Get rid of nested jars
Signed-off-by: Mickael Istria <mistria@redhat.com> Change-Id: Id69c21904653856c2e642ad4a8b2c585349d6261
-rw-r--r--tests/org.eclipse.core.tests.resources.saveparticipant/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.core.tests.resources.saveparticipant/build.properties7
-rw-r--r--tests/org.eclipse.core.tests.resources.saveparticipant1/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties7
-rw-r--r--tests/org.eclipse.core.tests.resources.saveparticipant2/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties7
-rw-r--r--tests/org.eclipse.core.tests.resources.saveparticipant3/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties7
-rw-r--r--tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.core.tests.resources/build.properties11
10 files changed, 22 insertions, 22 deletions
diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.resources.saveparticipant/META-INF/MANIFEST.MF
index 15f5a83d8..91d76e171 100644
--- a/tests/org.eclipse.core.tests.resources.saveparticipant/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.resources.saveparticipant/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Core Tests Save Participant
Bundle-SymbolicName: org.eclipse.core.tests.resources.saveparticipant; singleton:=true
Bundle-Version: 3.3.0.qualifier
-Bundle-ClassPath: saveparticipant.jar
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Export-Package: org.eclipse.core.tests.resources.saveparticipant
diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties b/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties
index d7f1e01bd..6e21af254 100644
--- a/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties
+++ b/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
+# Copyright (c) 2004, 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,10 +7,11 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source.saveparticipant.jar=src/
+source..=src/
bin.includes = plugin.xml,\
- *.jar,\
+ .,\
about.xml,\
META-INF/,\
about.html
diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant1/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.resources.saveparticipant1/META-INF/MANIFEST.MF
index c8f9cc5f6..ffc014313 100644
--- a/tests/org.eclipse.core.tests.resources.saveparticipant1/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.resources.saveparticipant1/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: Save Participant 1
Bundle-Activator: org.eclipse.core.tests.resources.saveparticipant1.SaveParticipant1Plugin
Bundle-SymbolicName: org.eclipse.core.tests.resources.saveparticipant1
Bundle-Version: 3.3.0.qualifier
-Bundle-ClassPath: saveparticipant1.jar
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Export-Package: org.eclipse.core.tests.resources.saveparticipant1
diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties b/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties
index 8e4b982ed..6e21af254 100644
--- a/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties
+++ b/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
+# Copyright (c) 2004, 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,10 +7,11 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source.saveparticipant1.jar=src/
+source..=src/
bin.includes = plugin.xml,\
- *.jar,\
+ .,\
about.xml,\
META-INF/,\
about.html
diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant2/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.resources.saveparticipant2/META-INF/MANIFEST.MF
index 0ba287cbd..cdcae64a1 100644
--- a/tests/org.eclipse.core.tests.resources.saveparticipant2/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.resources.saveparticipant2/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Save Participant 2
Bundle-SymbolicName: org.eclipse.core.tests.resources.saveparticipant2
Bundle-Version: 3.3.0.qualifier
-Bundle-ClassPath: saveparticipant2.jar
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Export-Package: org.eclipse.core.tests.resources.saveparticipant2
diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties b/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties
index 6a621a528..6e21af254 100644
--- a/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties
+++ b/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
+# Copyright (c) 2004, 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,10 +7,11 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source.saveparticipant2.jar=src/
+source..=src/
bin.includes = plugin.xml,\
- *.jar,\
+ .,\
about.xml,\
META-INF/,\
about.html
diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant3/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.resources.saveparticipant3/META-INF/MANIFEST.MF
index 4803563c7..67978359b 100644
--- a/tests/org.eclipse.core.tests.resources.saveparticipant3/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.resources.saveparticipant3/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Save Participant 3
Bundle-SymbolicName: org.eclipse.core.tests.resources.saveparticipant3
Bundle-Version: 3.3.0.qualifier
-Bundle-ClassPath: saveparticipant3.jar
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Export-Package: org.eclipse.core.tests.resources.saveparticipant3
diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties b/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties
index 439ff819f..425b0ef9b 100644
--- a/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties
+++ b/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
+# Copyright (c) 2004, 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,10 +7,11 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source.saveparticipant3.jar=src/
+source..=src/
bin.includes = plugin.xml,\
- *.jar,\
+ .,\
about.xml,\
META-INF/,\
about.html
diff --git a/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
index 2e56058f1..3150df7a2 100644
--- a/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Core Tests Resources
Bundle-SymbolicName: org.eclipse.core.tests.resources; singleton:=true
Bundle-Version: 3.8.100.qualifier
-Bundle-ClassPath: resourcestests.jar
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Export-Package: org.eclipse.core.tests.filesystem,
diff --git a/tests/org.eclipse.core.tests.resources/build.properties b/tests/org.eclipse.core.tests.resources/build.properties
index a0beabbf8..fa22ff7d2 100644
--- a/tests/org.eclipse.core.tests.resources/build.properties
+++ b/tests/org.eclipse.core.tests.resources/build.properties
@@ -1,16 +1,17 @@
###############################################################################
-# Copyright (c) 2000, 2012 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
# http://www.eclipse.org/legal/epl-v10.html
-#
+#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source.resourcestests.jar=src/
+source..=src/
bin.includes = plugin.xml,\
- *.jar,\
+ .,\
MultipleProjectTestFiles/,\
about.html,\
META-INF/,\
@@ -18,5 +19,5 @@ bin.includes = plugin.xml,\
Plugin_Testing/
src.includes = about.html
javacWarnings.resourcestests.jar=-raw,-unchecked
-
+

Back to the top