Merge branch 'master' into private/eclipse-4.7

Resolved Conflicts:
	releng/org.simantics.sdk.build.targetdefinition/simantics.target

refs #7358

Change-Id: Idefea4e4c60de59664904bdd0a2a0a517af8db4c

diff --cc features/org.simantics.sdk.feature/feature.xml
Simple merge

diff --cc releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
index 888bb1e27dc312da40f818e470fd99800e1bf1cb,9a632534418634f327f505b730f051605a7cd797..d99e6fd4f7d0042bfe11fda3f96205d5ad2a5a29
--- 1/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
--- 2/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
@@@ -143,10 -107,12 +143,12 @@@
  <unit id="com.esotericsoftware.minlog.source" version="1.3.0"/>
  <unit id="com.esotericsoftware.reflectasm" version="1.11.3"/>
  <unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>
 -<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.0"/>
 -<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.0"/>
 +<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.4"/>
 +<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.4"/>
  <unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.8"/>
  <unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.8"/>
+ <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.8"/>
+ <unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.8"/>
  <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.8"/>
  <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.8"/>
  <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.8"/>

diff --cc releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
index a3cefa4bb364a322ff2d19385fc019d10b51a04d,a4149954e74f8e9eca2d1aa2ab2e8c87fe0b8425..1fc2f710c93d74c12178e41b8ecabf2315e2a1e2
--- 1/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
--- 2/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
@@@ -2,301 -2,5 +2,303 @@@ target "Eclipse Oxygen
  
  with source allEnvironments
  
 -// TODO
 +location "http://www.simantics.org/update/tools/orbit/downloads/drops/R20170516192513" {
 +      com.google.guava
 +      com.google.guava.source
 +      org.jsoup
 +      org.jsoup.source
 +      org.objectweb.asm
 +      org.objectweb.asm.analysis
 +      org.objectweb.asm.analysis.source
 +      org.objectweb.asm.commons
 +      org.objectweb.asm.commons.source
 +      org.objectweb.asm.source
 +      org.objectweb.asm.tree
 +      org.objectweb.asm.tree.source
 +      org.objectweb.asm.util
 +      org.objectweb.asm.util.source
 +      org.objectweb.asm.xml
 +      org.objectweb.asm.xml.source
 +}
  
 +location "http://www.simantics.org/update/oxygen/" {
 +      javax.xml
 +      org.apache.commons.httpclient
 +      org.apache.commons.httpclient.source
 +      org.apache.xerces
 +      org.apache.xml.resolver
 +      org.apache.xml.serializer
 +      org.eclipse.draw2d.feature.group
 +      org.eclipse.emf.sdk.feature.group
 +      org.eclipse.epp.mpc.feature.group
 +      org.eclipse.epp.mpc.source.feature.group
 +      org.eclipse.mylyn.commons.feature.group
 +      org.eclipse.mylyn.commons.identity.feature.group
 +      org.eclipse.mylyn.commons.net
 +      org.eclipse.mylyn.commons.net.source
 +      org.eclipse.mylyn.commons.notifications.feature.group
 +      org.eclipse.mylyn.commons.repositories.core
 +      org.eclipse.mylyn.commons.repositories.core.source
 +      org.eclipse.mylyn.commons.repositories.ui
 +      org.eclipse.mylyn.commons.repositories.ui.source
 +      org.eclipse.mylyn.context_feature.feature.group
 +      org.eclipse.mylyn.monitor.feature.group
 +      org.eclipse.mylyn.tasks.core
 +      org.eclipse.mylyn.tasks.core.source
 +      org.eclipse.mylyn.tasks.ui
 +      org.eclipse.mylyn.tasks.ui.source
 +      org.eclipse.mylyn.wikitext_feature.feature.group
 +      org.eclipse.mylyn.wikitext.ant.source
 +      org.eclipse.mylyn.wikitext.mediawiki.source
 +      org.eclipse.mylyn.wikitext.osgi.source
 +      org.eclipse.mylyn.wikitext.source
 +      org.eclipse.userstorage.feature.group
 +      org.eclipse.userstorage.oauth
 +      org.eclipse.userstorage.oauth.source
 +      org.eclipse.userstorage.source
 +      org.eclipse.userstorage.ui.source
 +}
 +
 +location "http://www.simantics.org/update/eclipse/updates/4.7/" {
 +      org.apache.httpcomponents.httpclient
 +      org.apache.httpcomponents.httpclient.source
 +      org.apache.httpcomponents.httpcore
 +      org.apache.httpcomponents.httpcore.source
 +      org.eclipse.core.runtime.feature.feature.group
 +      org.eclipse.e4.core.tools.feature.feature.group
 +      org.eclipse.e4.core.tools.feature.source.feature.group
 +      org.eclipse.ecf.core.feature.feature.group
 +      org.eclipse.ecf.core.feature.source.feature.group
 +      org.eclipse.ecf.core.ssl.feature.feature.group
 +      org.eclipse.ecf.core.ssl.feature.source.feature.group
 +      org.eclipse.ecf.filetransfer.feature.feature.group
 +      org.eclipse.ecf.filetransfer.feature.source.feature.group
 +      org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group
 +      org.eclipse.ecf.filetransfer.httpclient4.feature.source.feature.group
 +      org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group
 +      org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source.feature.group
 +      org.eclipse.ecf.filetransfer.ssl.feature.feature.group
 +      org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group
 +      org.eclipse.equinox.p2.discovery.feature.feature.group
 +      org.eclipse.equinox.sdk.feature.group
 +      org.eclipse.help.feature.group
 +      org.eclipse.help.source.feature.group
 +      org.eclipse.platform.feature.group
 +      org.eclipse.platform.source.feature.group
 +      org.eclipse.rcp.feature.group
 +      org.eclipse.rcp.source.feature.group
 +      org.eclipse.releng.tools.feature.group
 +      org.eclipse.sdk.ide
 +      org.eclipse.swt.tools.feature.feature.group
 +}
 +
 +location "http://download.eclipse.org/nebula/releases/latest" {
 +      org.eclipse.nebula.cwt.feature.feature.group
 +      org.eclipse.nebula.effects.stw.feature.feature.group
 +      org.eclipse.nebula.examples.feature.feature.group
 +      org.eclipse.nebula.examples.release.feature.feature.group
 +      org.eclipse.nebula.feature.feature.group
 +      org.eclipse.nebula.visualization.feature.feature.group
 +      org.eclipse.nebula.widgets.cdatetime.feature.feature.group
 +      org.eclipse.nebula.widgets.compositetable.feature.feature.group
 +      org.eclipse.nebula.widgets.gallery.feature.feature.group
 +      org.eclipse.nebula.widgets.ganttchart.feature.feature.group
 +      org.eclipse.nebula.widgets.grid.feature.feature.group
 +      org.eclipse.nebula.widgets.oscilloscope.feature.feature.group
 +      org.eclipse.nebula.widgets.paperclips.feature.feature.group
 +      org.eclipse.nebula.widgets.pgroup.feature.feature.group
 +      org.eclipse.nebula.widgets.pshelf.css.feature.feature.group
 +      org.eclipse.nebula.widgets.pshelf.feature.feature.group
 +      org.eclipse.nebula.widgets.richtext.feature.feature.group
 +      org.eclipse.nebula.widgets.tablecombo.feature.feature.group
 +      org.eclipse.nebula.widgets.xviewer.feature.feature.group
 +}
 +
 +location "http://download.eclipse.org/nattable/releases/1.5.0/repository" {
 +      org.eclipse.nebula.widgets.nattable.core.feature.feature.group
 +      org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group
 +      org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group
 +      org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group
 +      org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group
 +      org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group
 +      org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group
 +      org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group
 +      org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group
 +      org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group
 +}
 +
 +location "http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/" {
 +      org.eclipse.e4.tools.spies.feature.feature.group
 +}
 +
 +location "http://www.simantics.org/download/private/eclipse-4.7/external-components/maven" {
 +      bouncycastle.bcmail-jdk14
 +      bouncycastle.bcprov-jdk14
 +      ch.qos.logback.classic
 +      ch.qos.logback.classic.source
 +      ch.qos.logback.core
 +      ch.qos.logback.core.source
 +      com.esotericsoftware.kryo
 +      com.esotericsoftware.kryo.source
 +      com.esotericsoftware.minlog
 +      com.esotericsoftware.minlog.source
 +      com.esotericsoftware.reflectasm
 +      com.esotericsoftware.reflectasm.source
 +      com.fasterxml.jackson.core.jackson-annotations
 +      com.fasterxml.jackson.core.jackson-annotations.source
 +      com.fasterxml.jackson.core.jackson-core
 +      com.fasterxml.jackson.core.jackson-core.source
++      com.fasterxml.jackson.core.jackson-databind
++      com.fasterxml.jackson.core.jackson-databind.source
 +      com.fasterxml.jackson.dataformat.jackson-dataformat-csv
 +      com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source
 +      com.fasterxml.jackson.dataformat.jackson-dataformat-xml
 +      com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source
 +      com.fasterxml.jackson.datatype.jackson-datatype-jsr310
 +      com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source
 +      com.fasterxml.jackson.jaxrs.jackson-jaxrs-base
 +      com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source
 +      com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider
 +      com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source
 +      com.fasterxml.jackson.module.jackson-module-jaxb-annotations
 +      com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source
 +      com.fasterxml.woodstox.woodstox-core
 +      com.fasterxml.woodstox.woodstox-core.source
 +      com.github.virtuald.curvesapi
 +      com.github.virtuald.curvesapi.source
 +      com.healthmarketscience.jackcess
 +      com.healthmarketscience.jackcess.source
 +      com.koloboke.api-jdk8
 +      com.koloboke.api-jdk8.source
 +      com.koloboke.compile
 +      com.koloboke.compile.source
 +      com.koloboke.impl-common-jdk8
 +      com.koloboke.impl-common-jdk8.source
 +      com.lowagie.text
 +      com.lowagie.text.source
 +      com.sun.jna
 +      com.sun.jna.platform
 +      com.sun.jna.platform.source
 +      com.sun.jna.source
 +      freemarker
 +      freemarker.source
 +      gnu.trove3
 +      gnu.trove3.source
 +      it.unimi.dsi.fastutil
 +      it.unimi.dsi.fastutil.source
 +      jakarta-regexp
 +      javassist
 +      javassist.source
 +      javax.validation.api
 +      javax.validation.api.source
 +      javax.ws.rs-api
 +      javax.ws.rs-api.source
 +      net.jcip.annotations
 +      net.jcip.annotations.source
 +      net.ucanaccess
 +      net.ucanaccess.source
 +      org.antlr.runtime
 +      org.antlr.runtime.source
 +      org.apache.commons.codec
 +      org.apache.commons.codec.source
 +      org.apache.commons.collections
 +      org.apache.commons.collections.source
 +      org.apache.commons.collections4
 +      org.apache.commons.collections4.source
 +      org.apache.commons.compress
 +      org.apache.commons.compress.source
 +      org.apache.commons.io
 +      org.apache.commons.io.source
 +      org.apache.commons.lang
 +      org.apache.commons.lang.source
 +      org.apache.commons.logging
 +      org.apache.commons.logging.source
 +      org.apache.commons.math3
 +      org.apache.commons.math3.source
 +      org.apache.log4j
 +      org.apache.log4j.source
 +      org.apache.lucene4.analyzers-common
 +      org.apache.lucene4.analyzers-common.source
 +      org.apache.lucene4.core
 +      org.apache.lucene4.core.source
 +      org.apache.lucene4.queries
 +      org.apache.lucene4.queries.source
 +      org.apache.lucene4.queryparser
 +      org.apache.lucene4.queryparser.source
 +      org.apache.lucene4.sandbox
 +      org.apache.lucene4.sandbox.source
 +      org.apache.pdfbox
 +      org.apache.pdfbox.fontbox
 +      org.apache.pdfbox.fontbox.source
 +      org.apache.pdfbox.source
 +      org.apache.pdfbox.xmpbox
 +      org.apache.pdfbox.xmpbox.source
 +      org.apache.xmlbeans
 +      org.bouncycastle.bcmail-jdk14
 +      org.bouncycastle.bcmail-jdk14.source
 +      org.bouncycastle.bcprov-jdk14
 +      org.bouncycastle.bcprov-jdk14.source
 +      org.bouncycastle.bctsp-jdk14
 +      org.bouncycastle.bctsp-jdk14.source
 +      org.eclipse.collections.eclipse-collections
 +      org.eclipse.collections.eclipse-collections.source
 +      org.glassfish.hk2.api
 +      org.glassfish.hk2.api.source
 +      org.glassfish.hk2.external.aopalliance-repackaged
 +      org.glassfish.hk2.external.aopalliance-repackaged.source
 +      org.glassfish.hk2.locator
 +      org.glassfish.hk2.locator.source
 +      org.glassfish.hk2.osgi-resource-locator
 +      org.glassfish.hk2.osgi-resource-locator.source
 +      org.glassfish.hk2.utils
 +      org.glassfish.hk2.utils.source
 +      org.glassfish.jersey.bundles.repackaged.jersey-guava
 +      org.glassfish.jersey.bundles.repackaged.jersey-guava.source
 +      org.glassfish.jersey.core.jersey-common
 +      org.glassfish.jersey.core.jersey-common.source
 +      org.glassfish.jersey.core.jersey-server
 +      org.glassfish.jersey.core.jersey-server.source
 +      org.glassfish.jersey.ext.jersey-entity-filtering
 +      org.glassfish.jersey.ext.jersey-entity-filtering.source
 +      org.glassfish.jersey.media.jersey-media-multipart
 +      org.glassfish.jersey.media.jersey-media-multipart.source
 +      org.hsqldb.hsqldb
 +      org.hsqldb.hsqldb.source
 +      org.ini4j
 +      org.ini4j.source
 +      org.jboss.windup.decompiler.api.forge-addon
 +      org.jboss.windup.decompiler.api.forge-addon.source
 +      org.jboss.windup.decompiler.procyon
 +      org.jboss.windup.decompiler.procyon.source
 +      org.jboss.windup.decompiler.procyon.windup-procyon-compilertools
 +      org.jboss.windup.decompiler.procyon.windup-procyon-compilertools.source
 +      org.jboss.windup.decompiler.procyon.windup-procyon-core
 +      org.jboss.windup.decompiler.procyon.windup-procyon-core.source
 +      org.jboss.windup.decompiler.procyon.windup-procyon-reflection
 +      org.jboss.windup.decompiler.procyon.windup-procyon-reflection.source
 +      org.jboss.windup.utils.windup-utils.forge-addon
 +      org.jboss.windup.utils.windup-utils.forge-addon.source
 +      org.jdom2
 +      org.jdom2.source
 +      org.jfree.jchart
 +      org.jfree.jchart.source
 +      org.jfree.jcommon
 +      org.jfree.jcommon.source
 +      org.jvnet.mimepull
 +      org.jvnet.mimepull.source
 +      org.mozilla.rhino
 +      org.mozilla.rhino.source
 +      org.objenesis
 +      org.objenesis.source
 +      org.slf4j.api
 +      org.slf4j.api.source
 +      org.supercsv
 +      org.supercsv.source
 +      stax2-api
 +      stax2-api.source
 +}
 +
 +location "http://www.simantics.org/download/private/eclipse-4.7/external-components/manual" {
 +      org.apache.batik
 +      org.apache.poi.feature.feature.group
 +}

diff --cc releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 356d4c2c3631d7f2f32df1da4c59a071aee47921,a17c650bb8f6ec21c0d03faee93f7a66027e78a5..9290a8b823146ddba33cea736563fa5c9fb6b05c
--- 1/releng/org.simantics.sdk.build.targetdefinition/simantics.target
--- 2/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@@ -1,311 -1,272 +1,313 @@@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 -<?pde version="3.8"?>
 -<target name="Simantics 1.31.0" sequenceNumber="24">
 -<locations>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="org.simantics.sdk.feature.group" version="1.31.0"/>
 -<unit id="org.simantics.sdk.source.feature.group" version="1.31.0"/>
 -<repository location="http://www.simantics.org/download/master/sdk"/>
 -</location>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>
 -<unit id="org.objectweb.asm.util.source" version="5.0.1.v201404251740"/>
 -<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
 -<unit id="com.google.guava" version="15.0.0.v201403281430"/>
 -<unit id="org.objectweb.asm.util" version="5.0.1.v201404251740"/>
 -<unit id="org.objectweb.asm.xml" version="5.0.1.v201404251740"/>
 -<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
 -<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
 -<unit id="org.objectweb.asm.commons" version="5.0.1.v201404251740"/>
 -<unit id="org.objectweb.asm.analysis.source" version="5.0.1.v201505121915"/>
 -<unit id="org.objectweb.asm.commons.source" version="5.0.1.v201404251740"/>
 -<unit id="org.objectweb.asm.tree.source" version="5.0.1.v201404251740"/>
 -<unit id="org.objectweb.asm.analysis" version="5.0.1.v201505121915"/>
 -<unit id="org.objectweb.asm.tree" version="5.0.1.v201404251740"/>
 -<repository location="http://www.simantics.org/update/tools/orbit/downloads/drops/R20160221192158/repository/"/>
 -</location>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.7.0.v20151015-1452"/>
 -<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>
 -<unit id="org.eclipse.epp.mpc.feature.group" version="1.4.2.v20160210-2005"/>
 -<repository location="http://www.simantics.org/update/mars"/>
 -</location>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>
 -<unit id="org.eclipse.rcp.source.feature.group" version="4.5.2.v20160212-1500"/>
 -<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.1.v20160129-0959"/>
 -<unit id="org.eclipse.ecf.filetransfer.source.feature.feature.group" version="3.12.0.v20151130-0157"/>
 -<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>
 -<unit id="org.eclipse.help.feature.group" version="2.1.2.v20160212-1500"/>
 -<unit id="org.eclipse.ecf.filetransfer.httpclient4.source.feature.feature.group" version="3.12.0.v20151130-0157"/>
 -<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.5.1.v20160129-0959"/>
 -<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.104.2.v20160128-0900"/>
 -<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.12.0.v20151130-0157"/>
 -<unit id="org.eclipse.ecf.filetransfer.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>
 -<unit id="org.eclipse.platform.feature.group" version="4.5.2.v20160212-1500"/>
 -<unit id="org.eclipse.ecf.core.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>
 -<unit id="org.eclipse.rcp.feature.group" version="4.5.2.v20160212-1500"/>
 -<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.300.v20150430-1836"/>
 -<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.2.0.v20151130-0157"/>
 -<unit id="org.eclipse.ecf.core.source.feature.feature.group" version="1.2.0.v20151130-0157"/>
 -<unit id="org.eclipse.equinox.sdk.feature.group" version="3.11.2.v20160202-2102"/>
 -<unit id="org.eclipse.platform.source.feature.group" version="4.5.2.v20160212-1500"/>
 -<unit id="org.eclipse.releng.tools.feature.group" version="3.6.0.v20150527-0145"/>
 -<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.12.0.v20151130-0157"/>
 -<unit id="org.eclipse.sdk.ide" version="4.5.2.M20160212-1500"/>
 -<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>
 -<unit id="org.eclipse.help.source.feature.group" version="2.1.2.v20160212-1500"/>
 -<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>
 -<repository location="http://www.simantics.org/update/eclipse/updates/4.5"/>
 -</location>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="org.eclipse.nebula.effects.stw.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.calendarcombo.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.gallery.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="1.2.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.ganttchart.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.paperclips.feature.feature.group" version="2.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.examples.release.feature.feature.group" version="1.0.4.201605182147"/>
 -<unit id="org.eclipse.nebula.widgets.pgroup.feature.feature.group" version="1.0.0.201605182147"/>
 -<repository location="http://www.simantics.org/update/nebula/Q22016/release/"/>
 -</location>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20160919-2121"/>
 -<repository location="http://www.simantics.org/update/e4/snapshots/org.eclipse.e4.tools/latest/"/>
 -</location>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201605182147"/>
 -<unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201605182147"/>
 -<repository location="http://www.simantics.org/update/nebula/Q22016/incubation"/>
 -</location>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201606011907"/>
 -<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.0.0.201606011907"/>
 -<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.4.0.201606011907"/>
 -<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201606011907"/>
 -<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201606011907"/>
 -<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201606011907"/>
 -<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201606011907"/>
 -<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.0.0.201606011907"/>
 -<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201606011907"/>
 -<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.4.0.201606011907"/>
 -<repository location="http://www.simantics.org/update/nebula/nattable/releases/1.4.0/repository/"/>
 -</location>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="ch.qos.logback.classic" version="1.2.3"/>
 -<unit id="ch.qos.logback.classic.source" version="1.2.3"/>
 -<unit id="ch.qos.logback.core" version="1.2.3"/>
 -<unit id="ch.qos.logback.core.source" version="1.2.3"/>
 -<unit id="com.esotericsoftware.kryo" version="4.0.0"/>
 -<unit id="com.esotericsoftware.kryo.source" version="4.0.0"/>
 -<unit id="com.esotericsoftware.minlog" version="1.3.0"/>
 -<unit id="com.esotericsoftware.minlog.source" version="1.3.0"/>
 -<unit id="com.esotericsoftware.reflectasm" version="1.11.3"/>
 -<unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>
 -<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.0"/>
 -<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.0"/>
 -<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.8.4"/>
 -<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.4"/>
 -<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.4"/>
 -<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.4"/>
 -<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.8"/>
 -<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.8"/>
 -<unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
 -<unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
 -<unit id="com.github.virtuald.curvesapi" version="1.4.0"/>
 -<unit id="com.github.virtuald.curvesapi.source" version="1.4.0"/>
 -<unit id="com.healthmarketscience.jackcess" version="2.1.3"/>
 -<unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>
 -<unit id="com.koloboke.api-jdk8" version="1.0.0"/>
 -<unit id="com.koloboke.api-jdk8.source" version="1.0.0"/>
 -<unit id="com.koloboke.compile" version="0.5.1"/>
 -<unit id="com.koloboke.compile.source" version="0.5.1"/>
 -<unit id="com.koloboke.impl-common-jdk8" version="1.0.0"/>
 -<unit id="com.koloboke.impl-common-jdk8.source" version="1.0.0"/>
 -<unit id="com.lowagie.text" version="2.1.7.b1"/>
 -<unit id="com.lowagie.text.source" version="2.1.7.b1"/>
 -<unit id="com.sun.jna" version="4.3.0"/>
 -<unit id="com.sun.jna.source" version="4.3.0"/>
 -<unit id="com.sun.jna.platform" version="4.3.0"/>
 -<unit id="com.sun.jna.platform.source" version="4.3.0"/>
 -<unit id="freemarker" version="2.3.23.stable"/>
 -<unit id="freemarker.source" version="2.3.23.stable"/>
 -<unit id="gnu.trove3" version="3.0.3"/>
 -<unit id="gnu.trove3.source" version="3.0.3"/>
 -<unit id="it.unimi.dsi.fastutil" version="7.2.1"/>
 -<unit id="it.unimi.dsi.fastutil.source" version="7.2.1"/>
 -<unit id="javax.ws.rs-api" version="2.0.1"/>
 -<unit id="javax.ws.rs-api.source" version="2.0.1"/>
 -<unit id="jakarta-regexp" version="1.4.0"/>
 -<unit id="net.jcip.annotations" version="1.0.0"/>
 -<unit id="net.jcip.annotations.source" version="1.0.0"/>
 -<unit id="net.ucanaccess" version="3.0.7"/>
 -<unit id="net.ucanaccess.source" version="3.0.7"/>
 -<unit id="org.antlr.runtime" version="3.5.2"/>
 -<unit id="org.antlr.runtime.source" version="3.5.2"/>
 -<unit id="org.apache.log4j" version="1.2.17"/>
 -<unit id="org.apache.log4j.source" version="1.2.17"/>
 -<unit id="org.apache.commons.codec" version="1.10.0"/>
 -<unit id="org.apache.commons.codec.source" version="1.10.0"/>
 -<unit id="org.apache.commons.collections" version="3.2.2"/>
 -<unit id="org.apache.commons.collections.source" version="3.2.2"/>
 -<unit id="org.apache.commons.collections4" version="4.1.0"/>
 -<unit id="org.apache.commons.collections4.source" version="4.1.0"/>
 -<unit id="org.apache.commons.compress" version="1.12.0"/>
 -<unit id="org.apache.commons.compress.source" version="1.12.0"/>
 -<unit id="org.apache.commons.logging" version="1.2.0"/>
 -<unit id="org.apache.commons.logging.source" version="1.2.0"/>
 -<unit id="org.apache.commons.io" version="1.4.0"/>
 -<unit id="org.apache.commons.io.source" version="1.4.0"/>
 -<unit id="org.apache.commons.lang" version="2.6.0"/>
 -<unit id="org.apache.commons.lang.source" version="2.6.0"/>
 -<unit id="org.apache.commons.math3" version="3.6.1"/>
 -<unit id="org.apache.commons.math3.source" version="3.6.1"/>
 -<unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>
 -<unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>
 -<unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>
 -<unit id="org.apache.lucene4.core.source" version="4.9.0.b0003"/>
 -<unit id="org.apache.lucene4.queryparser" version="4.9.0.b0003"/>
 -<unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0003"/>
 -<unit id="org.apache.lucene4.sandbox" version="4.9.0.b0003"/>
 -<unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0003"/>
 -<unit id="org.apache.lucene4.queries" version="4.9.0.b0003"/>
 -<unit id="org.apache.lucene4.queries.source" version="4.9.0.b0003"/>
 -<unit id="org.apache.pdfbox" version="2.0.3"/>
 -<unit id="org.apache.pdfbox.source" version="2.0.3"/>
 -<unit id="org.apache.pdfbox.xmpbox" version="2.0.3"/>
 -<unit id="org.apache.pdfbox.xmpbox.source" version="2.0.3"/>
 -<unit id="org.apache.pdfbox.fontbox" version="2.0.3"/>
 -<unit id="org.apache.pdfbox.fontbox.source" version="2.0.3"/>
 -<unit id="org.apache.xmlbeans" version="2.6.0"/>
 -<unit id="org.eclipse.collections.eclipse-collections-api" version="8.1.0"/>
 -<unit id="org.eclipse.collections.eclipse-collections-api.source" version="8.1.0"/>
 -<unit id="org.eclipse.collections.eclipse-collections" version="8.1.0"/>
 -<unit id="org.eclipse.collections.eclipse-collections.source" version="8.1.0"/>
 -<unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>
 -<unit id="org.glassfish.hk2.api.source" version="2.5.0.b32"/>
 -<unit id="org.glassfish.hk2.locator" version="2.5.0.b32"/>
 -<unit id="org.glassfish.hk2.locator.source" version="2.5.0.b32"/>
 -<unit id="org.glassfish.hk2.utils" version="2.5.0.b32"/>
 -<unit id="org.glassfish.hk2.utils.source" version="2.5.0.b32"/>
 -<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
 -<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
 -<unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.5.0.b32"/>
 -<unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.5.0.b32"/>
 -<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.core.jersey-client" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1"/>
 -<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1"/>
 -<unit id="org.hsqldb.hsqldb" version="2.3.1"/>
 -<unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
 -<unit id="javassist" version="3.20.0.GA"/>
 -<unit id="javassist.source" version="3.20.0.GA"/>
 -<unit id="javax.validation.api" version="1.1.0.Final"/>
 -<unit id="javax.validation.api.source" version="1.1.0.Final"/>
 -<unit id="org.jdom2" version="2.0.6.b0001"/>
 -<unit id="org.jdom2.source" version="2.0.6.b0001"/>
 -<unit id="org.jfree.jchart" version="1.0.19"/>
 -<unit id="org.jfree.jchart.source" version="1.0.19"/>
 -<unit id="org.jfree.jcommon" version="1.0.23"/>
 -<unit id="org.jfree.jcommon.source" version="1.0.23"/>
 -<unit id="org.jvnet.mimepull" version="1.9.6"/>
 -<unit id="org.jvnet.mimepull.source" version="1.9.6"/>
 -<unit id="org.mozilla.rhino" version="1.7.7.1"/>
 -<unit id="org.mozilla.rhino.source" version="1.7.7.1"/>
 -<unit id="org.objenesis" version="2.2.0"/>
 -<unit id="org.objenesis.source" version="2.2.0"/>
 -<unit id="org.supercsv" version="2.4.0"/>
 -<unit id="org.supercsv.source" version="2.4.0"/>
 -<unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>
 -<unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>
 -<unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>
 -<unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>
 -<unit id="org.bouncycastle.bcmail-jdk14" version="1.38.0"/>
 -<unit id="org.bouncycastle.bcmail-jdk14.source" version="1.38.0"/>
 -<unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>
 -<unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>
 -<unit id="org.ini4j" version="0.5.4"/>
 -<unit id="org.ini4j.source" version="0.5.4"/>
 -<unit id="org.slf4j.api" version="1.7.25"/>
 -<unit id="org.slf4j.api.source" version="1.7.25"/>
 -<unit id="stax2-api" version="3.1.4"/>
 -<unit id="stax2-api.source" version="3.1.4"/>
 -<repository location="http://www.simantics.org/download/master/external-components/maven"/>
 -</location>
 -<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 -<unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
 -<unit id="org.apache.batik" version="1.8.0.201611220734"/>
 -<repository location="http://www.simantics.org/download/master/external-components/manual"/>
 -</location>
 -</locations>
++<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
 +<?pde?>
 +<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
 +<target name="Simantics 1.30.0 Oxygen" sequenceNumber="1500622610">
 +  <locations>
 +    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
 +      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
 +      <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
 +      <unit id="org.jsoup" version="1.7.2.v201411291515"/>
 +      <unit id="org.jsoup.source" version="1.7.2.v201411291515"/>
 +      <unit id="org.objectweb.asm" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.analysis" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.analysis.source" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.commons" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.commons.source" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.source" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.tree" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.tree.source" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.util" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.util.source" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.xml" version="5.2.0.v20170126-0011"/>
 +      <unit id="org.objectweb.asm.xml.source" version="5.2.0.v20170126-0011"/>
 +      <repository location="http://www.simantics.org/update/tools/orbit/downloads/drops/R20170516192513"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
 +      <unit id="javax.xml" version="1.3.4.v201005080400"/>
 +      <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
 +      <unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
 +      <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
 +      <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/>
 +      <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
 +      <unit id="org.eclipse.draw2d.feature.group" version="3.10.100.201606061308"/>
 +      <unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
 +      <unit id="org.eclipse.epp.mpc.feature.group" version="1.6.0.v20170616-0843"/>
 +      <unit id="org.eclipse.epp.mpc.source.feature.group" version="1.6.0.v20170616-0843"/>
 +      <unit id="org.eclipse.mylyn.commons.feature.group" version="3.23.0.v20170503-0014"/>
 +      <unit id="org.eclipse.mylyn.commons.identity.feature.group" version="1.15.0.v20170411-1844"/>
 +      <unit id="org.eclipse.mylyn.commons.net" version="3.23.0.v20170411-1844"/>
 +      <unit id="org.eclipse.mylyn.commons.net.source" version="3.23.0.v20170411-1844"/>
 +      <unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="1.15.0.v20170411-1844"/>
 +      <unit id="org.eclipse.mylyn.commons.repositories.core" version="1.15.0.v20170411-1844"/>
 +      <unit id="org.eclipse.mylyn.commons.repositories.core.source" version="1.15.0.v20170411-1844"/>
 +      <unit id="org.eclipse.mylyn.commons.repositories.ui" version="1.15.0.v20170411-1844"/>
 +      <unit id="org.eclipse.mylyn.commons.repositories.ui.source" version="1.15.0.v20170411-1844"/>
 +      <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.23.0.v20170414-0629"/>
 +      <unit id="org.eclipse.mylyn.monitor.feature.group" version="3.23.0.v20170411-1844"/>
 +      <unit id="org.eclipse.mylyn.tasks.core" version="3.23.0.v20170602-2017"/>
 +      <unit id="org.eclipse.mylyn.tasks.core.source" version="3.23.0.v20170602-2017"/>
 +      <unit id="org.eclipse.mylyn.tasks.ui" version="3.23.0.v20170608-2055"/>
 +      <unit id="org.eclipse.mylyn.tasks.ui.source" version="3.23.0.v20170608-2055"/>
 +      <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="3.0.6.201703111926"/>
 +      <unit id="org.eclipse.mylyn.wikitext.ant.source" version="3.0.6.20170311142502"/>
 +      <unit id="org.eclipse.mylyn.wikitext.mediawiki.source" version="3.0.6.20170311142502"/>
 +      <unit id="org.eclipse.mylyn.wikitext.osgi.source" version="3.0.6.201703111926"/>
 +      <unit id="org.eclipse.mylyn.wikitext.source" version="3.0.6.20170311142502"/>
 +      <unit id="org.eclipse.userstorage.feature.group" version="1.1.0.v20170526-1605"/>
 +      <unit id="org.eclipse.userstorage.oauth" version="1.0.0.v20170526-1605"/>
 +      <unit id="org.eclipse.userstorage.oauth.source" version="1.0.0.v20170526-1605"/>
 +      <unit id="org.eclipse.userstorage.source" version="1.1.0.v20170328-0205"/>
 +      <unit id="org.eclipse.userstorage.ui.source" version="1.0.2.v20170526-1605"/>
 +      <repository location="http://www.simantics.org/update/oxygen/"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
 +      <unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
 +      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.2.v20170210-0925"/>
 +      <unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
 +      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.6.v20170210-0925"/>
 +      <unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.0.v20170518-1049"/>
 +      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.7.0.v20170515-1617"/>
 +      <unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.7.0.v20170515-1617"/>
 +      <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.4.0.v20170516-2248"/>
 +      <unit id="org.eclipse.ecf.core.feature.source.feature.group" version="1.4.0.v20170516-2248"/>
 +      <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
 +      <unit id="org.eclipse.ecf.core.ssl.feature.source.feature.group" version="1.1.0.v20170110-1317"/>
 +      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.13.7.v20170516-2248"/>
 +      <unit id="org.eclipse.ecf.filetransfer.feature.source.feature.group" version="3.13.7.v20170516-2248"/>
 +      <unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.13.7.v20170516-2248"/>
 +      <unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.source.feature.group" version="3.13.7.v20170516-2248"/>
 +      <unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
 +      <unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source.feature.group" version="1.1.0.v20170110-1317"/>
 +      <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
 +      <unit id="org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group" version="1.1.0.v20170110-1317"/>
 +      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.0.v20170418-0708"/>
 +      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.0.v20170531-1133"/>
 +      <unit id="org.eclipse.help.feature.group" version="2.2.100.v20170612-0950"/>
 +      <unit id="org.eclipse.help.source.feature.group" version="2.2.100.v20170612-0950"/>
 +      <unit id="org.eclipse.platform.feature.group" version="4.7.0.v20170612-1255"/>
 +      <unit id="org.eclipse.platform.source.feature.group" version="4.7.0.v20170612-1255"/>
 +      <unit id="org.eclipse.rcp.feature.group" version="4.7.0.v20170612-1255"/>
 +      <unit id="org.eclipse.rcp.source.feature.group" version="4.7.0.v20170612-1255"/>
 +      <unit id="org.eclipse.releng.tools.feature.group" version="3.9.100.v20170516-0717"/>
 +      <unit id="org.eclipse.sdk.ide" version="4.7.0.I20170612-0950"/>
 +      <unit id="org.eclipse.swt.tools.feature.feature.group" version="3.106.0.v20170503-0851"/>
 +      <repository location="http://www.simantics.org/update/eclipse/updates/4.7/"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
 +      <unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.effects.stw.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.examples.feature.feature.group" version="1.0.4.201706221838"/>
 +      <unit id="org.eclipse.nebula.examples.release.feature.feature.group" version="1.1.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.feature.feature.group" version="1.3.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="2.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.gallery.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.ganttchart.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="1.3.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.paperclips.feature.feature.group" version="2.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.pgroup.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201706221838"/>
 +      <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201706221838"/>
 +      <repository location="http://download.eclipse.org/nebula/releases/latest"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
 +      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
 +      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
 +      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.1.0.201703192131"/>
 +      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.1.0.201703192131"/>
 +      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
 +      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
 +      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
 +      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
 +      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.0.201703192131"/>
 +      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.5.0.201703192131"/>
 +      <repository location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
 +      <unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20170601-1400"/>
 +      <repository location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
 +      <unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>
 +      <unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>
 +      <unit id="ch.qos.logback.classic" version="1.2.3"/>
 +      <unit id="ch.qos.logback.classic.source" version="1.2.3"/>
 +      <unit id="ch.qos.logback.core" version="1.2.3"/>
 +      <unit id="ch.qos.logback.core.source" version="1.2.3"/>
 +      <unit id="com.esotericsoftware.kryo" version="4.0.0"/>
 +      <unit id="com.esotericsoftware.kryo.source" version="4.0.0"/>
 +      <unit id="com.esotericsoftware.minlog" version="1.3.0"/>
 +      <unit id="com.esotericsoftware.minlog.source" version="1.3.0"/>
 +      <unit id="com.esotericsoftware.reflectasm" version="1.11.3"/>
 +      <unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>
 +      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.4"/>
 +      <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.4"/>
 +      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.8"/>
 +      <unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.8"/>
++      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.8"/>
++      <unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.8"/>
 +      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.8"/>
 +      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.8"/>
 +      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.8"/>
 +      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.8"/>
 +      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.8.8"/>
 +      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.8.8"/>
 +      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.8.4"/>
 +      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.4"/>
 +      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.4"/>
 +      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.4"/>
 +      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.8"/>
 +      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.8"/>
 +      <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
 +      <unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
 +      <unit id="com.github.virtuald.curvesapi" version="1.4.0"/>
 +      <unit id="com.github.virtuald.curvesapi.source" version="1.4.0"/>
 +      <unit id="com.healthmarketscience.jackcess" version="2.1.3"/>
 +      <unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>
 +      <unit id="com.koloboke.api-jdk8" version="1.0.0"/>
 +      <unit id="com.koloboke.api-jdk8.source" version="1.0.0"/>
 +      <unit id="com.koloboke.compile" version="0.5.1"/>
 +      <unit id="com.koloboke.compile.source" version="0.5.1"/>
 +      <unit id="com.koloboke.impl-common-jdk8" version="1.0.0"/>
 +      <unit id="com.koloboke.impl-common-jdk8.source" version="1.0.0"/>
 +      <unit id="com.lowagie.text" version="2.1.7.b1"/>
 +      <unit id="com.lowagie.text.source" version="2.1.7.b1"/>
 +      <unit id="com.sun.jna" version="4.3.0"/>
 +      <unit id="com.sun.jna.platform" version="4.3.0"/>
 +      <unit id="com.sun.jna.platform.source" version="4.3.0"/>
 +      <unit id="com.sun.jna.source" version="4.3.0"/>
 +      <unit id="freemarker" version="2.3.23.stable"/>
 +      <unit id="freemarker.source" version="2.3.23.stable"/>
 +      <unit id="gnu.trove3" version="3.0.3"/>
 +      <unit id="gnu.trove3.source" version="3.0.3"/>
 +      <unit id="it.unimi.dsi.fastutil" version="7.2.1"/>
 +      <unit id="it.unimi.dsi.fastutil.source" version="7.2.1"/>
 +      <unit id="jakarta-regexp" version="1.4.0"/>
 +      <unit id="javassist" version="3.20.0.GA"/>
 +      <unit id="javassist.source" version="3.20.0.GA"/>
 +      <unit id="javax.validation.api" version="1.1.0.Final"/>
 +      <unit id="javax.validation.api.source" version="1.1.0.Final"/>
 +      <unit id="javax.ws.rs-api" version="2.0.1"/>
 +      <unit id="javax.ws.rs-api.source" version="2.0.1"/>
 +      <unit id="net.jcip.annotations" version="1.0.0"/>
 +      <unit id="net.jcip.annotations.source" version="1.0.0"/>
 +      <unit id="net.ucanaccess" version="3.0.7"/>
 +      <unit id="net.ucanaccess.source" version="3.0.7"/>
 +      <unit id="org.antlr.runtime" version="3.5.2"/>
 +      <unit id="org.antlr.runtime.source" version="3.5.2"/>
 +      <unit id="org.apache.commons.codec" version="1.10.0"/>
 +      <unit id="org.apache.commons.codec.source" version="1.10.0"/>
 +      <unit id="org.apache.commons.collections" version="3.2.2"/>
 +      <unit id="org.apache.commons.collections.source" version="3.2.2"/>
 +      <unit id="org.apache.commons.collections4" version="4.1.0"/>
 +      <unit id="org.apache.commons.collections4.source" version="4.1.0"/>
 +      <unit id="org.apache.commons.compress" version="1.12.0"/>
 +      <unit id="org.apache.commons.compress.source" version="1.12.0"/>
 +      <unit id="org.apache.commons.io" version="2.4.0"/>
 +      <unit id="org.apache.commons.io.source" version="2.4.0"/>
 +      <unit id="org.apache.commons.lang" version="2.6.0"/>
 +      <unit id="org.apache.commons.lang.source" version="2.6.0"/>
 +      <unit id="org.apache.commons.logging" version="1.2.0"/>
 +      <unit id="org.apache.commons.logging.source" version="1.2.0"/>
 +      <unit id="org.apache.commons.math3" version="3.6.1"/>
 +      <unit id="org.apache.commons.math3.source" version="3.6.1"/>
 +      <unit id="org.apache.log4j" version="1.2.17"/>
 +      <unit id="org.apache.log4j.source" version="1.2.17"/>
 +      <unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>
 +      <unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>
 +      <unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>
 +      <unit id="org.apache.lucene4.core.source" version="4.9.0.b0003"/>
 +      <unit id="org.apache.lucene4.queries" version="4.9.0.b0003"/>
 +      <unit id="org.apache.lucene4.queries.source" version="4.9.0.b0003"/>
 +      <unit id="org.apache.lucene4.queryparser" version="4.9.0.b0003"/>
 +      <unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0003"/>
 +      <unit id="org.apache.lucene4.sandbox" version="4.9.0.b0003"/>
 +      <unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0003"/>
 +      <unit id="org.apache.pdfbox" version="2.0.3"/>
 +      <unit id="org.apache.pdfbox.fontbox" version="2.0.3"/>
 +      <unit id="org.apache.pdfbox.fontbox.source" version="2.0.3"/>
 +      <unit id="org.apache.pdfbox.source" version="2.0.3"/>
 +      <unit id="org.apache.pdfbox.xmpbox" version="2.0.3"/>
 +      <unit id="org.apache.pdfbox.xmpbox.source" version="2.0.3"/>
 +      <unit id="org.apache.xmlbeans" version="2.6.0"/>
 +      <unit id="org.bouncycastle.bcmail-jdk14" version="1.38.0"/>
 +      <unit id="org.bouncycastle.bcmail-jdk14.source" version="1.38.0"/>
 +      <unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>
 +      <unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>
 +      <unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>
 +      <unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>
 +      <unit id="org.eclipse.collections.eclipse-collections" version="8.1.0"/>
 +      <unit id="org.eclipse.collections.eclipse-collections.source" version="8.1.0"/>
 +      <unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>
 +      <unit id="org.glassfish.hk2.api.source" version="2.5.0.b32"/>
 +      <unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.5.0.b32"/>
 +      <unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.5.0.b32"/>
 +      <unit id="org.glassfish.hk2.locator" version="2.5.0.b32"/>
 +      <unit id="org.glassfish.hk2.locator.source" version="2.5.0.b32"/>
 +      <unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
 +      <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.1"/>
 +      <unit id="org.glassfish.hk2.utils" version="2.5.0.b32"/>
 +      <unit id="org.glassfish.hk2.utils.source" version="2.5.0.b32"/>
 +      <unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.25.1"/>
 +      <unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="2.25.1"/>
 +      <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1"/>
 +      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1"/>
 +      <unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1"/>
 +      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1"/>
 +      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1"/>
 +      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1"/>
 +      <unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.25.1"/>
 +      <unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.25.1"/>
 +      <unit id="org.hsqldb.hsqldb" version="2.3.1"/>
 +      <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
 +      <unit id="org.ini4j" version="0.5.4"/>
 +      <unit id="org.ini4j.source" version="0.5.4"/>
 +      <unit id="org.jboss.windup.decompiler.api.forge-addon" version="4.0.0.Beta1"/>
 +      <unit id="org.jboss.windup.decompiler.api.forge-addon.source" version="4.0.0.Beta1"/>
 +      <unit id="org.jboss.windup.decompiler.procyon" version="4.0.0.Beta1"/>
 +      <unit id="org.jboss.windup.decompiler.procyon.source" version="4.0.0.Beta1"/>
 +      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-compilertools" version="1.0.0.20160510"/>
 +      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-compilertools.source" version="1.0.0.20160510"/>
 +      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-core" version="1.0.0.20160510"/>
 +      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-core.source" version="1.0.0.20160510"/>
 +      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-reflection" version="1.0.0.20160510"/>
 +      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-reflection.source" version="1.0.0.20160510"/>
 +      <unit id="org.jboss.windup.utils.windup-utils.forge-addon" version="4.0.0.Beta1"/>
 +      <unit id="org.jboss.windup.utils.windup-utils.forge-addon.source" version="4.0.0.Beta1"/>
 +      <unit id="org.jdom2" version="2.0.6.b0001"/>
 +      <unit id="org.jdom2.source" version="2.0.6.b0001"/>
 +      <unit id="org.jfree.jchart" version="1.0.19"/>
 +      <unit id="org.jfree.jchart.source" version="1.0.19"/>
 +      <unit id="org.jfree.jcommon" version="1.0.23"/>
 +      <unit id="org.jfree.jcommon.source" version="1.0.23"/>
 +      <unit id="org.jvnet.mimepull" version="1.9.6"/>
 +      <unit id="org.jvnet.mimepull.source" version="1.9.6"/>
 +      <unit id="org.mozilla.rhino" version="1.7.7.1"/>
 +      <unit id="org.mozilla.rhino.source" version="1.7.7.1"/>
 +      <unit id="org.objenesis" version="2.2.0"/>
 +      <unit id="org.objenesis.source" version="2.2.0"/>
 +      <unit id="org.slf4j.api" version="1.7.25"/>
 +      <unit id="org.slf4j.api.source" version="1.7.25"/>
 +      <unit id="org.supercsv" version="2.4.0"/>
 +      <unit id="org.supercsv.source" version="2.4.0"/>
 +      <unit id="stax2-api" version="3.1.4"/>
 +      <unit id="stax2-api.source" version="3.1.4"/>
 +      <repository location="http://www.simantics.org/download/private/eclipse-4.7/external-components/maven"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
 +      <unit id="org.apache.batik" version="1.8.0.201611220734"/>
 +      <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
 +      <repository location="http://www.simantics.org/download/private/eclipse-4.7/external-components/manual"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-       <unit id="org.simantics.sdk.feature.group" version="1.30.0"/>
-       <unit id="org.simantics.sdk.source.feature.group" version="1.30.0"/>
++      <unit id="org.simantics.sdk.feature.group" version="1.31.0"/>
++      <unit id="org.simantics.sdk.source.feature.group" version="1.31.0"/>
 +      <repository location="http://www.simantics.org/download/private/eclipse-4.7/sdk"/>
 +    </location>
 +  </locations>
  </target>