Ian Maxon has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/3316
Change subject: [NO ISSUE][TEST] Allow asterix-dashboard skip ...................................................................... [NO ISSUE][TEST] Allow asterix-dashboard skip This allows the skip.npm property of the frontend-maven-plugin to work properly for the asterix-dashboard module, so it can be skipped for test runs that don't require it to be built outside of the java components it has. Change-Id: Ie089a8649376caf731f989da3db4e8443981ec63 --- M asterixdb/asterix-dashboard/pom.xml M asterixdb/pom.xml 2 files changed, 22 insertions(+), 7 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/16/3316/1 diff --git a/asterixdb/asterix-dashboard/pom.xml b/asterixdb/asterix-dashboard/pom.xml index acf7e13..11ab537 100644 --- a/asterixdb/asterix-dashboard/pom.xml +++ b/asterixdb/asterix-dashboard/pom.xml @@ -102,7 +102,7 @@ <executions> <execution> <id>copy-static</id> - <phase>process-classes</phase> + <phase>${resource.stage}</phase> <goals> <goal>copy-resources</goal> </goals> @@ -143,7 +143,7 @@ <artifactId>license-automation-plugin</artifactId> <executions> <execution> - <phase>compile</phase> + <phase>${license.stage}</phase> <goals> <goal>generate</goal> </goals> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 0e6e80d..580ac9e 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -73,6 +73,8 @@ <global.itest.excludes/> <itest.includes>${global.itest.includes}</itest.includes> <itest.excludes>${global.itest.excludes}</itest.excludes> + <license.stage>compile</license.stage> + <resource.stage>process-classes</resource.stage> <!-- Versions under dependencymanagement or used in many projects via properties --> <algebricks.version>0.3.5-SNAPSHOT</algebricks.version> @@ -436,8 +438,8 @@ </pluginExecution> <pluginExecution> <pluginExecutionFilter> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> + <groupId>com.helger.maven</groupId> + <artifactId>ph-javacc-maven-plugin</artifactId> <versionRange>[0.0,)</versionRange> <goals> <goal>jjdoc</goal> @@ -576,9 +578,9 @@ <version>2.2.3</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.6</version> + <groupId>com.helger.maven</groupId> + <artifactId>ph-javacc-maven-plugin</artifactId> + <version>4.1.2</version> </plugin> <plugin> <groupId>net.revelc.code.formatter</groupId> @@ -620,6 +622,19 @@ </properties> </profile> <profile> + <id>skip-dashboard</id> + <activation> + <property> + <name>skip.npm</name> + <value>true</value> + </property> + </activation> + <properties> + <license.stage>none</license.stage> + <resource.stage>none</resource.stage> + </properties> + </profile> + <profile> <id>invalid-tests</id> <properties> <invalid.tests /> -- To view, visit https://asterix-gerrit.ics.uci.edu/3316 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie089a8649376caf731f989da3db4e8443981ec63 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon <ima...@uci.edu>