From: Tuukka Lehtonen Date: Fri, 17 Jan 2020 13:08:49 +0000 (+0200) Subject: Fixing platform to build on the Eclipse 4.14 target X-Git-Tag: v1.43.0~130 X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=e97b5f6a6abbd5d123d8990645c4973d6a6e12c0 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 f270dd213..500657e5d 100644 --- 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 getAdapter(Class 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 index ad32c83a7..000000000 --- a/bundles/org.simantics.msvc.runtime.x86/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.simantics.msvc.runtime.x86/.project b/bundles/org.simantics.msvc.runtime.x86/.project deleted file mode 100644 index 050f09e08..000000000 --- a/bundles/org.simantics.msvc.runtime.x86/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.simantics.msvc.runtime.x86 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - 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 index c537b6306..000000000 --- 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 index f4b336a4f..000000000 --- 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 index 47c6edf6d..000000000 --- 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 index e9eae444e..000000000 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 index fd91c89d8..000000000 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 index 256c95cd1..000000000 --- a/bundles/org.simantics.msvc.runtime.x86/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - 4.0.0 - org.simantics.msvc.runtime.x86 - eclipse-plugin - 10.0.40219-SNAPSHOT - - - org.simantics - org.simantics.root.bundles - 1.0.0-SNAPSHOT - .. - - - - - - org.eclipse.tycho - target-platform-configuration - - - - win32 - x86 - - - - - - - - \ 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 index e69de29bb..000000000 diff --git a/bundles/org.simantics.msvc.runtime.x86_64/.classpath b/bundles/org.simantics.msvc.runtime.x86_64/.classpath index ad32c83a7..eca7bdba8 100644 --- a/bundles/org.simantics.msvc.runtime.x86_64/.classpath +++ b/bundles/org.simantics.msvc.runtime.x86_64/.classpath @@ -1,6 +1,6 @@ - + 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 c537b6306..0c68a61dc 100644 --- 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 1d253418e..d4ecac0f2 100644 --- 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 ad32c83a7..eca7bdba8 100644 --- a/bundles/org.simantics.msvc.runtime/.classpath +++ b/bundles/org.simantics.msvc.runtime/.classpath @@ -1,6 +1,6 @@ - + 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 c537b6306..0c68a61dc 100644 --- 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 300729494..d741eef76 100644 --- 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 bd16daf91..59e88c12b 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -172,7 +172,6 @@ org.simantics.modeling.ui org.simantics.modeling.ui.workbench org.simantics.msvc.runtime - org.simantics.msvc.runtime.x86 org.simantics.msvc.runtime.x86_64 org.simantics.nativemem org.simantics.objmap2 diff --git a/features/org.simantics.rcp.feature/feature.xml b/features/org.simantics.rcp.feature/feature.xml index ce56f5982..910e199de 100644 --- a/features/org.simantics.rcp.feature/feature.xml +++ b/features/org.simantics.rcp.feature/feature.xml @@ -13,7 +13,7 @@ @@ -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"/> - - - - - - - - - - - - - - - - - - + + diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml index d0ba3a85c..cd214cf61 100644 --- 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"/> - - + - - - - - - - - - - - - @@ -71,8 +60,7 @@ - - + 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 5a576579e..1913b5a10 100644 --- 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 @@ - + @@ -23,6 +23,14 @@ + + + + + + + + @@ -305,6 +313,8 @@ + + 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 db04a696a..88ff7ee83 100644 --- 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 f49271eef..ad2f8c4ea 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,7 +1,7 @@ - + @@ -23,6 +23,14 @@ + + + + + + + + @@ -305,6 +313,8 @@ + + diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml index 91de53571..320857f51 100644 --- a/releng/org.simantics.tycho.configuration/pom.xml +++ b/releng/org.simantics.tycho.configuration/pom.xml @@ -72,11 +72,6 @@ gtk x86_64 - - win32 - win32 - x86 - win32 win32