diff options
| author | Denis Anisimov <denis@vaadin.com> | 2016-10-07 12:54:31 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-10-07 13:18:13 +0000 |
| commit | 8d825141f239a6f39a6d4ebd3b48ced7e97fc61b (patch) | |
| tree | 567a31252fd88422f7854c0d8477a63d1700afc6 | |
| parent | bc31da89c262caff9933abc94ef8af80b17329f8 (diff) | |
| download | vaadin-framework-8d825141f239a6f39a6d4ebd3b48ced7e97fc61b.tar.gz vaadin-framework-8d825141f239a6f39a6d4ebd3b48ced7e97fc61b.zip | |
Change japicmp profile activation to avoid run it for all modules.
Change-Id: Id25311621de43d247b21359a1069e694562a2762
| -rw-r--r-- | all/pom.xml | 17 | ||||
| -rw-r--r-- | pom.xml | 78 |
2 files changed, 53 insertions, 42 deletions
diff --git a/all/pom.xml b/all/pom.xml index e4658dffd1..1630241db7 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -338,22 +338,5 @@ </pluginManagement> </build> </profile> - <profile> - <id>apicmp</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>com.github.siom79.japicmp</groupId> - <artifactId>japicmp-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> @@ -47,7 +47,6 @@ <jetty.version>9.3.7.v20160115</jetty.version> <phantomjs.version>2.1.1</phantomjs.version> - <skipApiDiff></skipApiDiff> </properties> <!-- TODO: remove this after maven plugin has been released --> @@ -87,28 +86,6 @@ </scm> - <modules> - <module>buildhelpers</module> - <module>shared</module> - <module>push</module> - <module>server</module> - <module>client</module> - <module>client-compiler</module> - <module>client-compiled</module> - <module>themes</module> - <module>widgets</module> - <module>uitest-common</module> - <module>uitest</module> - <module>liferay</module> - <module>all</module> - <module>compatibility-server</module> - <module>compatibility-client</module> - <module>compatibility-client-compiled</module> - <module>compatibility-shared</module> - <!-- Nexus staging bug needs the last module to be deployed. --> - <module>bom</module> - </modules> - <dependencyManagement> <dependencies> <dependency> @@ -549,6 +526,38 @@ <profiles> <profile> + <!-- Profile is triggered unless apiDiff property is defined: + always except "apicmp" profile which is disjoint with this profile + !--> + <id>default</id> + <activation> + <property> + <name>!apiDiff</name> + </property> + </activation> + <modules> + <module>buildhelpers</module> + <module>shared</module> + <module>push</module> + <module>server</module> + <module>client</module> + <module>client-compiler</module> + <module>client-compiled</module> + <module>themes</module> + <module>widgets</module> + <module>uitest-common</module> + <module>uitest</module> + <module>liferay</module> + <module>all</module> + <module>compatibility-server</module> + <module>compatibility-client</module> + <module>compatibility-client-compiled</module> + <module>compatibility-shared</module> + <!-- Nexus staging bug needs the last module to be deployed. --> + <module>bom</module> + </modules> + </profile> + <profile> <id>slowtest</id> <modules> <module>test</module> @@ -607,10 +616,28 @@ </build> </profile> <profile> + <!-- Profile is triggered if apiDiff property is defined: + this profile is disjoint with default profile. + It allows to prevent running build for all available modules + but restricts a number of modules to specified here only + (which allows to avoid long time compilation for projects + that are not needed since japicmp works with compiled classes). + !--> <id>apicmp</id> <activation> - <activeByDefault>false</activeByDefault> + <property> + <name>apiDiff</name> + </property> </activation> + <modules> + <module>server</module> + <module>client</module> + <module>compatibility-server</module> + <module>compatibility-client</module> + <module>client-compiler</module> + <module>shared</module> + <module>compatibility-shared</module> + </modules> <build> <plugins> <plugin> @@ -649,8 +676,9 @@ </executions> </plugin> </plugins> - </build> + </build> </profile> </profiles> </project> + |