You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/03/04 13:50:43 UTC
[1/2] brooklyn-ui git commit: restore latest jasmine version
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 6ed340f86 -> 4ac635ad1
restore latest jasmine version
now that maven 3.2.1 is being used to build. note that maven 3.1 is now required.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/9ded6c66
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/9ded6c66
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/9ded6c66
Branch: refs/heads/master
Commit: 9ded6c66892f269331dff9873e403efaa5d103b8
Parents: 6ed340f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Mar 4 12:46:30 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Mar 4 12:46:30 2016 +0000
----------------------------------------------------------------------
pom.xml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/9ded6c66/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d91bb2b..53c88e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
${project.build.directory}/${project.build.finalName}
</project.build.webapp>
<nodejs.path>${project.basedir}/target/nodejs/node</nodejs.path>
- <jasmine-maven-plugin.version>1.3.1.6</jasmine-maven-plugin.version>
+ <jasmine-maven-plugin.version>2.1</jasmine-maven-plugin.version>
<phantomjs.version>2.1.1</phantomjs.version>
<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
<nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
@@ -113,6 +113,16 @@
</execution>
</executions>
<configuration>
+ <!--Version of phantomjs needs to be specified for linux-->
+ <phantomjs>
+ <version>${phantomjs.version}</version>
+ <checkSystemPath>true</checkSystemPath>
+ <enforceVersion>true</enforceVersion>
+ <source>REPOSITORY</source>
+ <baseUrl/>
+ <outputDirectory>target/phantomjs</outputDirectory>
+ </phantomjs>
+
<!--Uses the require.js test spec-->
<specRunnerTemplate>REQUIRE_JS</specRunnerTemplate>
<preloadSources>
[2/2] brooklyn-ui git commit: print nice message if maven < 3.1 is
used
Posted by he...@apache.org.
print nice message if maven < 3.1 is used
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/4ac635ad
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/4ac635ad
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/4ac635ad
Branch: refs/heads/master
Commit: 4ac635ad13576099cc7bbc16dce9082aaf2a77fc
Parents: 9ded6c6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Mar 4 12:50:26 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Mar 4 12:50:26 2016 +0000
----------------------------------------------------------------------
pom.xml | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/4ac635ad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 53c88e3..e06ed4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,27 @@
</testResource>
</testResources>
<plugins>
+ <!-- require maven 3.1. jasmine will fail with cryptic error otherwise,
+ so let's make it print a nicer message if running with the wrong maven. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.1</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!--
run js tests with: $ mvn clean process-test-resources jasmine:test
run tests in the browser with: $ mvn jasmine:bdd