diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 762aeec..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributing to Eclipse GLSP
-
-Thank you for your interest in the GLSP project! The following is a set of guidelines for contributing to GLSP.
-
-## Code of Conduct
-
-This project is governed by the [Eclipse Community Code of Conduct](https://github.com/eclipse/.github/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.
-
-## Communication
-
-The following communication channels are available:
-
- * [GitHub issues](https://github.com/eclipse-glsp/glsp/issues) - for bug reports, feature requests, etc.
- * [Eclipse community forum](https://www.eclipse.org/forums/index.php/f/443/) - for questions
- * [Developer mailing list](https://accounts.eclipse.org/mailing-list/glsp-dev) - for organizational issues (e.g. elections of new committers)
-
-In case you have a question, please look into the [documentation in the Wiki](https://github.com/eclipse-glsp/glsp/wiki) first. If you don't find any answer there, feel free to use the chat, forum or issues to get help.
-
-Please create new issues only in the [GLSP umbrella project](https://github.com/eclipse-glsp/glsp), as we are tracking the issues for all components of GLSP there.
-
-## How to Contribute
-
-Before your pull request can be accepted, you must electronically sign the [Eclipse Contributor Agreement](https://www.eclipse.org/legal/ECA.php).
-
-Unless you are an [elected committer of the GLSP project](https://projects.eclipse.org/projects/ecd.glsp/who), you must include a `Signed-off-by` line in the commit message. This line can be generated with the [-s flag of git commit](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt--s). By doing this you confirm that your contribution conforms to the Eclipse Contributor Agreement.
-
-For more information, see the [Eclipse Foundation Project Handbook](https://www.eclipse.org/projects/handbook/#resources-commit).
diff --git a/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml b/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml
index 7d5f4f9..f6ccbc7 100644
--- a/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml
+++ b/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml
@@ -66,12 +66,12 @@
org.eclipse.emfcloud.modelserver
org.eclipse.emfcloud.modelserver.emf
- ${target.version}
+ ${modelserver.version}
org.eclipse.emfcloud.modelserver.glsp
org.eclipse.emfcloud.modelserver.glsp.notation.model
- ${target.version}
+ ${modelserver.version}
org.eclipse.glsp
diff --git a/plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model/pom.xml b/plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model/pom.xml
index f7e0b07..bcf4c1e 100644
--- a/plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model/pom.xml
+++ b/plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model/pom.xml
@@ -65,12 +65,12 @@
org.eclipse.emfcloud.modelserver
org.eclipse.emfcloud.modelserver.emf
- ${target.version}
+ ${modelserver.version}
org.eclipse.emfcloud.modelserver
org.eclipse.emfcloud.modelserver.client
- ${target.version}
+ ${modelserver.version}
org.eclipse.glsp
diff --git a/pom.xml b/pom.xml
index 2bd2d50..e170dec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
0.7.0-SNAPSHOT
pom
EMF.cloud Modelserver GLSP Integration Parent
-
+ EMF.cloud Modelserver GLSP Integration Parent pom
https://www.eclipse.org/emfcloud/
@@ -63,9 +63,7 @@
11
11
-
- 0.7.0-SNAPSHOT
+
true
@@ -80,7 +78,7 @@
3.1.0
3.1.1
8.39
- 0.1.0-SNAPSHOT
+ 0.1.0-RC1
3.2.0
3.0.0-M5
@@ -98,6 +96,7 @@
2.16.0
0.9.0-SNAPSHOT
+ 0.7.0-SNAPSHOT
1.4.0-v20100331-1738
@@ -129,7 +128,9 @@
true
-
+
+ releng
+
@@ -162,6 +163,16 @@
tycho-versions-plugin
${tycho.version}
+
+ org.eclipse.tycho
+ tycho-p2-repository-plugin
+ ${tycho.version}
+
+
+ org.eclipse.tycho
+ tycho-p2-plugin
+ ${tycho.version}
+
@@ -199,6 +210,20 @@
plugin-source
+
+ feature-source
+ package
+
+ feature-source
+
+
+
+
+
+
+
+
+
@@ -229,63 +254,11 @@
org.eclipse.emfcloud.modelserver.glsp
org.eclipse.emfcloud.modelserver.glsp.parent
releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition
- ${target.version}
+ ${project.version}
-
-
-
-
-
-
- p2-release
-
- false
-
-
-
- releng
-
-
-
-
-
-
- org.eclipse.tycho
- tycho-p2-repository-plugin
- ${tycho.version}
-
-
- org.eclipse.tycho
- tycho-p2-plugin
- ${tycho.version}
-
-
-
-
-
- org.eclipse.tycho
- tycho-source-plugin
-
-
- feature-source
- package
-
- feature-source
-
-
-
-
-
-
-
-
-
-
-
org.eclipse.tycho
tycho-p2-plugin
diff --git a/releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd b/releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd
index b558634..e865658 100644
--- a/releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd
+++ b/releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd
@@ -7,7 +7,7 @@ location "https://download.eclipse.org/glsp/server/p2/nightly/0.9/0.9.0.20210421
}
location "https://download.eclipse.org/emfcloud/modelserver/p2/nightly/0.7/0.7.0.202105141035/" {
- org.eclipse.emfcloud.modelserver.feature.feature.group [0.7.0,0.8.0)
+ org.eclipse.emfcloud.modelserver.feature.feature.group [0.7.0,1.0.0)
}
location "http://download.eclipse.org/releases/2020-09" {
diff --git a/releng/pom.xml b/releng/pom.xml
index 4a41c81..e87f921 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -19,13 +19,4 @@
org.eclipse.emfcloud.modelserver.glsp.repository
-
-
- p2-release
-
- org.eclipse.emfcloud.modelserver.glsp.repository
-
-
-
-