From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 22 Apr 2020 07:47:41 +0000 (+0300)
Subject: Switch to JavaSE-11
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=a0dae600834ac44e8fc83bc067b1471821eee6c5;p=simantics%2Fdistrict.git

Switch to JavaSE-11

gitlab simantics/platform#524

Change-Id: I483a9ecbda489b94a483aab4bc747a7eb8bb05cb
---

diff --git a/org.simantics.district.geotools/.classpath b/org.simantics.district.geotools/.classpath
index 29b4b7aa..b72251f5 100644
--- a/org.simantics.district.geotools/.classpath
+++ b/org.simantics.district.geotools/.classpath
@@ -1,5 +1,7 @@
 <?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-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gt-api-16.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-16.0.jar"/>
@@ -57,8 +59,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/jgridshift-1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsr-275-1.0-beta-2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jts-1.13.jar"/>
-	<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"/>
 </classpath>
diff --git a/org.simantics.district.geotools/META-INF/MANIFEST.MF b/org.simantics.district.geotools/META-INF/MANIFEST.MF
index 1cdbfcaa..c95071fa 100644
--- a/org.simantics.district.geotools/META-INF/MANIFEST.MF
+++ b/org.simantics.district.geotools/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.simantics.district.geotools
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.district.geotools.Activator
 Require-Bundle: org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: lib/commons-pool-1.5.4.jar,
  lib/core-0.26.jar,
@@ -87,3 +87,5 @@ Export-Package: com.vividsolutions.jts,
  org.opengis.referencing,
  org.opengis.referencing.crs,
  org.opengis.referencing.operation
+Bundle-Vendor: THTH ry
+Automatic-Module-Name: org.simantics.district.geotools
diff --git a/org.simantics.district.imports.ui/.classpath b/org.simantics.district.imports.ui/.classpath
index b862a296..e801ebfb 100644
--- a/org.simantics.district.imports.ui/.classpath
+++ b/org.simantics.district.imports.ui/.classpath
@@ -1,7 +1,7 @@
-<?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.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.simantics.district.imports.ui/META-INF/MANIFEST.MF b/org.simantics.district.imports.ui/META-INF/MANIFEST.MF
index 49a37894..6ba64ddc 100644
--- a/org.simantics.district.imports.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.district.imports.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Simantics District Import UI
 Bundle-SymbolicName: org.simantics.district.imports.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.jface,
  org.simantics.utils.ui,
@@ -20,3 +20,5 @@ Require-Bundle: org.eclipse.ui.ide,
  org.simantics.district.maps,
  org.slf4j.api
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: THTH ry
+Automatic-Module-Name: org.simantics.district.imports.ui
diff --git a/org.simantics.district.imports/.classpath b/org.simantics.district.imports/.classpath
index ac0cdbaf..55224807 100644
--- a/org.simantics.district.imports/.classpath
+++ b/org.simantics.district.imports/.classpath
@@ -1,12 +1,13 @@
 <?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.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-csv-1.4.jar" sourcepath="lib/commons-csv-1.4-sources.jar"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.simantics.district.imports/META-INF/MANIFEST.MF b/org.simantics.district.imports/META-INF/MANIFEST.MF
index 747c33cb..b00215a2 100644
--- a/org.simantics.district.imports/META-INF/MANIFEST.MF
+++ b/org.simantics.district.imports/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Simantics District Imports
 Bundle-SymbolicName: org.simantics.district.imports
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.db,
  org.simantics,
  org.simantics.district.geotools,
@@ -15,3 +15,5 @@ Export-Package: org.apache.commons.csv,
  org.simantics.district.imports
 Bundle-ClassPath: lib/commons-csv-1.4.jar,
  .
+Bundle-Vendor: THTH ry
+Automatic-Module-Name: org.simantics.district.imports
diff --git a/org.simantics.district.maps/.classpath b/org.simantics.district.maps/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.maps/.classpath
+++ b/org.simantics.district.maps/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.maps/META-INF/MANIFEST.MF b/org.simantics.district.maps/META-INF/MANIFEST.MF
index 57e83dac..e4784a9f 100644
--- a/org.simantics.district.maps/META-INF/MANIFEST.MF
+++ b/org.simantics.district.maps/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Raster Mapping
 Bundle-SymbolicName: org.simantics.district.maps;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: VTT Technical Research Centre of Finland
+Bundle-Vendor: THTH ry
 Require-Bundle: org.simantics.scenegraph,
  org.eclipse.core.runtime;bundle-version="3.5.0";resolution:=optional,
  org.eclipse.core.net;bundle-version="1.2.1";resolution:=optional,
@@ -23,4 +23,5 @@ Export-Package: org.simantics.maps,
  org.simantics.maps.tile,
  org.simantics.maps.wms
 Import-Package: org.simantics.scenegraph.g2d
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.simantics.district.maps
diff --git a/org.simantics.district.network.ontology/.classpath b/org.simantics.district.network.ontology/.classpath
index b862a296..e801ebfb 100644
--- a/org.simantics.district.network.ontology/.classpath
+++ b/org.simantics.district.network.ontology/.classpath
@@ -1,7 +1,7 @@
-<?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.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.simantics.district.network.ontology/META-INF/MANIFEST.MF b/org.simantics.district.network.ontology/META-INF/MANIFEST.MF
index 55e042f1..39440f53 100644
--- a/org.simantics.district.network.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.district.network.ontology/META-INF/MANIFEST.MF
@@ -14,5 +14,7 @@ Require-Bundle: org.simantics.layer0,
  org.simantics.g2d.ontology;bundle-version="1.1.0",
  org.simantics.layer0x.ontology;bundle-version="1.1.0",
  org.simantics.datatypes.ontology;bundle-version="1.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.simantics.district.network.ontology
+Bundle-Vendor: THTH ry
+Automatic-Module-Name: org.simantics.district.network.ontology
diff --git a/org.simantics.district.network.ui.ontology/.classpath b/org.simantics.district.network.ui.ontology/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.network.ui.ontology/.classpath
+++ b/org.simantics.district.network.ui.ontology/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.network.ui.ontology/META-INF/MANIFEST.MF b/org.simantics.district.network.ui.ontology/META-INF/MANIFEST.MF
index 1f9cbeac..ae8fdc16 100644
--- a/org.simantics.district.network.ui.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.district.network.ui.ontology/META-INF/MANIFEST.MF
@@ -1,12 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Ontology
+Bundle-Name: http://www.simantics.org/DistrictNetworkUI
 Bundle-SymbolicName: org.simantics.district.network.ui.ontology
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.district.network.ontology;bundle-version="1.0.0",
  org.simantics.layer0;bundle-version="1.1.0",
  org.simantics.viewpoint.ontology;bundle-version="1.2.0",
  org.simantics.selectionview.ontology;bundle-version="1.2.0",
  org.simantics.selectionview.ui.ontology;bundle-version="1.1.0",
  org.simantics.views.ontology;bundle-version="1.2.0"
+Bundle-Vendor: THTH ry
+Automatic-Module-Name: org.simantics.district.network.ui.ontology
diff --git a/org.simantics.district.network.ui/.classpath b/org.simantics.district.network.ui/.classpath
index b862a296..e801ebfb 100644
--- a/org.simantics.district.network.ui/.classpath
+++ b/org.simantics.district.network.ui/.classpath
@@ -1,7 +1,7 @@
-<?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.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.simantics.district.network.ui/META-INF/MANIFEST.MF b/org.simantics.district.network.ui/META-INF/MANIFEST.MF
index 8802b40e..a1cccd2b 100644
--- a/org.simantics.district.network.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.district.network.ui/META-INF/MANIFEST.MF
@@ -40,9 +40,10 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.1.100.v20150
  org.eclipse.e4.core.services,
  org.eclipse.osgi.services;bundle-version="3.6.0",
  org.eclipse.nebula.widgets.nattable.core,
- org.simantics.district.imports
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
-  javax.inject;version="1.0.0"
+ org.simantics.district.imports,
+ jakarta.annotation-api;bundle-version="1.3.5"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Import-Package: javax.inject;version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.simantics.district.network.ui
+Bundle-Vendor: THTH ry
diff --git a/org.simantics.district.network/.classpath b/org.simantics.district.network/.classpath
index b862a296..e801ebfb 100644
--- a/org.simantics.district.network/.classpath
+++ b/org.simantics.district.network/.classpath
@@ -1,7 +1,7 @@
-<?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.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.simantics.district.network/META-INF/MANIFEST.MF b/org.simantics.district.network/META-INF/MANIFEST.MF
index f49358b9..b5130b9c 100644
--- a/org.simantics.district.network/META-INF/MANIFEST.MF
+++ b/org.simantics.district.network/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Simantics District Network
 Bundle-SymbolicName: org.simantics.district.network
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.db,
  org.simantics.layer0;bundle-version="1.1.0",
  org.simantics.district.network.ontology,
@@ -27,3 +27,5 @@ Export-Package: org.simantics.district.network,
  org.simantics.district.network.profile,
  org.simantics.district.network.visualisations,
  org.simantics.district.network.visualisations.model
+Bundle-Vendor: THTH ry
+Automatic-Module-Name: org.simantics.district.network
diff --git a/org.simantics.district.region.ontology/.classpath b/org.simantics.district.region.ontology/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.region.ontology/.classpath
+++ b/org.simantics.district.region.ontology/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.region.ontology/META-INF/MANIFEST.MF b/org.simantics.district.region.ontology/META-INF/MANIFEST.MF
index 2ec31d79..9814b7a8 100644
--- a/org.simantics.district.region.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.district.region.ontology/META-INF/MANIFEST.MF
@@ -1,13 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Simantics Diagram Region Ontology
+Bundle-Name: http://www.simantics.org/DistrictDiagramRegions
 Bundle-SymbolicName: org.simantics.district.region.ontology
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.district.region.ontology.Activator
-Bundle-Vendor: Semantum Oy
+Bundle-Vendor: THTH ry
 Require-Bundle: org.eclipse.core.runtime,
  org.simantics.layer0,
  org.simantics.diagram.ontology;bundle-version="2.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.district.region.ontology
+Automatic-Module-Name: org.simantics.district.region.ontology
diff --git a/org.simantics.district.region.ui/.classpath b/org.simantics.district.region.ui/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.region.ui/.classpath
+++ b/org.simantics.district.region.ui/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.region.ui/META-INF/MANIFEST.MF b/org.simantics.district.region.ui/META-INF/MANIFEST.MF
index 35d01a19..48a2469b 100644
--- a/org.simantics.district.region.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.district.region.ui/META-INF/MANIFEST.MF
@@ -17,8 +17,11 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.g2d,
  org.simantics.diagram,
  org.simantics.modeling,
- org.eclipse.e4.ui.services
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.eclipse.e4.ui.services,
+ jakarta.annotation-api;bundle-version="1.3.5"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.district.region.ui.handlers
 Import-Package: javax.inject;version="1.0.0"
+Automatic-Module-Name: org.simantics.district.region.ui
+Bundle-Vendor: THTH ry
diff --git a/org.simantics.district.region/.classpath b/org.simantics.district.region/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.region/.classpath
+++ b/org.simantics.district.region/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.region/META-INF/MANIFEST.MF b/org.simantics.district.region/META-INF/MANIFEST.MF
index 0e4fe90c..47cad5f1 100644
--- a/org.simantics.district.region/META-INF/MANIFEST.MF
+++ b/org.simantics.district.region/META-INF/MANIFEST.MF
@@ -14,6 +14,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics,
  org.simantics.modeling.ontology,
  org.simantics.modeling
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.district.region
+Bundle-Vendor: THTH ry
+Automatic-Module-Name: org.simantics.district.region
diff --git a/org.simantics.district.route.ontology/.classpath b/org.simantics.district.route.ontology/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.route.ontology/.classpath
+++ b/org.simantics.district.route.ontology/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.route.ontology/META-INF/MANIFEST.MF b/org.simantics.district.route.ontology/META-INF/MANIFEST.MF
index 61ec5737..caa19c08 100644
--- a/org.simantics.district.route.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.district.route.ontology/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: http://www.simantics.org/DistrictNetworkRoutes
 Bundle-SymbolicName: org.simantics.district.route.ontology
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Semantum Oy
+Bundle-Vendor: THTH ry
 Require-Bundle: org.simantics.layer0,
  org.simantics.district.network.ontology;bundle-version="1.0.0",
  org.simantics.diagram.ontology;bundle-version="2.2.0",
@@ -11,5 +11,5 @@ Require-Bundle: org.simantics.layer0,
  org.simantics.silk.ontology;bundle-version="1.1.0",
  org.simantics.viewpoint.ontology;bundle-version="1.2.0"
 Automatic-Module-Name: fi.vtt.apros.district.route.ontology
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.simantics.district.route.ontology
diff --git a/org.simantics.district.route.ui/.classpath b/org.simantics.district.route.ui/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.route.ui/.classpath
+++ b/org.simantics.district.route.ui/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.route.ui/META-INF/MANIFEST.MF b/org.simantics.district.route.ui/META-INF/MANIFEST.MF
index 70045519..657f32c6 100644
--- a/org.simantics.district.route.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.district.route.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: District Network Modelling Route UI
 Bundle-SymbolicName: org.simantics.district.route.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.district.route.ui.internal.Activator
-Bundle-Vendor: Semantum Oy
+Bundle-Vendor: THTH ry
 Require-Bundle: org.eclipse.e4.core.di,
  org.eclipse.e4.core.di.annotations,
  org.eclipse.e4.core.services,
@@ -16,10 +16,10 @@ Require-Bundle: org.eclipse.e4.core.di,
  org.simantics.district.route,
  org.simantics.district.network.ui;bundle-version="1.0.0",
  org.slf4j.api,
- org.simantics.modeling.ui;bundle-version="1.1.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.simantics.modeling.ui;bundle-version="1.1.1",
+ jakarta.annotation-api;bundle-version="1.3.5"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: fi.vtt.apros.district.route.ui
-Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
-  javax.inject;version="1.0.0",
-  org.osgi.service.event;version="1.3.1"
+Import-Package: javax.inject;version="1.0.0",
+ org.osgi.service.event;version="1.3.1"
 Bundle-ActivationPolicy: lazy
diff --git a/org.simantics.district.route/.classpath b/org.simantics.district.route/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.route/.classpath
+++ b/org.simantics.district.route/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.route/META-INF/MANIFEST.MF b/org.simantics.district.route/META-INF/MANIFEST.MF
index 6a69ee96..76d4d8ea 100644
--- a/org.simantics.district.route/META-INF/MANIFEST.MF
+++ b/org.simantics.district.route/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: District Network Routing
 Bundle-SymbolicName: org.simantics.district.route
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.district.route.internal.Activator
-Bundle-Vendor: Semantum Oy
+Bundle-Vendor: THTH ry
 Require-Bundle: org.eclipse.core.runtime,
  org.simantics.db.layer0;bundle-version="1.1.0",
  org.simantics;bundle-version="1.0.0",
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.slf4j.api,
  org.simantics.diagram.ontology,
  org.simantics.district.network.ontology
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: fi.vtt.apros.district.route
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.district.route,
diff --git a/org.simantics.district.selection.ui/.classpath b/org.simantics.district.selection.ui/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.selection.ui/.classpath
+++ b/org.simantics.district.selection.ui/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.selection.ui/META-INF/MANIFEST.MF b/org.simantics.district.selection.ui/META-INF/MANIFEST.MF
index 523958b1..9cd510ee 100644
--- a/org.simantics.district.selection.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.district.selection.ui/META-INF/MANIFEST.MF
@@ -32,10 +32,10 @@ Require-Bundle: javax.inject,
  org.eclipse.e4.core.services,
  org.simantics.district.network.ontology;bundle-version="1.0.0",
  org.simantics.layer0.utils,
- org.eclipse.nebula.widgets.tablecombo
+ org.eclipse.nebula.widgets.tablecombo,
+ jakarta.annotation-api;bundle-version="1.3.5"
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Vendor: Semantum oy
-Import-Package: javax.annotation;version="1.2.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-Vendor: THTH ry
 Export-Package: org.simantics.district.selection.ui.parts
 
diff --git a/org.simantics.district.selection/.classpath b/org.simantics.district.selection/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.district.selection/.classpath
+++ b/org.simantics.district.selection/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.district.selection/META-INF/MANIFEST.MF b/org.simantics.district.selection/META-INF/MANIFEST.MF
index fae2f723..d9a304ca 100644
--- a/org.simantics.district.selection/META-INF/MANIFEST.MF
+++ b/org.simantics.district.selection/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Diagram Element Selection
 Bundle-SymbolicName: org.simantics.district.selection
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.simantics.district.selection
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.district.route;bundle-version="1.0.0",
  org.simantics.district.route.ontology;bundle-version="1.0.0",
  org.simantics.district.region;bundle-version="1.0.0",
@@ -20,3 +20,4 @@ Require-Bundle: org.simantics.district.route;bundle-version="1.0.0",
  org.simantics.modeling.ontology,
  org.simantics.g2d.ontology;bundle-version="1.1.0"
 Export-Package: org.simantics.district.selection
+Bundle-Vendor: THTH ry
diff --git a/org.simantics.maps.elevation.server.ui/.classpath b/org.simantics.maps.elevation.server.ui/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.maps.elevation.server.ui/.classpath
+++ b/org.simantics.maps.elevation.server.ui/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.maps.elevation.server.ui/META-INF/MANIFEST.MF b/org.simantics.maps.elevation.server.ui/META-INF/MANIFEST.MF
index 2af1fde6..9c90978e 100644
--- a/org.simantics.maps.elevation.server.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.maps.elevation.server.ui/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.slf4j.api,
  org.simantics.maps.elevation.server;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.simantics.maps.elevation.server.ui
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: THTH ry
diff --git a/org.simantics.maps.elevation.server/.classpath b/org.simantics.maps.elevation.server/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.maps.elevation.server/.classpath
+++ b/org.simantics.maps.elevation.server/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.maps.elevation.server/META-INF/MANIFEST.MF b/org.simantics.maps.elevation.server/META-INF/MANIFEST.MF
index 794b34f1..c5226e5a 100644
--- a/org.simantics.maps.elevation.server/META-INF/MANIFEST.MF
+++ b/org.simantics.maps.elevation.server/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Simantics Maps Elevation Server
 Bundle-SymbolicName: org.simantics.maps.elevation.server;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.simantics.maps.elevation.server
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.district.geotools;bundle-version="1.0.0",
  org.slf4j.api,
  com.github.benmanes.caffeine;bundle-version="2.6.2",
@@ -14,3 +14,4 @@ Require-Bundle: org.simantics.district.geotools;bundle-version="1.0.0",
 Export-Package: org.simantics.maps.elevation.server,
  org.simantics.maps.elevation.server.prefs
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: THTH ry
diff --git a/org.simantics.maps.server.ui/.classpath b/org.simantics.maps.server.ui/.classpath
index eca7bdba..e801ebfb 100644
--- a/org.simantics.maps.server.ui/.classpath
+++ b/org.simantics.maps.server.ui/.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.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.maps.server.ui/META-INF/MANIFEST.MF b/org.simantics.maps.server.ui/META-INF/MANIFEST.MF
index ec29b026..b1b199bb 100644
--- a/org.simantics.maps.server.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.maps.server.ui/META-INF/MANIFEST.MF
@@ -15,5 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.ui,
  org.slf4j.api,
  org.simantics.district.network.ui;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: THTH ry
+Automatic-Module-Name: org.simantics.maps.server.ui
diff --git a/org.simantics.maps.server/.classpath b/org.simantics.maps.server/.classpath
index 89b43af9..787d0beb 100644
--- a/org.simantics.maps.server/.classpath
+++ b/org.simantics.maps.server/.classpath
@@ -8,7 +8,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.24.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/zt-exec-1.9.jar"/>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.simantics.maps.server/META-INF/MANIFEST.MF b/org.simantics.maps.server/META-INF/MANIFEST.MF
index e87e5edc..33594f65 100644
--- a/org.simantics.maps.server/META-INF/MANIFEST.MF
+++ b/org.simantics.maps.server/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Server
+Bundle-Name: Simantics Map Tile Server
 Bundle-SymbolicName: org.simantics.maps.server;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.district.maps.server.Activator
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.5",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="2.8.5",
  com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.8.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/zt-exec-1.9.jar,
@@ -24,3 +24,5 @@ Bundle-ClassPath: .,
 Export-Package: org.simantics.district.maps.server,
  org.simantics.district.maps.server.prefs
 Eclipse-BundleShape: dir
+Automatic-Module-Name: org.simantics.maps.server
+Bundle-Vendor: THTH ry
diff --git a/pom.xml b/pom.xml
index c6ac8ea2..a424183c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,9 +8,11 @@
 
 	<!-- common settings for all modules -->
 	<properties>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
 		<branch-spec>master</branch-spec>
 		<simantics-download-site>http://www.simantics.org/download</simantics-download-site>
-		<tycho-version>1.0.0</tycho-version>
+		<tycho-version>1.7.0</tycho-version>
 	</properties>
 
 	<repositories>