Conflicts:
	org.eclipse.ice.feature/feature.xml
	org.eclipse.ice.product/ice.macosx_product.launch
	org.eclipse.ice.product/ice.runtime.product
	org.eclipse.ice.product/ice.sdk.product

Updated Core OSGI.launch to be compatible with the latest version of
ICE.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Reset the release name to "next" from 2.2.1.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Updated the version numbers for the unused plug-ins to 2.2.1 to avoid
error messages related to non-existant parent poms.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Removed some unnecessary bundle imports from o.e.i.t.ui.swtbot that were
using the packages' old names.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Fixed an outdated reference to January that was previously being
supported by the old EAVP version.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Updated the target to remove unneeded packages which are no longer in
the Oxygen build. Also added January dependencies for EAVP.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Removed some extraneous packages from the target and updated the SWTBot
test build version numbers for 2.2.1.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

Updated the SWTBot tests to work with the latest version of ICE.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

AbstractWorbenchTester's openView() no longer returns a reference to the
opened view, to avoid a bug where SWTBot could not obtain that
reference.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Updated the AbstractWorkbenchTester to get the SWTBot commands working
with the current version.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Fixed the Mac run configuration file to work properly with the latest
ICE updates.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Updated the Windows launch configuration to include ICE's current set of
dependencies.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>

Pulled all docker environment code out of apps plugin.

Created docker environment plugin that implements app plugin
IEnvironment interface. Setup to use new docker api plugin

Updated docker use throughout ICE to use new docker api plugin.


Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>

Fixed the VIBE Model UI test to get it running again.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

Added ability to drag and drop external files to the File Entry widget
to import the file to the project and set the entry to that file. 

Fixed a few minor bugs in the job launcher (for example, appending file
name when you asked not to)

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>

Updated the swtbot integration tests.

Signed-off-by: Robert Smith <smithrw@ornl.gov>

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>

Clean up throughout as well. AppsUI is now ICEAppStoreVaadinUI. Removed
existing UI Bean classes. 

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>

Fix for de-selection of packages, add new text fields for environment name and source package name.

Add 'Environment name' field (fix for #367

), add 'name' field to source package window and bind them to data model.

Signed-off-by: Anara Kozhokanova <anara.ornl@gmail.com>

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>

This commit has concurrent modification exception when os package is added to basket.

Signed-off-by: Anara Kozhokanova <anara.ornl@gmail.com>

Signed-off-by: Anara Kozhokanova <anara.ornl@gmail.com>

Spack packages list generation from docker.

Signed-off-by: Anara Kozhokanova <anara.ornl@gmail.com>

Signed-off-by: Anara Kozhokanova <anara.ornl@gmail.com>

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>