Fixing platform to build on the Eclipse 4.14 target

* Added org.eclipse.jetty.server 9.4.5
* 32-bit Eclipse is no more, so removed all 32-bit bundles and
  related definitions

gitlab #405

Change-Id: I580375d93b105edd01097d326567948918b7bdc9

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 f270dd21341488343f16edf7d43a3f49980c6116..500657e5d85026d72e198b69e91b6308def9b544 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
@@ -22,6 +22,7 @@ import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IPathVariableManager;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IProjectNature;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceFilterDescription;
@@ -32,7 +33,6 @@ import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourceAttributes;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.QualifiedName;
@@ -613,9 +613,8 @@ public class SystemProject implements IProject{
                return false;
        }
 
-       @SuppressWarnings("rawtypes")
        @Override
-       public Object getAdapter(Class adapter) {
+       public <T> T getAdapter(Class<T> adapter) {
                // TODO Auto-generated method stub
                return null;
        }

diff --git a/bundles/org.simantics.msvc.runtime.x86/.classpath b/bundles/org.simantics.msvc.runtime.x86/.classpath
deleted file mode 100644 (file)
index ad32c83..0000000
--- a/bundles/org.simantics.msvc.runtime.x86/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.simantics.msvc.runtime.x86/.project b/bundles/org.simantics.msvc.runtime.x86/.project
deleted file mode 100644 (file)
index 050f09e..0000000
--- a/bundles/org.simantics.msvc.runtime.x86/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.simantics.msvc.runtime.x86</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/bundles/org.simantics.msvc.runtime.x86/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.msvc.runtime.x86/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index c537b63..0000000
--- a/bundles/org.simantics.msvc.runtime.x86/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6

diff --git a/bundles/org.simantics.msvc.runtime.x86/META-INF/MANIFEST.MF b/bundles/org.simantics.msvc.runtime.x86/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index f4b336a..0000000
--- a/bundles/org.simantics.msvc.runtime.x86/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Microsoft Visual C++ Runtime x86 libraries
-Bundle-SymbolicName: org.simantics.msvc.runtime.x86
-Bundle-Version: 10.0.40219.qualifier
-Bundle-Vendor: Semantum Oy
-Fragment-Host: org.simantics.msvc.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
-Bundle-NativeCode: msvcr100.dll; msvcp100.dll; processor=x86
-Automatic-Module-Name: org.simantics.msvc.runtime.x86

diff --git a/bundles/org.simantics.msvc.runtime.x86/build.properties b/bundles/org.simantics.msvc.runtime.x86/build.properties
deleted file mode 100644 (file)
index 47c6edf..0000000
--- a/bundles/org.simantics.msvc.runtime.x86/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               msvcp100.dll,\
-               msvcr100.dll

diff --git a/bundles/org.simantics.msvc.runtime.x86/msvcp100.dll b/bundles/org.simantics.msvc.runtime.x86/msvcp100.dll
deleted file mode 100644 (file)
index e9eae44..0000000
Binary files a/bundles/org.simantics.msvc.runtime.x86/msvcp100.dll and /dev/null differ

diff --git a/bundles/org.simantics.msvc.runtime.x86/msvcr100.dll b/bundles/org.simantics.msvc.runtime.x86/msvcr100.dll
deleted file mode 100644 (file)
index fd91c89..0000000
Binary files a/bundles/org.simantics.msvc.runtime.x86/msvcr100.dll and /dev/null differ

diff --git a/bundles/org.simantics.msvc.runtime.x86/pom.xml b/bundles/org.simantics.msvc.runtime.x86/pom.xml
deleted file mode 100644 (file)
index 256c95c..0000000
--- a/bundles/org.simantics.msvc.runtime.x86/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <artifactId>org.simantics.msvc.runtime.x86</artifactId>
-       <packaging>eclipse-plugin</packaging>
-       <version>10.0.40219-SNAPSHOT</version>
-
-       <parent>
-               <groupId>org.simantics</groupId>
-               <artifactId>org.simantics.root.bundles</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.eclipse.tycho</groupId>
-                               <artifactId>target-platform-configuration</artifactId>
-                               <configuration>
-                                       <environments>
-                                               <environment>
-                                                       <os>win32</os>
-                                                       <arch>x86</arch>
-                                               </environment>
-                                       </environments>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-
-</project>
\ No newline at end of file

diff --git a/bundles/org.simantics.msvc.runtime.x86/src/.keep b/bundles/org.simantics.msvc.runtime.x86/src/.keep
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/bundles/org.simantics.msvc.runtime.x86_64/.classpath b/bundles/org.simantics.msvc.runtime.x86_64/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644 (file)
--- a/bundles/org.simantics.msvc.runtime.x86_64/.classpath
+++ b/bundles/org.simantics.msvc.runtime.x86_64/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>

diff --git a/bundles/org.simantics.msvc.runtime.x86_64/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.msvc.runtime.x86_64/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644 (file)
--- a/bundles/org.simantics.msvc.runtime.x86_64/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.msvc.runtime.x86_64/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8

diff --git a/bundles/org.simantics.msvc.runtime.x86_64/META-INF/MANIFEST.MF b/bundles/org.simantics.msvc.runtime.x86_64/META-INF/MANIFEST.MF
index 1d253418e24ce3c2e6bbd9c6aac78f2c3a688d26..d4ecac0f2ad5432539ed8c8cd29110115dc817fb 100644 (file)
--- a/bundles/org.simantics.msvc.runtime.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.msvc.runtime.x86_64/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.simantics.msvc.runtime.x86_64
 Bundle-Version: 10.0.40219.qualifier
 Bundle-Vendor: Semantum Oy
 Fragment-Host: org.simantics.msvc.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
 Bundle-NativeCode: msvcr100.dll; msvcp100.dll; processor=x86_64
 Automatic-Module-Name: org.simantics.msvc.runtime.x86_64

diff --git a/bundles/org.simantics.msvc.runtime/.classpath b/bundles/org.simantics.msvc.runtime/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644 (file)
--- a/bundles/org.simantics.msvc.runtime/.classpath
+++ b/bundles/org.simantics.msvc.runtime/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>

diff --git a/bundles/org.simantics.msvc.runtime/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.msvc.runtime/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644 (file)
--- a/bundles/org.simantics.msvc.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.msvc.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8

diff --git a/bundles/org.simantics.msvc.runtime/META-INF/MANIFEST.MF b/bundles/org.simantics.msvc.runtime/META-INF/MANIFEST.MF
index 3007294948d90bf8172758775b4cc5693e44b8fc..d741eef76a2e0dfad77a4755b6cd607621c3a5af 100644 (file)
--- a/bundles/org.simantics.msvc.runtime/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.msvc.runtime/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 10.0.40219.qualifier
 Bundle-Activator: org.simantics.msvc.runtime.Activator
 Bundle-Vendor: Semantum Oy
 Require-Bundle: org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.msvc.runtime
 Automatic-Module-Name: org.simantics.msvc.runtime

diff --git a/bundles/pom.xml b/bundles/pom.xml
index bd16daf91cdd9c861a219cf9fc3a0ee4cae4b86c..59e88c12b6a83843b1a69dbd2cb2766cc5bdbec2 100644 (file)
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -172,7 +172,6 @@
                <module>org.simantics.modeling.ui</module>
                <module>org.simantics.modeling.ui.workbench</module>
                <module>org.simantics.msvc.runtime</module>
-               <module>org.simantics.msvc.runtime.x86</module>
                <module>org.simantics.msvc.runtime.x86_64</module>
                <module>org.simantics.nativemem</module>
                <module>org.simantics.objmap2</module>

diff --git a/features/org.simantics.rcp.feature/feature.xml b/features/org.simantics.rcp.feature/feature.xml
index ce56f5982007013ebb2e00272e36b54af59c7797..910e199de437b4a7bebafc28a04605244606a9f8 100644 (file)
--- a/features/org.simantics.rcp.feature/feature.xml
+++ b/features/org.simantics.rcp.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.simantics.rcp"
       label="Simantics Rich Client Platform"
-      version="1.25.1.qualifier"
+      version="1.42.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description>
@@ -149,16 +149,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.linux.x86"
-         os="linux"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.filesystem.linux.x86_64"
          os="linux"
@@ -169,26 +159,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.ppc64"
-         os="linux"
-         arch="ppc64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.linux.ppc64le"
-         os="linux"
-         arch="ppc64le"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.filesystem.macosx"
          os="macosx"
@@ -198,16 +168,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.win32.x86"
-         os="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.filesystem.win32.x86_64"
          os="win32"
@@ -225,16 +185,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.net.linux.x86"
-         os="linux"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.net.linux.x86_64"
          os="linux"
@@ -245,16 +195,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.net.win32.x86"
-         os="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.net.win32.x86_64"
          os="win32"
@@ -272,16 +212,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.resources.win32.x86"
-         os="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.resources.win32.x86_64"
          os="win32"
@@ -344,16 +274,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.equinox.security.win32.x86"
-         os="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.security.win32.x86_64"
          os="win32"
@@ -524,13 +444,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.equinox.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.ds"
          download-size="0"
@@ -628,4 +541,13 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          fragment="true"/>
 
+   <plugin
+         id="org.eclipse.equinox.security.linux.x86_64"
+         os="linux"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
 </feature>

diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index d0ba3a85ce8685c4aa621a88e616ec00bd37a266..cd214cf610b6f850dce1e8938ecca73bfca68638 100644 (file)
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -292,16 +292,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.simantics.msvc.runtime.x86"
-         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"
          os="win32"

diff --git a/features/pom.xml b/features/pom.xml
index a2a39bac49055722fbc90ddc0b757d377ab1c686..0f8fbf9482b4544a4b77f76e09287e300e56bcb8 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -32,25 +32,14 @@
                   <plugin id="com.famfamfam.silk"/>
                   <plugin id="javax.vecmath"/>
                   <plugin id="org.apache.batik"/>
+                  <plugin id="org.apache.lucene.misc"/>
                   <plugin id="org.apache.poi"/>
 
-                  <plugin id="org.eclipse.core.filesystem.aix.ppc"/>
-                  <plugin id="org.eclipse.core.filesystem.aix.ppc64"/>
-                  <plugin id="org.eclipse.core.filesystem.hpux.ia64"/>
-                  <plugin id="org.eclipse.core.filesystem.linux.x86"/>
                   <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
-                  <plugin id="org.eclipse.core.filesystem.linux.ppc"/>
-                  <plugin id="org.eclipse.core.filesystem.linux.ppc64"/>
-                  <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>
                   <plugin id="org.eclipse.core.filesystem.macosx"/>
-                  <plugin id="org.eclipse.core.filesystem.solaris.sparc"/>
-                  <plugin id="org.eclipse.core.filesystem.win32.x86"/>
                   <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>
-                  <plugin id="org.eclipse.core.net.linux.x86"/>
                   <plugin id="org.eclipse.core.net.linux.x86_64"/>
-                  <plugin id="org.eclipse.core.net.win32.x86"/>
                   <plugin id="org.eclipse.core.net.win32.x86_64"/>
-                  <plugin id="org.eclipse.core.resources.win32.x86"/>
                   <plugin id="org.eclipse.core.resources.win32.x86_64"/>
                   <plugin id="javax.xml"/>
                   <plugin id="org.sat4j.core"/>
@@ -71,8 +60,7 @@
                   <feature id="org.eclipse.ecf.core.ssl.feature"/>
                   <feature id="org.eclipse.ecf.filetransfer.feature"/>
                   <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
-                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
-                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
+                  <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature"/>
                   <feature id="org.eclipse.emf.common"/>
                   <feature id="org.eclipse.emf.ecore"/>
                   <feature id="org.eclipse.epp.mpc"/>

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 5a576579ebd08acea281a8d21c82f257c1a3e083..1913b5a106c3e33463cbce4696271ae7bcf6f9fa 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,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1579264782">
+<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1579267720">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -23,6 +23,14 @@
     </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.lucene.analyzers-common" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.analyzers-common.source" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.analyzers-smartcn" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.analyzers-smartcn.source" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.core" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.core.source" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.misc" version="8.0.0.v20190418-1455"/>
+      <unit id="org.apache.lucene.queryparser" version="7.5.0.v20181003-1532"/>
       <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"/>
@@ -305,6 +313,8 @@
       <unit id="org.eclipse.jetty.http.source" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.io" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.io.source" version="9.4.5.v20170502"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.5.v20170502"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.servlets" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.servlets.source" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.util" version="9.4.5.v20170502"/>

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 db04a696ac7c8d9669808f769306cefc812477e1..88ff7ee83e4cc1e81e6036f7cca1a816b72bb0a1 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
@@ -24,6 +24,14 @@ location "http://www.simantics.org/update/tools/orbit/downloads/drops/R201911262
 
 location "http://www.simantics.org/update/2019-12/" {
        javax.xml
+       org.apache.lucene.analyzers-common
+       org.apache.lucene.analyzers-common.source
+       org.apache.lucene.analyzers-smartcn
+       org.apache.lucene.analyzers-smartcn.source
+       org.apache.lucene.core
+       org.apache.lucene.core.source
+       org.apache.lucene.misc
+       org.apache.lucene.queryparser
        org.apache.xerces
        org.apache.xml.resolver
        org.apache.xml.serializer

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index f49271eef0c2459bb3f7742ceb38eb84ad693c3e..ad2f8c4eaa7a3697b207e4108c424ff0431ff933 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Simantics 1.42.0" sequenceNumber="1579261380">
+<target name="Simantics 1.42.0" sequenceNumber="1579261382">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -23,6 +23,14 @@
     </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.lucene.analyzers-common" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.analyzers-common.source" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.analyzers-smartcn" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.analyzers-smartcn.source" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.core" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.core.source" version="8.0.0.v20190404-1858"/>
+      <unit id="org.apache.lucene.misc" version="8.0.0.v20190418-1455"/>
+      <unit id="org.apache.lucene.queryparser" version="7.5.0.v20181003-1532"/>
       <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"/>
@@ -305,6 +313,8 @@
       <unit id="org.eclipse.jetty.http.source" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.io" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.io.source" version="9.4.5.v20170502"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.5.v20170502"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.servlets" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.servlets.source" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.util" version="9.4.5.v20170502"/>

diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 91de535718b4af971fa1494ac00ab5aee290b570..320857f517050d1bf8bbec7097f308f2a31a4dcb 100644 (file)
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -72,11 +72,6 @@
                                                        <ws>gtk</ws>
                                                        <arch>x86_64</arch>
                                                </environment>
-                                               <environment>
-                                                       <os>win32</os>
-                                                       <ws>win32</ws>
-                                                       <arch>x86</arch>
-                                               </environment>
                                                <environment>
                                                        <os>win32</os>
                                                        <ws>win32</ws>