Merge branch 'master' into private/eclipse-4.7

author Miro Richard Eklund <miro.eklund@semantum.fi>

Wed, 9 Aug 2017 06:53:38 +0000 (09:53 +0300)

committer Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>

Wed, 9 Aug 2017 09:43:11 +0000 (12:43 +0300)
author Miro Richard Eklund <miro.eklund@semantum.fi>
Wed, 9 Aug 2017 06:53:38 +0000 (09:53 +0300)
committer Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Wed, 9 Aug 2017 09:43:11 +0000 (12:43 +0300)
diff --git a/.project b/.project

index fb77e382023be32915634ce2177af05b074c3e53..4b7d21c7ea78c972e7eb8ba060e28636bd6e41a8 100644 (file)
--- a/.project
+++ b/.project
@@ -5,7 +5,13 @@
         <projects>
         </projects>
         <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.m2e.core.maven2Builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
         </buildSpec>
         <natures>
+               <nature>org.eclipse.m2e.core.maven2Nature</nature>
         </natures>
  </projectDescription>
diff --git a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageBookView.java b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageBookView.java

index e6f027a73ab2c01bdd7be4e428dd2278583f6408..54da13baa7f5fec8f3514601238e4b8e0d9af7c7 100644 (file)
--- a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageBookView.java
+++ b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageBookView.java
@@ -17,6 +17,7 @@ import java.util.Map;
  import java.util.Set;
  
  import org.eclipse.core.commands.common.EventManager;
+import org.eclipse.core.runtime.Adapters;
  import org.eclipse.core.runtime.Platform;
  import org.eclipse.jface.action.IAction;
  import org.eclipse.jface.util.IPropertyChangeListener;
@@ -608,7 +609,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener {
      public Object getAdapter(Class key) {
          // delegate to the current page, if supported
          IPage page = getCurrentPage();
-        Object adapter = Util.getAdapter(page, key);
+        Object adapter = Adapters.adapt(page, key);
          if (adapter != null) {
              return adapter;
          }
diff --git a/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF b/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF

index 4eaa04be30a13ee80dc906ee7c41200992243257..28233b62d718d61ba7d9ac913e173b1a2474d54b 100644 (file)
--- a/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF
@@ -15,7 +15,9 @@ Require-Bundle: org.simantics.utils.thread.swt;bundle-version="1.0.0",
   org.eclipse.ui.forms;bundle-version="3.4.1",
   com.lowagie.text;bundle-version="2.1.5",
   org.eclipse.e4.core.contexts;bundle-version="1.4.0",
- org.slf4j.api;bundle-version="1.7.20"
+ org.slf4j.api;bundle-version="1.7.20",
+ org.eclipse.mylyn.wikitext;bundle-version="3.0.6",
+ org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6"
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Export-Package: org.simantics.browsing.ui.swt,
   org.simantics.browsing.ui.swt.contentassist,
diff --git a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/TabbedPropertyPage.java b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/TabbedPropertyPage.java

index 81e0898488d656434cfa697aa16542adab8429c3..dd554571681513ba4d13c220d6431569a9ce83b7 100644 (file)
--- a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/TabbedPropertyPage.java
+++ b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/TabbedPropertyPage.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
  import java.util.List;
  
  import org.eclipse.core.commands.util.Tracing;
+import org.eclipse.core.runtime.Adapters;
  import org.eclipse.core.runtime.Assert;
  import org.eclipse.core.runtime.ISafeRunnable;
  import org.eclipse.core.runtime.SafeRunner;
@@ -1001,7 +1002,7 @@ public abstract class TabbedPropertyPage extends ViewPart {
              // see bug 138823 - prevent some subclasses from causing
              // an infinite loop
              if (innerEditor != null && innerEditor != this) {
-                result = Util.getAdapter(innerEditor, adapter);
+                result = Adapters.adapt(innerEditor, adapter);
              }
          }
          return result;
diff --git a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/WikiBrowser.java b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/WikiBrowser.java

index 270958f9e4816b0f5d121f7f5f63f1e7b345024a..3936893bc1cb465354475d3e6aa0230986a96935 100644 (file)
--- a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/WikiBrowser.java
+++ b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/WikiBrowser.java
@@ -11,7 +11,7 @@
   *******************************************************************************/
  package org.simantics.browsing.ui.swt.widgets;
  
-import org.eclipse.mylyn.wikitext.core.parser.MarkupParser;
+import org.eclipse.mylyn.wikitext.parser.MarkupParser;
  import org.eclipse.swt.browser.Browser;
  import org.eclipse.swt.widgets.Composite;
  import org.eclipse.swt.widgets.Control;
diff --git a/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF

index 28c6e2018ea5794b322c153acc2470b9706e98e7..27e7007eda8565e36bf2d02b752fc6bd9bf9aaff 100644 (file)
--- a/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
+Manifest-Version: 1.0 
  Bundle-ManifestVersion: 2
  Bundle-Name: Simantics Desktop UI
  Bundle-SymbolicName: org.simantics.desktop.ui;singleton:=true
@@ -6,9 +6,9 @@ Bundle-Version: 1.0.0.qualifier
  Bundle-Activator: org.simantics.desktop.ui.internal.Activator
  Bundle-Vendor: Semantum Oy
  Require-Bundle: org.simantics.workbench;bundle-version="1.5.1",
- org.eclipse.epp.mpc.core;bundle-version="1.1.1",
- org.eclipse.epp.mpc.help.ui;bundle-version="1.1.1",
- org.eclipse.epp.mpc.ui;bundle-version="1.1.1",
+ org.eclipse.epp.mpc.core;bundle-version="1.6.0",
+ org.eclipse.epp.mpc.help.ui;bundle-version="1.6.0",
+ org.eclipse.epp.mpc.ui;bundle-version="1.6.0",
   org.eclipse.ui.browser;bundle-version="3.3.100",
   org.simantics.platform.ui.ontology;bundle-version="1.0.0",
   org.simantics.spreadsheet.ontology;bundle-version="1.2.0",
@@ -16,6 +16,8 @@ Require-Bundle: org.simantics.workbench;bundle-version="1.5.1",
   org.simantics.selectionview;bundle-version="1.0.0",
   org.eclipse.e4.ui.model.workbench;bundle-version="1.1.100.v20150407-1430",
   org.simantics.spreadsheet.graph,
- org.simantics.spreadsheet;bundle-version="1.1.0"
+ org.simantics.spreadsheet;bundle-version="1.1.0",
+ org.eclipse.ui.intro;bundle-version="3.5.100",
+ org.eclipse.ui.intro.quicklinks;bundle-version="1.0.100"
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.simantics.document/META-INF/MANIFEST.MF b/bundles/org.simantics.document/META-INF/MANIFEST.MF

index 44e4db9dc3ea33a543570ce017539a416bea8078..b39033119f5b8f16a19a38ea93d165023a30b7fa 100644 (file)
--- a/bundles/org.simantics.document/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.document/META-INF/MANIFEST.MF
@@ -10,12 +10,14 @@ Require-Bundle: org.simantics;bundle-version="1.0.0",
   org.simantics.scenegraph.loader;bundle-version="1.0.0",
   org.simantics.views;bundle-version="1.1.0",
   org.simantics.scenegraph.ontology;bundle-version="1.0.0",
- org.simantics.wiki.ui;bundle-version="1.1.0",
   org.simantics.export.core;bundle-version="1.0.0",
   org.simantics.utils.ui;bundle-version="1.1.0",
   org.simantics.image2.ontology;bundle-version="1.2.0",
   org.simantics.graphfile.ontology;bundle-version="0.1.0",
- org.simantics.graphfile;bundle-version="0.1.0"
+ org.simantics.graphfile;bundle-version="0.1.0",
+ org.simantics.wiki.ui;bundle-version="1.1.0",
+ org.eclipse.mylyn.wikitext;bundle-version="3.0.6",
+ org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6"
  Export-Package: org.simantics.document,
   org.simantics.document.export,
   org.simantics.document.function,
diff --git a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java

index a6dd790de51b78937f71ad627f1b27a2e1a01edd..0908fd0f41d1e1a699e484859e3a1d92f9b85118 100644 (file)
--- a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java
+++ b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java
@@ -18,8 +18,8 @@ import java.io.IOException;
  import java.io.InputStream;
  import java.net.URL;
  
-import org.eclipse.mylyn.wikitext.core.parser.MarkupParser;
-import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage;
+import org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage;
+import org.eclipse.mylyn.wikitext.parser.MarkupParser;
  import org.simantics.Simantics;
  import org.simantics.db.ReadGraph;
  import org.simantics.db.Resource;
diff --git a/bundles/org.simantics.document/src/org/simantics/document/export/ExportWikiPdf.java b/bundles/org.simantics.document/src/org/simantics/document/export/ExportWikiPdf.java

index a74a2a6d375df13342a9d16b647a61734931b419..5c237d9dd286a0644a55ac2f75eb3733a248cf42 100644 (file)
--- a/bundles/org.simantics.document/src/org/simantics/document/export/ExportWikiPdf.java
+++ b/bundles/org.simantics.document/src/org/simantics/document/export/ExportWikiPdf.java
@@ -5,8 +5,8 @@ import java.util.Collections;
  import java.util.List;
  
  import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.mylyn.wikitext.core.parser.MarkupParser;
-import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage;
+import org.eclipse.mylyn.wikitext.parser.MarkupParser;
+import org.simantics.wiki.ui.language.MediaWikiLanguage;
  import org.osgi.service.prefs.Preferences;
  import org.simantics.databoard.binding.mutable.Variant;
  import org.simantics.databoard.type.RecordType;
diff --git a/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java b/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java

index ac07e10abeba059e389b989267bb6acbc63c9255..70420996141649b5630f84f856089b41ec0c2114 100644 (file)
--- a/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java
+++ b/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java
@@ -832,5 +832,11 @@ public class SystemProject implements IProject{
                 return false;
         }
  
+       @Override
+       public void clearCachedDynamicReferences() {
+               // TODO Auto-generated method stub
+               
+       }
+
  
  }
diff --git a/bundles/org.simantics.help.core/META-INF/MANIFEST.MF b/bundles/org.simantics.help.core/META-INF/MANIFEST.MF

index f1fbea12c343b2cc724c92435b1eb00c4e469820..0382bd08737f807e20f3a19d63f1eb33f5c2759c 100644 (file)
--- a/bundles/org.simantics.help.core/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.help.core/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.ui,
   winterwell.markdown,
   org.simantics,
   org.simantics.document.base.ontology,
- org.eclipse.mylyn.wikitext.core,
- org.eclipse.mylyn.wikitext.mediawiki.core
+ org.eclipse.mylyn.wikitext;bundle-version="3.0.6",
+ org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6"
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Bundle-ActivationPolicy: lazy
  Export-Package: org.simantics.help.core
diff --git a/bundles/org.simantics.help.core/src/org/simantics/help/core/HelpUtils.java b/bundles/org.simantics.help.core/src/org/simantics/help/core/HelpUtils.java

index 7e562d7f318f1280dd22cf59a2550039838295a9..b4e33c8af8da755bd2cf260452790eecd9fefca4 100644 (file)
--- a/bundles/org.simantics.help.core/src/org/simantics/help/core/HelpUtils.java
+++ b/bundles/org.simantics.help.core/src/org/simantics/help/core/HelpUtils.java
@@ -18,9 +18,9 @@ import java.util.Map;
  import java.util.Map.Entry;
  import java.util.TreeMap;
  
-import org.eclipse.mylyn.wikitext.core.parser.MarkupParser;
-import org.eclipse.mylyn.wikitext.core.parser.builder.HtmlDocumentBuilder;
-import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage;
+import org.eclipse.mylyn.wikitext.parser.MarkupParser;
+import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder;
+import org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage;
  import org.eclipse.ui.PlatformUI;
  import org.eclipse.ui.help.IWorkbenchHelpSystem;
  import org.simantics.databoard.Bindings;
diff --git a/bundles/org.simantics.views.swt.client/META-INF/MANIFEST.MF b/bundles/org.simantics.views.swt.client/META-INF/MANIFEST.MF

index fc6ba878d6b0ca3f05cb1626c4a9bc2db5c72d83..525cac9533ecfe7aa2ec7b6a841c3cd8a2c7d616 100644 (file)
--- a/bundles/org.simantics.views.swt.client/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.views.swt.client/META-INF/MANIFEST.MF
@@ -15,7 +15,9 @@ Require-Bundle: org.eclipse.core.runtime,
   org.simantics;bundle-version="1.0.0",
   org.simantics.browsing.ui.swt;bundle-version="1.1.0",
   org.simantics.scenegraph.loader;bundle-version="1.0.0",
- org.simantics.utils.thread.swt;bundle-version="1.1.0"
+ org.simantics.utils.thread.swt;bundle-version="1.1.0",
+ org.eclipse.mylyn.wikitext;bundle-version="3.0.6",
+ org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6"
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Export-Package: org.simantics.views.swt.client.base,
diff --git a/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/impl/SWTWikiBrowser.java b/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/impl/SWTWikiBrowser.java

index 20c172545ab30aacf7e8be67bd8b131519efee65..f8dd5895ec67b896e3a81db769df75b1f92d9707 100644 (file)
--- a/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/impl/SWTWikiBrowser.java
+++ b/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/impl/SWTWikiBrowser.java
@@ -1,10 +1,8 @@
  package org.simantics.views.swt.client.impl;
  
-import java.io.IOException;
-
  import org.eclipse.jface.layout.GridDataFactory;
  import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.mylyn.wikitext.core.parser.MarkupParser;
+import org.eclipse.mylyn.wikitext.parser.MarkupParser;
  import org.eclipse.swt.browser.Browser;
  import org.eclipse.swt.widgets.Composite;
  import org.simantics.Simantics;
@@ -14,9 +12,7 @@ import org.simantics.db.exception.DatabaseException;
  import org.simantics.db.layer0.variable.Variable;
  import org.simantics.db.request.Read;
  import org.simantics.scl.runtime.function.Function1;
-import org.simantics.utils.FileUtils;
  import org.simantics.utils.datastructures.map.Tuple;
-import org.simantics.utils.ui.BundleUtils;
  import org.simantics.views.swt.client.base.SingleSWTViewNode;
  import org.simantics.wiki.ui.SimanticsDialect;
  import org.simantics.wiki.ui.language.MediaWikiLanguage;
diff --git a/bundles/org.simantics.views.text/META-INF/MANIFEST.MF b/bundles/org.simantics.views.text/META-INF/MANIFEST.MF

index 6e60a5a19ac429fbd6edff937cc4adc39119e64a..c6646a2088b11e8896c3a2ffaf07ea750602cc83 100644 (file)
--- a/bundles/org.simantics.views.text/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.views.text/META-INF/MANIFEST.MF
@@ -9,12 +9,12 @@ Require-Bundle: org.eclipse.ui,
   org.eclipse.ui.editors;bundle-version="3.9.0",
   org.eclipse.core.runtime,
   org.eclipse.jface.text;bundle-version="3.10.0",
- org.eclipse.mylyn.wikitext.core;bundle-version="2.7.0",
- org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="2.7.0",
- org.eclipse.mylyn.wikitext.ui;bundle-version="2.7.0",
- org.eclipse.mylyn.wikitext.mediawiki.ui;bundle-version="2.7.0",
   org.simantics.views;bundle-version="1.1.0",
   org.simantics.views.swt;bundle-version="1.0.0",
- org.simantics.views.swt.client;bundle-version="1.0.0"
+ org.simantics.views.swt.client;bundle-version="1.0.0",
+ org.eclipse.mylyn.wikitext;bundle-version="3.0.6",
+ org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6",
+ org.eclipse.mylyn.wikitext.ui;bundle-version="3.0.6",
+ org.eclipse.mylyn.wikitext.mediawiki.ui;bundle-version="3.0.6"
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.simantics.views.text/src/org/simantics/views/text/internal/SWTMarkupSourceViewer.java b/bundles/org.simantics.views.text/src/org/simantics/views/text/internal/SWTMarkupSourceViewer.java

index 756dfe21a3b5edbe1d71b60625e1db3bdbb2e597..10985f0809fcf9d5f8ad8beb06f9e6928929433b 100644 (file)
--- a/bundles/org.simantics.views.text/src/org/simantics/views/text/internal/SWTMarkupSourceViewer.java
+++ b/bundles/org.simantics.views.text/src/org/simantics/views/text/internal/SWTMarkupSourceViewer.java
@@ -12,8 +12,8 @@
  package org.simantics.views.text.internal;
  
  import org.eclipse.jface.text.Document;
-import org.eclipse.mylyn.wikitext.core.parser.markup.MarkupLanguage;
-import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage;
+import org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage;
+import org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage;
  import org.eclipse.mylyn.wikitext.ui.editor.MarkupSourceViewer;
  import org.eclipse.mylyn.wikitext.ui.editor.MarkupSourceViewerConfiguration;
  import org.eclipse.mylyn.wikitext.ui.editor.ShowInTargetBridge;
diff --git a/bundles/org.simantics.wiki.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.wiki.ui/META-INF/MANIFEST.MF

index e5b2fae2034cd6e3dce16de12adfbaa1bb0ebc77..1518bd4af7ac6431e7944adb1fbb7a79a374f6e4 100644 (file)
--- a/bundles/org.simantics.wiki.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.wiki.ui/META-INF/MANIFEST.MF
@@ -7,8 +7,6 @@ Bundle-Activator: org.simantics.wiki.ui.Activator
  Require-Bundle: org.eclipse.ui,
   org.eclipse.core.runtime,
   org.simantics.ui;bundle-version="1.0.0",
- org.eclipse.mylyn.wikitext.core;bundle-version="1.5.1";visibility:=reexport,
- org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="1.5.2";visibility:=reexport,
   com.lowagie.text;bundle-version="2.1.5";visibility:=reexport,
   org.simantics.layer0.utils,
   org.simantics.db.layer0;bundle-version="0.8.0",
@@ -17,7 +15,9 @@ Require-Bundle: org.eclipse.ui,
   org.simantics.diagram.ontology;bundle-version="1.0.0",
   org.simantics.g2d;bundle-version="1.1.1",
   org.simantics.scenegraph.swing;bundle-version="1.0.0",
- org.simantics.image2.ontology;bundle-version="1.1.0"
+ org.simantics.image2.ontology;bundle-version="1.1.0",
+ org.eclipse.mylyn.wikitext;bundle-version="3.0.6",
+ org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6"
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Export-Package: org.simantics.wiki.ui,
diff --git a/bundles/org.simantics.wiki.ui/src/org/simantics/wiki/ui/language/MediaWikiLanguage.java b/bundles/org.simantics.wiki.ui/src/org/simantics/wiki/ui/language/MediaWikiLanguage.java

index 32a10ecca36eede2be2ce4ea076b9160b566676a..2416dc939b1371dcc35aa4e5b3abaf83d76e4ce6 100644 (file)
--- a/bundles/org.simantics.wiki.ui/src/org/simantics/wiki/ui/language/MediaWikiLanguage.java
+++ b/bundles/org.simantics.wiki.ui/src/org/simantics/wiki/ui/language/MediaWikiLanguage.java
@@ -11,12 +11,12 @@
   *******************************************************************************/
  package org.simantics.wiki.ui.language;
  
-import org.eclipse.mylyn.internal.wikitext.mediawiki.core.phrase.EscapePhraseModifier;
-import org.eclipse.mylyn.internal.wikitext.mediawiki.core.phrase.SimplePhraseModifier;
-import org.eclipse.mylyn.wikitext.core.parser.DocumentBuilder.SpanType;
-import org.eclipse.mylyn.wikitext.core.parser.markup.phrase.HtmlCommentPhraseModifier;
-import org.eclipse.mylyn.wikitext.core.parser.markup.phrase.LimitedHtmlEndTagPhraseModifier;
-import org.eclipse.mylyn.wikitext.core.parser.markup.phrase.LimitedHtmlStartTagPhraseModifier;
+import org.eclipse.mylyn.wikitext.mediawiki.internal.phrase.EscapePhraseModifier;
+import org.eclipse.mylyn.wikitext.mediawiki.internal.phrase.SimplePhraseModifier;
+import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
+import org.eclipse.mylyn.wikitext.parser.markup.phrase.HtmlCommentPhraseModifier;
+import org.eclipse.mylyn.wikitext.parser.markup.phrase.LimitedHtmlEndTagPhraseModifier;
+import org.eclipse.mylyn.wikitext.parser.markup.phrase.LimitedHtmlStartTagPhraseModifier;
  
  /**
   * A markup language for <a href="http://www.mediawiki.org">MediaWiki</a> <a
@@ -27,7 +27,7 @@ import org.eclipse.mylyn.wikitext.core.parser.markup.phrase.LimitedHtmlStartTagP
   * @since 1.0
   */
  @SuppressWarnings("restriction")
-public class MediaWikiLanguage extends org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage {
+public class MediaWikiLanguage extends org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage {
         public MediaWikiLanguage() {
                 super();
         }
diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchApplication.java b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchApplication.java

index 8b0431f38e9cde7d6236b146ab5d239034eca37a..d31914fd00351c59d1c42f3f5e735f18cdefc712 100644 (file)
--- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchApplication.java
+++ b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchApplication.java
@@ -33,6 +33,8 @@ import org.eclipse.jface.dialogs.MessageDialog;
  import org.eclipse.osgi.service.datalocation.Location;
  import org.eclipse.osgi.util.NLS;
  import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
  import org.eclipse.swt.widgets.Display;
  import org.eclipse.swt.widgets.MessageBox;
  import org.eclipse.swt.widgets.Shell;
@@ -373,6 +375,20 @@ public class SimanticsWorkbenchApplication implements IApplication, IExecutableE
          return args.containsKey("-pdelaunch"); //$NON-NLS-1$
      }
  
+    private static class ChooseSimanticsWorkspaceDialog extends ChooseWorkspaceDialog {
+
+        public ChooseSimanticsWorkspaceDialog(Shell parentShell, ChooseWorkspaceData launchData, boolean suppressAskAgain, boolean centerOnMonitor) {
+            super(parentShell, launchData, suppressAskAgain, centerOnMonitor);
+        }
+        
+        @Override
+        protected void configureShell(Shell shell) {
+            super.configureShell(shell);
+            // Use product name in shell title instead of generic "Eclipse Launcher"
+            shell.setText(getWindowTitle());
+        }
+    }
+
      /**
       * Open a workspace selection dialog on the argument shell, populating the
       * argument data with the user's selection. Perform first level validation
@@ -392,7 +408,8 @@ public class SimanticsWorkbenchApplication implements IApplication, IExecutableE
          URL url = null;
          do {
              // okay to use the shell now - this is the splash shell
-            new ChooseWorkspaceDialog(shell, launchData, suppressAskAgain, true).prompt(force);
+            new ChooseSimanticsWorkspaceDialog(shell, launchData, suppressAskAgain, true).prompt(force); 
+            
              String instancePath = launchData.getSelection();
              if (instancePath == null) {
                  return null;
diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchWindowAdvisor.java b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchWindowAdvisor.java

index 74abd0c35e47d89bca18b3f53da5862f7aeca63a..a6a802052d7ec9145f8d958ad72581f820cf296a 100644 (file)
--- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchWindowAdvisor.java
+++ b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchWindowAdvisor.java
@@ -517,7 +517,8 @@ public class SimanticsWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
          if (currentPage != null) {
              if (activeEditor != null) {
                  lastEditorTitle = activeEditor.getTitleToolTip();
-                title = NLS.bind(IDEWorkbenchMessages.WorkbenchWindow_shellTitle, lastEditorTitle, title);
+                //IDEWorkbenchMessages.WorkbenchWindow_shellTitle == "{0} - {1}"
+                title = NLS.bind("{0} - {1}", lastEditorTitle, title);
              }
  
              boolean excludePerspectiveFromTitle = "true".equals(System.getProperty("org.simantics.workbench.application.excludePerspectiveFromTitle", "false").toLowerCase());
@@ -532,14 +533,15 @@ public class SimanticsWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
                      label = currentPage.getLabel();
                  }
                  if (label != null && !label.equals("")) { //$NON-NLS-1$
-                    title = NLS.bind(IDEWorkbenchMessages.WorkbenchWindow_shellTitle, label, title);
+                       //IDEWorkbenchMessages.WorkbenchWindow_shellTitle == "{0} - {1}"
+                    title = NLS.bind("{0} - {1}", label, title);
                  }
              }
          }
  
          String workspaceLocation = wbAdvisor.getWorkspaceLocation();
          if (workspaceLocation != null) {
-            title = NLS.bind(IDEWorkbenchMessages.WorkbenchWindow_shellTitle, title, workspaceLocation);
+            title = NLS.bind("{0} - {1}", title, workspaceLocation);
          }
  
          // Bug 284447: Prepend workspace name to the title
@@ -547,8 +549,8 @@ public class SimanticsWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
          .getPreferenceStore().getString(
                  IDEInternalPreferences.WORKSPACE_NAME);
          if (workspaceName != null && workspaceName.length() > 0) {
-            title = NLS.bind(IDEWorkbenchMessages.WorkbenchWindow_shellTitle,
-                    workspaceName, title);
+               //IDEWorkbenchMessages.WorkbenchWindow_shellTitle == "{0} - {1}"
+            title = NLS.bind("{0} - {1}", workspaceName, title);
          }
  
          return title;
diff --git a/features/org.simantics.desktop.feature/feature.xml b/features/org.simantics.desktop.feature/feature.xml

index a66de8d151e79c77908919171e719d14553c95b4..59e0ec2e910e7f872487161f17588838eca54962 100644 (file)
--- a/features/org.simantics.desktop.feature/feature.xml
+++ b/features/org.simantics.desktop.feature/feature.xml
@@ -45,10 +45,6 @@
           id="org.simantics.eclipsec.launcher"
           version="0.0.0"/>
  
-   <includes
-         id="org.eclipse.epp.mpc"
-         version="0.0.0"/>
-
     <includes
           id="org.eclipse.equinox.p2.discovery.feature"
           version="0.0.0"/>
@@ -67,4 +63,31 @@
           version="0.0.0"
           unpack="false"/>
  
+   <plugin
+         id="org.eclipse.ui.intro.quicklinks"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+   <plugin   
+         id="org.eclipse.epp.mpc.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epp.mpc.help.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epp.mpc.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
  </feature>
diff --git a/features/org.simantics.desktop.product.oxygen.feature/.project b/features/org.simantics.desktop.product.oxygen.feature/.project

new file mode 100644 (file)

index 0000000..cbecb48
--- /dev/null
+++ b/features/org.simantics.desktop.product.oxygen.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.simantics.desktop.product.oxygen.feature</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.FeatureBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.FeatureNature</nature>
+       </natures>
+</projectDescription>
diff --git a/features/org.simantics.desktop.product.oxygen.feature/build.properties b/features/org.simantics.desktop.product.oxygen.feature/build.properties

new file mode 100644 (file)

index 0000000..64f93a9
--- /dev/null
+++ b/features/org.simantics.desktop.product.oxygen.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/features/org.simantics.desktop.product.oxygen.feature/feature.xml b/features/org.simantics.desktop.product.oxygen.feature/feature.xml

new file mode 100644 (file)

index 0000000..f467a77
--- /dev/null
+++ b/features/org.simantics.desktop.product.oxygen.feature/feature.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.simantics.desktop.product.oxygen.feature"
+      label="Feature"
+      version="1.0.0.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="org.eclipse.userstorage"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.userstorage.oauth"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.userstorage.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene.misc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene.analyzers-common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene.analyzers-smartcn"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.wikitext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.wikitext.mediawiki"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.annotation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.intro.quicklinks"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.wikitext.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jsoup"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.simantics.help.feature/feature.xml b/features/org.simantics.help.feature/feature.xml

index 78b77bff9f94ff28a09eb7056097063213935957..658c26f6cde7e97a029cda5731c159dccc51a885 100644 (file)
--- a/features/org.simantics.help.feature/feature.xml
+++ b/features/org.simantics.help.feature/feature.xml
@@ -45,20 +45,6 @@
           version="0.0.0"
           unpack="false"/>
  
-   <plugin
-         id="org.apache.lucene.analysis"
-         download-size="887"
-         install-size="1772"
-         version="3.5.0.v20120725-1805"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene.core"
-         download-size="1513"
-         install-size="3048"
-         version="3.5.0.v20120725-1805"
-         unpack="false"/>
-
     <plugin
           id="org.eclipse.help.webapp"
           download-size="0"
@@ -206,4 +192,32 @@
           version="0.0.0"
           unpack="false"/>
  
+   <plugin
+         id="org.apache.lucene.analyzers-common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene.analyzers-smartcn"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene.misc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
  </feature>
diff --git a/features/org.simantics.rcp.feature/feature.xml b/features/org.simantics.rcp.feature/feature.xml

index c1610fdc6f21f32e5d1e922dd14e38fc1848bd4a..3a245361037ccd40479e5420b276131bd6f35189 100644 (file)
--- a/features/org.simantics.rcp.feature/feature.xml
+++ b/features/org.simantics.rcp.feature/feature.xml
@@ -153,44 +153,6 @@ This Agreement is governed by the laws of the State of New York and the intellec
           version="0.0.0"
           unpack="false"/>
  
-   <plugin
-         id="org.eclipse.core.filesystem.aix.ppc"
-         os="aix"
-         arch="ppc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.aix.ppc64"
-         os="aix"
-         arch="ppc64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.hpux.ia64"
-         os="hpux"
-         arch="ia64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.java7"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
     <plugin
           id="org.eclipse.core.filesystem.linux.x86"
           os="linux"
@@ -211,16 +173,6 @@ This Agreement is governed by the laws of the State of New York and the intellec
           fragment="true"
           unpack="false"/>
  
-   <plugin
-         id="org.eclipse.core.filesystem.linux.ppc"
-         os="linux"
-         arch="ppc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
     <plugin
           id="org.eclipse.core.filesystem.linux.ppc64"
           os="linux"
@@ -250,16 +202,6 @@ This Agreement is governed by the laws of the State of New York and the intellec
           fragment="true"
           unpack="false"/>
  
-   <plugin
-         id="org.eclipse.core.filesystem.solaris.sparc"
-         os="solaris"
-         arch="sparc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
     <plugin
           id="org.eclipse.core.filesystem.win32.x86"
           os="win32"
diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml

index 8e82b8260c6a9b59ff0c5eea028ad578c143704d..4cf2114432f0d0f3aa35728255e7de5dfb59198e 100644 (file)
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -32,10 +32,6 @@
           id="org.eclipse.rcp"
           version="0.0.0"/>
  
-   <includes
-         id="org.eclipse.epp.mpc"
-         version="0.0.0"/>
-
     <includes
           id="org.eclipse.equinox.p2.discovery.feature"
           version="0.0.0"/>
@@ -248,22 +244,22 @@
  
     <plugin
           id="org.simantics.msvc.runtime.x86"
-         fragment="true"
           os="win32"
           arch="x86"
           download-size="0"
           install-size="0"
           version="0.0.0"
+         fragment="true"
           unpack="false"/>
  
     <plugin
           id="org.simantics.msvc.runtime.x86_64"
-         fragment="true"
           os="win32"
           arch="x86_64"
           download-size="0"
           install-size="0"
           version="0.0.0"
+         fragment="true"
           unpack="false"/>
  
     <plugin
@@ -273,4 +269,25 @@
           version="0.0.0"
           unpack="false"/>
  
+   <plugin
+         id="org.eclipse.epp.mpc.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epp.mpc.help.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epp.mpc.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
  </feature>
diff --git a/features/org.simantics.ui.workbench.feature/feature.xml b/features/org.simantics.ui.workbench.feature/feature.xml

index b234acd5cc5bf988c7073d2c48370e383fecb052..2fb2dd54406904b531359c0f603f1de8716f6dfe 100644 (file)
--- a/features/org.simantics.ui.workbench.feature/feature.xml
+++ b/features/org.simantics.ui.workbench.feature/feature.xml
@@ -271,4 +271,11 @@
           version="0.0.0"
           unpack="false"/>
  
+   <plugin
+         id="org.eclipse.jdt.annotation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
  </feature>
diff --git a/features/org.simantics.wiki.ui.feature/feature.xml b/features/org.simantics.wiki.ui.feature/feature.xml

index a81a21e110eb569db05d60d4d7eae7bfac89468d..d1dc4dd43fde676d4c24206b077ac7b40af60723 100644 (file)
--- a/features/org.simantics.wiki.ui.feature/feature.xml
+++ b/features/org.simantics.wiki.ui.feature/feature.xml
@@ -36,51 +36,58 @@
           unpack="false"/>
  
     <plugin
-         id="org.eclipse.mylyn.wikitext.core"
+         id="org.eclipse.mylyn.wikitext.mediawiki.ui"
           download-size="0"
           install-size="0"
           version="0.0.0"
           unpack="false"/>
  
     <plugin
-         id="org.eclipse.mylyn.wikitext.core.ant"
+         id="org.eclipse.mylyn.wikitext.ui"
           download-size="0"
           install-size="0"
           version="0.0.0"
           unpack="false"/>
  
     <plugin
-         id="org.eclipse.mylyn.wikitext.core.osgi"
+         id="org.mozilla.rhino"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.mylyn.wikitext"
           download-size="0"
           install-size="0"
           version="0.0.0"
           unpack="false"/>
  
     <plugin
-         id="org.eclipse.mylyn.wikitext.mediawiki.core"
+         id="org.eclipse.mylyn.wikitext.ant"
           download-size="0"
           install-size="0"
           version="0.0.0"
           unpack="false"/>
  
     <plugin
-         id="org.eclipse.mylyn.wikitext.mediawiki.ui"
+         id="org.eclipse.mylyn.wikitext.osgi"
           download-size="0"
           install-size="0"
           version="0.0.0"
           unpack="false"/>
  
     <plugin
-         id="org.eclipse.mylyn.wikitext.ui"
+         id="org.eclipse.mylyn.wikitext.mediawiki"
           download-size="0"
           install-size="0"
           version="0.0.0"
           unpack="false"/>
  
     <plugin
-         id="org.mozilla.rhino"
+         id="org.jsoup"
           download-size="0"
           install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
  
  </feature>
diff --git a/features/pom.xml b/features/pom.xml

index 7c31bd537c51df49c6407989a160c783c8e5e6e9..7a9a67a3f0bce060b23f5ef0178754a042c7a412 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -62,7 +62,9 @@
                    <plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui"/>
                    <plugin id="org.eclipse.mylyn.wikitext.ui"/>
                    <plugin id="org.simantics.help.files"/>
+                  <plugin id="org.eclipse.epp.mpc.help.ui"/>
  
+                  <feature id="org.eclipse.mylyn.wikitext_feature"/>
                    <feature id="org.apache.poi.feature"/>
                    <feature id="org.eclipse.ecf.core.feature"/>
                    <feature id="org.eclipse.ecf.core.ssl.feature"/>
@@ -110,6 +112,7 @@
          <module>org.simantics.db.services.feature</module>
          <module>org.simantics.desktop.feature</module>
          <module>org.simantics.desktop.product.feature</module>
+        <module>org.simantics.desktop.product.oxygen.feature</module>
          <module>org.simantics.document.base.feature</module>
          <module>org.simantics.document.linking.feature</module>
          <module>org.simantics.document.swt.feature</module>
diff --git a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product

index f68f507c00a44f41d37bc60edaa05d3d77a850b5..f3900f496c61a4f220e9e5a3d3706b42511e0d8d 100644 (file)
--- a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
+++ b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
@@ -39,7 +39,6 @@ org.eclipse.e4.ui.css.theme.e4_classic
     <windowImages i32="/org.simantics.desktop.ui/icons/simantics32.png"/>
  
     <launcher name="Simantics-Desktop">
-      <solaris/>
        <win useIco="false">
           <bmp/>
        </win>
@@ -58,16 +57,9 @@ org.eclipse.e4.ui.css.theme.e4_classic
  
     <features>
        <feature id="org.simantics.desktop.product.feature" version="1.0.0.qualifier"/>
+      <feature id="org.simantics.desktop.product.oxygen.feature" version="1.0.0.qualifier"/>
     </features>
  
-
-   <preferencesInfo>
-      <targetfile overwrite="false"/>
-   </preferencesInfo>
-
-   <cssInfo>
-   </cssInfo>
-   
     <configurations>
        <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
        <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
@@ -76,4 +68,11 @@ org.eclipse.e4.ui.css.theme.e4_classic
        <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
     </configurations>
  
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
  </product>
diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml

index a42b854b13a7187265e3e3dff5c0e98e73783491..b5a9dd167fb32324f1cb7392f4df27f245470725 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -306,6 +306,16 @@
                                      <id>org.mozilla:rhino:1.7.7.1</id>
                                      <source>true</source>
                                  </artifact>
+                                <!-- org.eclipse.epp.mpc.core.win32 plug-in requires 4.1.0 -->
+                                <artifact>
+                                    <id>net.java.dev.jna:jna:4.1.0</id>
+                                    <source>true</source>
+                                </artifact>
+                                 <!-- org.eclipse.epp.mpc.core.win32 plug-in requires 4.1.0 -->
+                                <artifact>
+                                    <id>net.java.dev.jna:jna-platform:4.1.0</id>
+                                    <source>true</source>
+                                </artifact>
                                  <artifact>
                                      <id>net.java.dev.jna:jna:4.3.0</id>
                                      <source>true</source>
diff --git a/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

index 9a632534418634f327f505b730f051605a7cd797..d99e6fd4f7d0042bfe11fda3f96205d5ad2a5a29 100644 (file)
--- a/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
@@ -1,102 +1,138 @@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="233">
+<?pde version="3.8"?><target name="Eclipse Oxygen" sequenceNumber="1500623485">
  <locations>
  <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/"/>
+<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 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"/>
+<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.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.mylyn.wikitext_feature.feature.group" version="3.0.6.201703111926"/>
+<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 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"/>
+<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 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/"/>
+<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 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/"/>
+<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 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/"/>
+<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 includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" 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"/>
@@ -107,8 +143,8 @@
  <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"/>
@@ -140,26 +176,28 @@
  <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="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="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"/>
@@ -168,49 +206,53 @@
  <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.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.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.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.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.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.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"/>
@@ -219,26 +261,22 @@
  <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.jboss.windup.decompiler.api.forge-addon.source" version="4.0.0.Beta1"/>
+<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.source" version="1.0.0.20160510"/>
  <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-compilertools" 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-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-reflection.source" 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" version="4.0.0.Beta1"/>
-<unit id="org.jboss.windup.utils.windup-utils.forge-addon.source" version="4.0.0.Beta1"/>
+<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"/>
@@ -251,28 +289,18 @@
  <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="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/master/external-components/maven"/>
+<repository location="http://www.simantics.org/download/private/eclipse-4.7/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"/>
+<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>
  </locations>
  </target>
diff --git a/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

index a4149954e74f8e9eca2d1aa2ab2e8c87fe0b8425..1fc2f710c93d74c12178e41b8ecabf2315e2a1e2 100644 (file)
--- a/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
@@ -1,6 +1,304 @@
-target "Eclipse Mars.2"
+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
+}
+\ No newline at end of file
diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target

index a17c650bb8f6ec21c0d03faee93f7a66027e78a5..9290a8b823146ddba33cea736563fa5c9fb6b05c 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -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.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>
diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd

new file mode 100644 (file)

index 0000000..cb0e15a
--- /dev/null
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
@@ -0,0 +1,10 @@
+target "Simantics 1.30.0 Oxygen"
+
+with source allEnvironments
+
+include "org.simantics.sdk.build.targetdefinition.tpd"
+
+location "http://www.simantics.org/download/private/eclipse-4.7/sdk" {
+       org.simantics.sdk.feature.group
+       org.simantics.sdk.source.feature.group
+}
author	Miro Richard Eklund <miro.eklund@semantum.fi>
	Wed, 9 Aug 2017 06:53:38 +0000 (09:53 +0300)
committer	Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
	Wed, 9 Aug 2017 09:43:11 +0000 (12:43 +0300)
.project		patch \| blob \| history
bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageBookView.java		patch \| blob \| history
bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF		patch \| blob \| history
bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/TabbedPropertyPage.java		patch \| blob \| history
bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/WikiBrowser.java		patch \| blob \| history
bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF		patch \| blob \| history
bundles/org.simantics.document/META-INF/MANIFEST.MF		patch \| blob \| history
bundles/org.simantics.document/src/org/simantics/document/Exportable.java		patch \| blob \| history
bundles/org.simantics.document/src/org/simantics/document/export/ExportWikiPdf.java		patch \| blob \| history
bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java		patch \| blob \| history
bundles/org.simantics.help.core/META-INF/MANIFEST.MF		patch \| blob \| history
bundles/org.simantics.help.core/src/org/simantics/help/core/HelpUtils.java		patch \| blob \| history
bundles/org.simantics.views.swt.client/META-INF/MANIFEST.MF		patch \| blob \| history
bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/impl/SWTWikiBrowser.java		patch \| blob \| history
bundles/org.simantics.views.text/META-INF/MANIFEST.MF		patch \| blob \| history
bundles/org.simantics.views.text/src/org/simantics/views/text/internal/SWTMarkupSourceViewer.java		patch \| blob \| history
bundles/org.simantics.wiki.ui/META-INF/MANIFEST.MF		patch \| blob \| history
bundles/org.simantics.wiki.ui/src/org/simantics/wiki/ui/language/MediaWikiLanguage.java		patch \| blob \| history
bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchApplication.java		patch \| blob \| history
bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchWindowAdvisor.java		patch \| blob \| history
features/org.simantics.desktop.feature/feature.xml		patch \| blob \| history
features/org.simantics.desktop.product.oxygen.feature/.project	[new file with mode: 0644]	patch \| blob
features/org.simantics.desktop.product.oxygen.feature/build.properties	[new file with mode: 0644]	patch \| blob
features/org.simantics.desktop.product.oxygen.feature/feature.xml	[new file with mode: 0644]	patch \| blob
features/org.simantics.help.feature/feature.xml		patch \| blob \| history
features/org.simantics.rcp.feature/feature.xml		patch \| blob \| history
features/org.simantics.sdk.feature/feature.xml		patch \| blob \| history
features/org.simantics.ui.workbench.feature/feature.xml		patch \| blob \| history
features/org.simantics.wiki.ui.feature/feature.xml		patch \| blob \| history
features/pom.xml		patch \| blob \| history
releng/org.simantics.desktop.rcp.product/simantics-desktop.product		patch \| blob \| history
releng/org.simantics.sdk.build.p2.site/pom.xml		patch \| blob \| history
releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target		patch \| blob \| history
releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd		patch \| blob \| history
releng/org.simantics.sdk.build.targetdefinition/simantics.target		patch \| blob \| history
releng/org.simantics.sdk.build.targetdefinition/simantics.tpd	[new file with mode: 0644]	patch \| blob