Merge remote-tracking branch 'origin/releases/7.0.x' into releases/7.1.x
Change-Id: I910833d626c3d84c19c18396b7802e5956ac4f21
diff --git a/org.eclipse.scout.sdk-feature/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk-feature/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk-feature/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk-feature/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk-repository/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk-repository/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk-repository/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk-repository/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk-settings/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk-settings/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk-settings/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk-settings/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk-target/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk-target/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk-target/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk-target/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.core.s.test/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.core.s.test/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.core.s.test/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.core.s.test/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.core.s/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.core.s/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.core.s/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.core.s/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.core.test/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.core.test/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.core.test/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.core.test/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.core/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.core/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.core/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.core/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.p2/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.p2/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.p2/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.p2/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.s2e.doc/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.s2e.doc/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.s2e.doc/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.s2e.doc/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.s2e.nls/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.s2e.nls/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.s2e.nls/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.s2e.nls/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.s2e.releng/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.s2e.releng/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.s2e.releng/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.s2e.releng/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.s2e.test/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.s2e.test/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.s2e.test/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.s2e.test/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.s2e.ui/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.s2e.ui/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.s2e.ui/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.s2e.ui/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk.s2e/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk.s2e/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk.s2e/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk.s2e/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/org.eclipse.scout.sdk/.settings/org.sonarlint.eclipse.core.prefs b/org.eclipse.scout.sdk/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/org.eclipse.scout.sdk/.settings/org.sonarlint.eclipse.core.prefs
+++ b/org.eclipse.scout.sdk/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/scout-helloworld-app/.settings/org.sonarlint.eclipse.core.prefs b/scout-helloworld-app/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/scout-helloworld-app/.settings/org.sonarlint.eclipse.core.prefs
+++ b/scout-helloworld-app/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/scout-jaxws-module/.settings/org.sonarlint.eclipse.core.prefs b/scout-jaxws-module/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/scout-jaxws-module/.settings/org.sonarlint.eclipse.core.prefs
+++ b/scout-jaxws-module/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
diff --git a/updatesite-maven-plugin/.settings/org.sonarlint.eclipse.core.prefs b/updatesite-maven-plugin/.settings/org.sonarlint.eclipse.core.prefs
index 12bb62a..ee3b306 100644
--- a/updatesite-maven-plugin/.settings/org.sonarlint.eclipse.core.prefs
+++ b/updatesite-maven-plugin/.settings/org.sonarlint.eclipse.core.prefs
@@ -2,4 +2,5 @@
eclipse.preferences.version=1
extraProperties=
moduleKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.1.x
+projectKey=org.eclipse.scout.sdk\:org.eclipse.scout.sdk\:releases_7.0.x
serverId=Scout
