Skip to content

Commit cc2a363

Browse files
tortmayrtortmayr
committed
Update build config (#114)
- Configure tycho versions plugin and use ${project.version} instead of dedicated property for the targetplatform version. - Create a dedicated profile that contains all non-plugin submodules. This profile is active by default and can be deactivated by passing -DpluginsOnly - Update Jenkinsfile -- use shorthand-notation for maven batchmode (-B) -- Fix formatting issues
1 parent 7d7368f commit cc2a363

10 files changed

Lines changed: 64 additions & 72 deletions

File tree

  • Jenkinsfile
  • bundles
    • org.eclipse.emfcloud.modelserver.client
    • org.eclipse.emfcloud.modelserver.edit
    • org.eclipse.emfcloud.modelserver.emf
  • examples/org.eclipse.emfcloud.modelserver.example
  • pom.xml
  • tests
    • org.eclipse.emfcloud.modelserver.client.tests
    • org.eclipse.emfcloud.modelserver.common.tests
    • org.eclipse.emfcloud.modelserver.edit.tests
    • org.eclipse.emfcloud.modelserver.emf.tests

‎Jenkinsfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,23 @@ pipeline {
1010
stage ('Build: Plain Maven (M2)') {
1111
steps {
1212
// ignore test failures since we parse the test results afterwards
13-
sh 'mvn clean verify -Pm2 --batch-mode package -Dmaven.test.failure.ignore=true'
13+
sh 'mvn clean verify -Pm2 -B -Dmaven.test.failure.ignore=true'
1414
}
1515
}
1616

1717
stage ('Build: Eclipse-based (P2)') {
1818
steps {
1919
// ignore test failures since we parse the test results afterwards
20-
sh 'mvn clean verify -Pp2 --batch-mode package -Dmaven.test.failure.ignore=true'
20+
sh 'mvn clean verify -Pp2 -B -Dmaven.test.failure.ignore=true'
2121
}
2222
}
2323

2424
stage ('Generate: Reports') {
2525
steps {
2626
junit '**/surefire-reports/*.xml'
27-
recordIssues failOnError: true, qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]], tools: [checkStyle(pattern: '**/target/checkstyle-result.xml', reportEncoding: 'UTF-8')] }
27+
recordIssues failOnError: true, qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
28+
tools: [checkStyle(pattern: '**/target/checkstyle-result.xml', reportEncoding: 'UTF-8')]
29+
}
2830
}
2931

3032
stage('Deploy') {

‎bundles/org.eclipse.emfcloud.modelserver.client/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@
1515
<dependency>
1616
<groupId>org.eclipse.emfcloud.modelserver</groupId>
1717
<artifactId>org.eclipse.emfcloud.modelserver.common</artifactId>
18-
<version>${target.version}</version>
18+
<version>${project.version}</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2222
<artifactId>org.eclipse.emfcloud.modelserver.lib</artifactId>
23-
<version>${target.version}</version>
23+
<version>${project.version}</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2727
<artifactId>org.eclipse.emfcloud.modelserver.edit</artifactId>
28-
<version>${target.version}</version>
28+
<version>${project.version}</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.eclipse.emfcloud.modelserver</groupId>
3232
<artifactId>org.eclipse.emfcloud.modelserver.coffee.model</artifactId>
33-
<version>${target.version}</version>
33+
<version>${project.version}</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.eclipse.emfcloud.modelserver</groupId>
3737
<artifactId>org.eclipse.emfcloud.modelserver.emf</artifactId>
38-
<version>${target.version}</version>
38+
<version>${project.version}</version>
3939
</dependency>
4040
</dependencies>
4141
</project>

‎bundles/org.eclipse.emfcloud.modelserver.edit/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
<dependency>
1919
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2020
<artifactId>org.eclipse.emfcloud.modelserver.common</artifactId>
21-
<version>${target.version}</version>
21+
<version>${project.version}</version>
2222
</dependency>
2323
<dependency>
2424
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2525
<artifactId>org.eclipse.emfcloud.modelserver.coffee.model</artifactId>
26-
<version>${target.version}</version>
26+
<version>${project.version}</version>
2727
</dependency>
2828
</dependencies>
2929

‎bundles/org.eclipse.emfcloud.modelserver.emf/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
<dependency>
1919
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2020
<artifactId>org.eclipse.emfcloud.modelserver.common</artifactId>
21-
<version>${target.version}</version>
21+
<version>${project.version}</version>
2222
</dependency>
2323
<dependency>
2424
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2525
<artifactId>org.eclipse.emfcloud.modelserver.lib</artifactId>
26-
<version>${target.version}</version>
26+
<version>${project.version}</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.eclipse.emfcloud.modelserver</groupId>
3030
<artifactId>org.eclipse.emfcloud.modelserver.edit</artifactId>
31-
<version>${target.version}</version>
31+
<version>${project.version}</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>org.eclipse.emfcloud.modelserver</groupId>
3535
<artifactId>org.eclipse.emfcloud.modelserver.coffee.model</artifactId>
36-
<version>${target.version}</version>
36+
<version>${project.version}</version>
3737
</dependency>
3838
</dependencies>
3939
</project>

‎examples/org.eclipse.emfcloud.modelserver.example/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
<dependency>
1919
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2020
<artifactId>org.eclipse.emfcloud.modelserver.emf</artifactId>
21-
<version>${target.version}</version>
21+
<version>${project.version}</version>
2222
<scope>provided</scope>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2626
<artifactId>org.eclipse.emfcloud.modelserver.coffee.model</artifactId>
27-
<version>${target.version}</version>
27+
<version>${project.version}</version>
2828
<scope>provided</scope>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.eclipse.emfcloud.modelserver</groupId>
3232
<artifactId>org.eclipse.emfcloud.modelserver.client</artifactId>
33-
<version>${target.version}</version>
33+
<version>${project.version}</version>
3434
<scope>provided</scope>
3535
</dependency>
3636
<dependency>

‎pom.xml‎

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<artifactId>org.eclipse.emfcloud.modelserver.parent</artifactId>
77
<description>parent for all modelserver modules</description>
88
<version>0.7.0-SNAPSHOT</version>
9+
<name>EMF.cloud Modelserver Parent</name>
910
<packaging>pom</packaging>
1011

1112
<!-- Required metadata for deploying releases to mvn central -->
@@ -63,9 +64,6 @@
6364

6465
<modules>
6566
<module>bundles</module>
66-
<module>examples</module>
67-
<module>releng</module>
68-
<module>tests</module>
6967
</modules>
7068

7169
<!-- Properties -->
@@ -81,10 +79,6 @@
8179
<!-- Deployment: used by the maven-deploy-plugin -->
8280
<maven.deploy.skip>true</maven.deploy.skip>
8381

84-
<!-- Target: version used to reference target platform from our releng
85-
bundle -->
86-
<target.version>0.7.0-SNAPSHOT</target.version>
87-
8882
<!-- Package Type: type of bundles to create (can be re-defined by profiles) -->
8983
<package.type>eclipse-plugin</package.type>
9084
<package.type.test>eclipse-test-plugin</package.type.test>
@@ -205,14 +199,15 @@
205199
<profile>
206200
<id>p2</id>
207201
<activation>
208-
<activeByDefault>true</activeByDefault>
202+
<property>
203+
<name>!noP2</name> <!-- deactivated if system property noP2 is set, otherwise activated -->
204+
</property>
209205
</activation>
210206

211207
<modules>
212208
<module>features</module>
213209
</modules>
214210

215-
216211
<build>
217212
<pluginManagement>
218213
<plugins>
@@ -239,6 +234,11 @@
239234
<artifactId>target-platform-configuration</artifactId>
240235
<version>${tycho.version}</version>
241236
</plugin>
237+
<plugin>
238+
<groupId>org.eclipse.tycho</groupId>
239+
<artifactId>tycho-versions-plugin</artifactId>
240+
<version>${tycho.version}</version>
241+
</plugin>
242242
</plugins>
243243
</pluginManagement>
244244
<plugins>
@@ -274,6 +274,11 @@
274274
</execution>
275275
</executions>
276276
</plugin>
277+
<plugin>
278+
<groupId>org.eclipse.tycho</groupId>
279+
<artifactId>tycho-versions-plugin</artifactId>
280+
<version>${tycho.version}</version>
281+
</plugin>
277282
<plugin>
278283
<groupId>org.eclipse.tycho</groupId>
279284
<artifactId>target-platform-configuration</artifactId>
@@ -302,7 +307,7 @@
302307
<groupId>org.eclipse.emfcloud.modelserver</groupId>
303308
<artifactId>org.eclipse.emfcloud.modelserver.parent</artifactId>
304309
<classifier>releng/org.eclipse.emfcloud.modelserver.releng.target/r2020-09</classifier>
305-
<version>${target.version}</version>
310+
<version>${project.version}</version>
306311
</artifact>
307312
</target>
308313
</configuration>
@@ -389,6 +394,7 @@
389394
<properties>
390395
<package.type>jar</package.type>
391396
<package.type.test>jar</package.type.test>
397+
<noP2>true</noP2>
392398
</properties>
393399

394400
<repositories>
@@ -516,6 +522,10 @@
516522
</snapshotRepository>
517523
</distributionManagement>
518524

525+
<properties>
526+
<pluginsOnly>true</pluginsOnly>
527+
</properties>
528+
519529
<build>
520530
<plugins>
521531
<!-- To release to Sonatype/Maven central -->
@@ -530,42 +540,6 @@
530540
<autoreleaseafterclose>false</autoreleaseafterclose>
531541
</configuration>
532542
</plugin>
533-
<!-- To generate javadoc -->
534-
535-
<!-- Deactivate for now. Not needed for snapshot deployments -->
536-
<!-- <plugin> -->
537-
<!-- <groupId>org.apache.maven.plugins</groupId> -->
538-
<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
539-
<!-- <version>3.1.0</version> -->
540-
<!-- <executions> -->
541-
<!-- <execution> -->
542-
<!-- <id>attach-javadocs</id> -->
543-
<!-- <goals> -->
544-
<!-- <goal>jar</goal> -->
545-
<!-- </goals> -->
546-
<!-- <configuration> -->
547-
<!-- <additionalJOption>-Xdoclint:none</additionalJOption> -->
548-
<!-- <tags> -->
549-
<!-- <tag> -->
550-
<!-- <name>generated</name> -->
551-
<!-- <placement>a</placement> -->
552-
<!-- <head></head> -->
553-
<!-- </tag> -->
554-
<!-- <tag> -->
555-
<!-- <name>ordered</name> -->
556-
<!-- <placement>a</placement> -->
557-
<!-- <head></head> -->
558-
<!-- </tag> -->
559-
<!-- <tag> -->
560-
<!-- <name>model</name> -->
561-
<!-- <placement>a</placement> -->
562-
<!-- <head>Model:</head> -->
563-
<!-- </tag> -->
564-
<!-- </tags> -->
565-
<!-- </configuration> -->
566-
<!-- </execution> -->
567-
<!-- </executions> -->
568-
<!-- </plugin> -->
569543

570544
<!-- To sign the artifacts -->
571545
<plugin>
@@ -591,5 +565,21 @@
591565
</plugins>
592566
</build>
593567
</profile>
568+
569+
<!--In certain corner cases we only want to use the core modules/plugins e.g. when deploying to maven central.
570+
This profile is active by default and can be deactivated by passing the -DpluginsOnly-->
571+
<profile>
572+
<id>non-plugin-modules</id>
573+
<activation>
574+
<property>
575+
<name>!pluginsOnly</name>
576+
</property>
577+
</activation>
578+
<modules>
579+
<module>examples</module>
580+
<module>releng</module>
581+
<module>tests</module>
582+
</modules>
583+
</profile>
594584
</profiles>
595585
</project>

‎tests/org.eclipse.emfcloud.modelserver.client.tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<dependency>
2222
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2323
<artifactId>org.eclipse.emfcloud.modelserver.tests</artifactId>
24-
<version>${target.version}</version>
24+
<version>${project.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2828
<artifactId>org.eclipse.emfcloud.modelserver.client</artifactId>
29-
<version>${target.version}</version>
29+
<version>${project.version}</version>
3030
</dependency>
3131
</dependencies>
3232
</profile>

‎tests/org.eclipse.emfcloud.modelserver.common.tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<dependency>
2222
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2323
<artifactId>org.eclipse.emfcloud.modelserver.tests</artifactId>
24-
<version>${target.version}</version>
24+
<version>${project.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2828
<artifactId>org.eclipse.emfcloud.modelserver.common</artifactId>
29-
<version>${target.version}</version>
29+
<version>${project.version}</version>
3030
</dependency>
3131
</dependencies>
3232
</profile>

‎tests/org.eclipse.emfcloud.modelserver.edit.tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<dependency>
2222
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2323
<artifactId>org.eclipse.emfcloud.modelserver.tests</artifactId>
24-
<version>${target.version}</version>
24+
<version>${project.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2828
<artifactId>org.eclipse.emfcloud.modelserver.client</artifactId>
29-
<version>${target.version}</version>
29+
<version>${project.version}</version>
3030
</dependency>
3131
</dependencies>
3232
</profile>

‎tests/org.eclipse.emfcloud.modelserver.emf.tests/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
<dependency>
2323
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2424
<artifactId>org.eclipse.emfcloud.modelserver.tests</artifactId>
25-
<version>${target.version}</version>
25+
<version>${project.version}</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.eclipse.emfcloud.modelserver</groupId>
2929
<artifactId>org.eclipse.emfcloud.modelserver.edit</artifactId>
30-
<version>${target.version}</version>
30+
<version>${project.version}</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.eclipse.emfcloud.modelserver</groupId>
3434
<artifactId>org.eclipse.emfcloud.modelserver.client</artifactId>
35-
<version>${target.version}</version>
35+
<version>${project.version}</version>
3636
</dependency>
3737
</dependencies>
3838
<build>

0 commit comments

Comments
 (0)