Skip to content

Commit f2193a2

Browse files
tortmayrtortmayr
committed
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
1 parent ed53baa commit f2193a2

6 files changed

Lines changed: 37 additions & 100 deletions

File tree

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@
6666
<dependency>
6767
<groupId>org.eclipse.emfcloud.modelserver</groupId>
6868
<artifactId>org.eclipse.emfcloud.modelserver.emf</artifactId>
69-
<version>${target.version}</version>
69+
<version>${modelserver.version}</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>org.eclipse.emfcloud.modelserver.glsp</groupId>
7373
<artifactId>org.eclipse.emfcloud.modelserver.glsp.notation.model</artifactId>
74-
<version>${target.version}</version>
74+
<version>${modelserver.version}</version>
7575
</dependency>
7676
<dependency>
7777
<groupId>org.eclipse.glsp</groupId>

‎plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565
<dependency>
6666
<groupId>org.eclipse.emfcloud.modelserver</groupId>
6767
<artifactId>org.eclipse.emfcloud.modelserver.emf</artifactId>
68-
<version>${target.version}</version>
68+
<version>${modelserver.version}</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.eclipse.emfcloud.modelserver</groupId>
7272
<artifactId>org.eclipse.emfcloud.modelserver.client</artifactId>
73-
<version>${target.version}</version>
73+
<version>${modelserver.version}</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>org.eclipse.glsp</groupId>

‎pom.xml‎

Lines changed: 32 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>0.7.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111
<name>EMF.cloud Modelserver GLSP Integration Parent</name>
12-
12+
<description>EMF.cloud Modelserver GLSP Integration Parent pom</description>
1313
<!-- Required metadata for deploying releases to mvn central -->
1414

1515
<url>https://www.eclipse.org/emfcloud/</url>
@@ -63,9 +63,7 @@
6363
<java.source>11</java.source>
6464
<java.target>11</java.target>
6565

66-
<!-- Target: version used to reference target platform from our releng
67-
bundle -->
68-
<target.version>0.7.0-SNAPSHOT</target.version>
66+
6967

7068
<!-- Deployment: used by the maven-deploy-plugin -->
7169
<maven.deploy.skip>true</maven.deploy.skip>
@@ -80,7 +78,7 @@
8078
<maven.clean.version>3.1.0</maven.clean.version>
8179
<maven.checkstyle.version>3.1.1</maven.checkstyle.version>
8280
<puppycrawl.checkstyle.version>8.39</puppycrawl.checkstyle.version>
83-
<emfcloud.checkstyle.version>0.1.0-SNAPSHOT</emfcloud.checkstyle.version>
81+
<emfcloud.checkstyle.version>0.1.0-RC1</emfcloud.checkstyle.version>
8482

8583
<maven.resources.version>3.2.0</maven.resources.version>
8684
<maven.surefire.version>3.0.0-M5</maven.surefire.version>
@@ -98,6 +96,7 @@
9896

9997
<emf.edit.version>2.16.0</emf.edit.version>
10098
<glsp.version>0.9.0-SNAPSHOT</glsp.version>
99+
<modelserver.version>0.7.0-SNAPSHOT</modelserver.version>
101100
<emf.transaction.version>1.4.0-v20100331-1738</emf.transaction.version>
102101
</properties>
103102

@@ -129,7 +128,9 @@
129128
<activeByDefault>true</activeByDefault>
130129
</activation>
131130

132-
131+
<modules>
132+
<module>releng</module>
133+
</modules>
133134

134135
<build>
135136
<pluginManagement>
@@ -162,6 +163,16 @@
162163
<artifactId>tycho-versions-plugin</artifactId>
163164
<version>${tycho.version}</version>
164165
</plugin>
166+
<plugin>
167+
<groupId>org.eclipse.tycho</groupId>
168+
<artifactId>tycho-p2-repository-plugin</artifactId>
169+
<version>${tycho.version}</version>
170+
</plugin>
171+
<plugin>
172+
<groupId>org.eclipse.tycho</groupId>
173+
<artifactId>tycho-p2-plugin</artifactId>
174+
<version>${tycho.version}</version>
175+
</plugin>
165176
</plugins>
166177
</pluginManagement>
167178
<plugins>
@@ -199,6 +210,20 @@
199210
<goal>plugin-source</goal>
200211
</goals>
201212
</execution>
213+
<execution>
214+
<id>feature-source</id>
215+
<phase>package</phase>
216+
<goals>
217+
<goal>feature-source</goal>
218+
</goals>
219+
<configuration>
220+
<excludes>
221+
<plugin id="org.apache.batik.pdf" />
222+
<plugin id="org.eclipse.wst.common.project.facet.core" />
223+
<plugin id="org.eclipse.emfcloud.modelserver.lib" />
224+
</excludes>
225+
</configuration>
226+
</execution>
202227
</executions>
203228
</plugin>
204229
<plugin>
@@ -229,63 +254,11 @@
229254
<groupId>org.eclipse.emfcloud.modelserver.glsp</groupId>
230255
<artifactId>org.eclipse.emfcloud.modelserver.glsp.parent</artifactId>
231256
<classifier>releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition</classifier>
232-
<version>${target.version}</version>
257+
<version>${project.version}</version>
233258
</artifact>
234259
</target>
235260
</configuration>
236261
</plugin>
237-
</plugins>
238-
</build>
239-
</profile>
240-
241-
<!-- P2-Release Profile: Used to build and Eclipse update site. Should
242-
only be used in conjunction with the P2 Profile -->
243-
<profile>
244-
<id>p2-release</id>
245-
<activation>
246-
<activeByDefault>false</activeByDefault>
247-
</activation>
248-
249-
<modules>
250-
<module>releng</module>
251-
</modules>
252-
253-
<build>
254-
<pluginManagement>
255-
<plugins>
256-
<plugin>
257-
<groupId>org.eclipse.tycho</groupId>
258-
<artifactId>tycho-p2-repository-plugin</artifactId>
259-
<version>${tycho.version}</version>
260-
</plugin>
261-
<plugin>
262-
<groupId>org.eclipse.tycho</groupId>
263-
<artifactId>tycho-p2-plugin</artifactId>
264-
<version>${tycho.version}</version>
265-
</plugin>
266-
</plugins>
267-
</pluginManagement>
268-
<plugins>
269-
<plugin>
270-
<groupId>org.eclipse.tycho</groupId>
271-
<artifactId>tycho-source-plugin</artifactId>
272-
<executions>
273-
<execution>
274-
<id>feature-source</id>
275-
<phase>package</phase>
276-
<goals>
277-
<goal>feature-source</goal>
278-
</goals>
279-
<configuration>
280-
<excludes>
281-
<plugin id="org.apache.batik.pdf" />
282-
<plugin id="org.eclipse.wst.common.project.facet.core" />
283-
<plugin id="org.eclipse.emfcloud.modelserver.lib" />
284-
</excludes>
285-
</configuration>
286-
</execution>
287-
</executions>
288-
</plugin>
289262
<plugin>
290263
<groupId>org.eclipse.tycho</groupId>
291264
<artifactId>tycho-p2-plugin</artifactId>

‎releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ location "https://download.eclipse.org/glsp/server/p2/nightly/0.9/0.9.0.20210421
77
}
88

99
location "https://download.eclipse.org/emfcloud/modelserver/p2/nightly/0.7/0.7.0.202105141035/" {
10-
org.eclipse.emfcloud.modelserver.feature.feature.group [0.7.0,0.8.0)
10+
org.eclipse.emfcloud.modelserver.feature.feature.group [0.7.0,1.0.0)
1111
}
1212

1313
location "http://download.eclipse.org/releases/2020-09" {

‎releng/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,4 @@
1919
<module>org.eclipse.emfcloud.modelserver.glsp.repository</module>
2020
</modules>
2121

22-
<profiles>
23-
<profile>
24-
<id>p2-release</id>
25-
<modules>
26-
<module>org.eclipse.emfcloud.modelserver.glsp.repository</module>
27-
</modules>
28-
</profile>
29-
</profiles>
30-
3122
</project>

0 commit comments

Comments
 (0)