Skip to content

Commit ed53baa

Browse files
committed
Fix modules definition for p2 build (#4)
1 parent 78a83b7 commit ed53baa

2 files changed

Lines changed: 25 additions & 6 deletions

File tree

pom.xml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<artifactId>org.eclipse.emfcloud.modelserver.glsp.parent</artifactId>
99
<version>0.7.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
11+
<name>EMF.cloud Modelserver GLSP Integration Parent</name>
1112

1213
<!-- Required metadata for deploying releases to mvn central -->
1314

@@ -100,7 +101,10 @@
100101
<emf.transaction.version>1.4.0-v20100331-1738</emf.transaction.version>
101102
</properties>
102103

103-
104+
<modules>
105+
<module>plugins/org.eclipse.emfcloud.modelserver.glsp.integration</module>
106+
<module>plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model</module>
107+
</modules>
104108

105109
<build>
106110
<sourceDirectory>src</sourceDirectory>
@@ -125,10 +129,7 @@
125129
<activeByDefault>true</activeByDefault>
126130
</activation>
127131

128-
<modules>
129-
<module>plugins/org.eclipse.emfcloud.modelserver.glsp.integration</module>
130-
<module>plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model</module>
131-
</modules>
132+
132133

133134
<build>
134135
<pluginManagement>
@@ -156,6 +157,11 @@
156157
<artifactId>target-platform-configuration</artifactId>
157158
<version>${tycho.version}</version>
158159
</plugin>
160+
<plugin>
161+
<groupId>org.eclipse.tycho</groupId>
162+
<artifactId>tycho-versions-plugin</artifactId>
163+
<version>${tycho.version}</version>
164+
</plugin>
159165
</plugins>
160166
</pluginManagement>
161167
<plugins>
@@ -178,6 +184,10 @@
178184
<showWarnings>true</showWarnings>
179185
</configuration>
180186
</plugin>
187+
<plugin>
188+
<groupId>org.eclipse.tycho</groupId>
189+
<artifactId>tycho-versions-plugin</artifactId>
190+
</plugin>
181191
<plugin>
182192
<!-- enable source bundle generation -->
183193
<groupId>org.eclipse.tycho</groupId>
@@ -235,7 +245,11 @@
235245
<activation>
236246
<activeByDefault>false</activeByDefault>
237247
</activation>
238-
248+
249+
<modules>
250+
<module>releng</module>
251+
</modules>
252+
239253
<build>
240254
<pluginManagement>
241255
<plugins>

releng/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

17+
<modules>
18+
<module>org.eclipse.emfcloud.modelserver.glsp.feature</module>
19+
<module>org.eclipse.emfcloud.modelserver.glsp.repository</module>
20+
</modules>
21+
1722
<profiles>
1823
<profile>
1924
<id>p2-release</id>

0 commit comments

Comments
 (0)