[188305][releng] Properly pack importexport into a single-jar bundle to avoid nested jar update errors

rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF

@@ -3,13 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.importexport; singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: systemsImportExport.jar
 Bundle-Activator: org.eclipse.rse.internal.importexport.RemoteImportExportPlugin
-Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: 
- org.eclipse.rse.internal.importexport,
- org.eclipse.rse.internal.importexport.files
+Export-Package: org.eclipse.rse.internal.importexport;x-internal:=true,
+ org.eclipse.rse.internal.importexport.files;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
@@ -21,4 +18,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.subsystems.files.core,
  org.eclipse.rse.files.ui
 Eclipse-LazyStart: true
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4

rse/plugins/org.eclipse.rse.importexport/build.properties

@@ -9,12 +9,12 @@
 #     IBM Corporation - initial API and implementation
 # Martin Oberhuber (Wind River) - remove branding plugin files
 ###############################################################################
-source.systemsImportExport.jar = src/
-output.systemsImportExport.jar = bin/
-bin.includes = plugin.xml,\
-               systemsImportExport.jar,\
-               plugin.properties,\
-               icons/,\
+bin.includes = META-INF/,\
+               .,\
                about.html,\
-               META-INF/
+               icons/,\
+               plugin.properties,\
+               plugin.xml
 src.includes = about.html
+source.. = src/
+output.. = bin/

rse/plugins/org.eclipse.rse.services.ssh/build.properties

@@ -19,6 +19,5 @@ bin.includes = META-INF/,\
                eclipse32.png
 src.includes = readme.txt,\
                about.html
-jars.compile.order = .
 source.. = src/
 output.. = bin/

rse/tests/org.eclipse.rse.tests/build.properties

@@ -22,7 +22,8 @@ bin.includes = rsetests.jar,\
                about.mappings,\
                about.properties,\
                eclipse32.png,\
-               icons/
+               icons/,\
+               GVT/
 
 # build with "assert" keyword enabled
 javacSource = 1.4