Update build configuration

- Remove CONTRIBUTING.MD (seems to be copied from a GLSP repo) - Refactor -p2 profile so that the plain p2 repository gets build as well. -p2-release can be used to b uild the composite update site for nightly releases - Introduce version property for modelserver dependencies - Use {project.version} over dedicated {target.version} property. - Update feature version range in tpd file
eclipse-emfcloud · Jun 15, 2021 · f2193a2 · f2193a2
1 parent ed53baa
commit f2193a2
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 100 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml b/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml
@@ -66,12 +66,12 @@
 				<dependency>
 					<groupId>org.eclipse.emfcloud.modelserver</groupId>
 					<artifactId>org.eclipse.emfcloud.modelserver.emf</artifactId>
-					<version>${target.version}</version>
+					<version>${modelserver.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.eclipse.emfcloud.modelserver.glsp</groupId>
 					<artifactId>org.eclipse.emfcloud.modelserver.glsp.notation.model</artifactId>
-					<version>${target.version}</version>
+					<version>${modelserver.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.eclipse.glsp</groupId>

diff --git 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 @@
 				<dependency>
 					<groupId>org.eclipse.emfcloud.modelserver</groupId>
 					<artifactId>org.eclipse.emfcloud.modelserver.emf</artifactId>
-					<version>${target.version}</version>
+					<version>${modelserver.version}</version>
 				</dependency>
 					<dependency>
 					<groupId>org.eclipse.emfcloud.modelserver</groupId>
 					<artifactId>org.eclipse.emfcloud.modelserver.client</artifactId>
-					<version>${target.version}</version>
+					<version>${modelserver.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.eclipse.glsp</groupId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 	<version>0.7.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>EMF.cloud Modelserver GLSP Integration Parent</name>
-
+	<description>EMF.cloud Modelserver GLSP Integration Parent pom</description>
 	<!-- Required metadata for deploying releases to mvn central -->
 
 	<url>https://www.eclipse.org/emfcloud/</url>
@@ -63,9 +63,7 @@
 		<java.source>11</java.source>
 		<java.target>11</java.target>
 
-		<!-- Target: version used to reference target platform from our releng 
-			bundle -->
-		<target.version>0.7.0-SNAPSHOT</target.version>
+
 
 		<!-- Deployment: used by the maven-deploy-plugin -->
 		<maven.deploy.skip>true</maven.deploy.skip>
@@ -80,7 +78,7 @@
 		<maven.clean.version>3.1.0</maven.clean.version>
 		<maven.checkstyle.version>3.1.1</maven.checkstyle.version>
 		<puppycrawl.checkstyle.version>8.39</puppycrawl.checkstyle.version>
-		<emfcloud.checkstyle.version>0.1.0-SNAPSHOT</emfcloud.checkstyle.version>
+		<emfcloud.checkstyle.version>0.1.0-RC1</emfcloud.checkstyle.version>
 
 		<maven.resources.version>3.2.0</maven.resources.version>
 		<maven.surefire.version>3.0.0-M5</maven.surefire.version>
@@ -98,6 +96,7 @@
 
 		<emf.edit.version>2.16.0</emf.edit.version>
 		<glsp.version>0.9.0-SNAPSHOT</glsp.version>
+		<modelserver.version>0.7.0-SNAPSHOT</modelserver.version>
 		<emf.transaction.version>1.4.0-v20100331-1738</emf.transaction.version>
 	</properties>
 
@@ -129,7 +128,9 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 
-
+			<modules>
+				<module>releng</module>
+			</modules>
 
 			<build>
 				<pluginManagement>
@@ -162,6 +163,16 @@
 							<artifactId>tycho-versions-plugin</artifactId>
 							<version>${tycho.version}</version>
 						</plugin>
+						<plugin>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-p2-repository-plugin</artifactId>
+							<version>${tycho.version}</version>
+						</plugin>
+						<plugin>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-p2-plugin</artifactId>
+							<version>${tycho.version}</version>
+						</plugin>
 					</plugins>
 				</pluginManagement>
 				<plugins>
@@ -199,6 +210,20 @@
 									<goal>plugin-source</goal>
 								</goals>
 							</execution>
+							<execution>
+								<id>feature-source</id>
+								<phase>package</phase>
+								<goals>
+									<goal>feature-source</goal>
+								</goals>
+								<configuration>
+									<excludes>
+										<plugin id="org.apache.batik.pdf" />
+										<plugin id="org.eclipse.wst.common.project.facet.core" />
+										<plugin id="org.eclipse.emfcloud.modelserver.lib" />
+									</excludes>
+								</configuration>
+							</execution>
 						</executions>
 					</plugin>
 					<plugin>
@@ -229,63 +254,11 @@
 									<groupId>org.eclipse.emfcloud.modelserver.glsp</groupId>
 									<artifactId>org.eclipse.emfcloud.modelserver.glsp.parent</artifactId>
 									<classifier>releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition</classifier>
-									<version>${target.version}</version>
+									<version>${project.version}</version>
 								</artifact>
 							</target>
 						</configuration>
 					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<!-- P2-Release Profile: Used to build and Eclipse update site. Should 
-			only be used in conjunction with the P2 Profile -->
-		<profile>
-			<id>p2-release</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<modules>
-				<module>releng</module>
-			</modules>
-
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>tycho-p2-repository-plugin</artifactId>
-							<version>${tycho.version}</version>
-						</plugin>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>tycho-p2-plugin</artifactId>
-							<version>${tycho.version}</version>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-source-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>feature-source</id>
-								<phase>package</phase>
-								<goals>
-									<goal>feature-source</goal>
-								</goals>
-								<configuration>
-									<excludes>
-										<plugin id="org.apache.batik.pdf" />
-										<plugin id="org.eclipse.wst.common.project.facet.core" />
-										<plugin id="org.eclipse.emfcloud.modelserver.lib" />
-									</excludes>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>tycho-p2-plugin</artifactId>

diff --git 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
@@ -19,13 +19,4 @@
 		<module>org.eclipse.emfcloud.modelserver.glsp.repository</module>
 	</modules>
 
-	<profiles>
-		<profile>
-			<id>p2-release</id>
-			<modules>
-				<module>org.eclipse.emfcloud.modelserver.glsp.repository</module>
-			</modules>
-		</profile>
-	</profiles>
-
 </project>