Merge branch 'master' of github.com:jclouds/jclouds

This commit is contained in:
Ivan Meredith 2010-04-29 10:59:14 +12:00
commit eaef2cfa90
1 changed files with 23 additions and 4 deletions

View File

@ -193,6 +193,15 @@
</roles> </roles>
<timezone>-8</timezone> <timezone>-8</timezone>
</developer> </developer>
<developer>
<name>Chas Emerick</name>
<id>cemerick</id>
<email>cemerick -at- snowtide -dot- com</email>
<roles>
<role>Clojure Developer</role>
</roles>
<timezone>-5</timezone>
</developer>
</developers> </developers>
<properties> <properties>
@ -238,13 +247,13 @@
<groupId>org.clojure</groupId> <groupId>org.clojure</groupId>
<artifactId>clojure</artifactId> <artifactId>clojure</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
<scope>test</scope> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.clojure</groupId> <groupId>org.clojure</groupId>
<artifactId>clojure-contrib</artifactId> <artifactId>clojure-contrib</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
<scope>test</scope> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>swank-clojure</groupId> <groupId>swank-clojure</groupId>
@ -277,6 +286,13 @@
<artifactId>clojure-maven-plugin</artifactId> <artifactId>clojure-maven-plugin</artifactId>
<version>1.3.2</version> <version>1.3.2</version>
<executions> <executions>
<execution>
<id>compile-clojure</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution> <execution>
<id>test-clojure</id> <id>test-clojure</id>
<phase>test</phase> <phase>test</phase>
@ -286,9 +302,10 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<!-- we want the AOT compile sanity check, but still only ship source -->
<outputDirectory>${project.build.directory}/clojure-classes</outputDirectory>
<clojureOptions>-Xms128m -Xmx512m</clojureOptions> <clojureOptions>-Xms128m -Xmx512m</clojureOptions>
<compileDeclaredNamespaceOnly>true</compileDeclaredNamespaceOnly> <testDeclaredNamespaceOnly>false</testDeclaredNamespaceOnly>
<testDeclaredNamespaceOnly>true</testDeclaredNamespaceOnly>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -625,11 +642,13 @@ pageTracker._trackPageview();
<groupId>org.clojure</groupId> <groupId>org.clojure</groupId>
<artifactId>clojure</artifactId> <artifactId>clojure</artifactId>
<version>1.2.0-master-SNAPSHOT</version> <version>1.2.0-master-SNAPSHOT</version>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.clojure</groupId> <groupId>org.clojure</groupId>
<artifactId>clojure-contrib</artifactId> <artifactId>clojure-contrib</artifactId>
<version>1.2.0-SNAPSHOT</version> <version>1.2.0-SNAPSHOT</version>
<optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>