Issue 330: moved to clojure 1.2rc2

This commit is contained in:
Adrian Cole 2010-08-09 13:56:43 -07:00
parent 3289871c14
commit 5aeba30d5c
1 changed files with 55 additions and 30 deletions

View File

@ -75,10 +75,16 @@
<repository> <repository>
<id>repo2</id> <id>repo2</id>
<url>http://repo2.maven.org/maven2</url> <url>http://repo2.maven.org/maven2</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository> </repository>
<repository> <repository>
<id>jclouds-googlecode-deploy</id> <id>jclouds-googlecode-deploy</id>
<url>http://jclouds.googlecode.com/svn/repo</url> <url>http://jclouds.googlecode.com/svn/repo</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository> </repository>
<repository> <repository>
<id>jclouds-rimu-snapshots-nexus</id> <id>jclouds-rimu-snapshots-nexus</id>
@ -90,22 +96,37 @@
<repository> <repository>
<id>jboss</id> <id>jboss</id>
<url>http://repository.jboss.org/maven2/</url> <url>http://repository.jboss.org/maven2/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository> </repository>
<repository> <repository>
<id>googlecode.java-xmlbuilder</id> <id>googlecode.java-xmlbuilder</id>
<url>http://java-xmlbuilder.googlecode.com/svn/repo</url> <url>http://java-xmlbuilder.googlecode.com/svn/repo</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository> </repository>
<repository> <repository>
<id>clojure</id> <id>clojure</id>
<url>http://build.clojure.org/releases</url> <url>http://build.clojure.org/releases</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository> </repository>
<repository> <repository>
<id>clojars.org</id> <id>clojars.org</id>
<url>http://clojars.org/repo</url> <url>http://clojars.org/repo</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository> </repository>
<repository> <repository>
<id>sonatype-github-releases</id> <id>sonatype-github-releases</id>
<url>http://oss.sonatype.org/content/repositories/github-releases</url> <url>http://oss.sonatype.org/content/repositories/github-releases</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository> </repository>
</repositories> </repositories>
@ -285,34 +306,38 @@
</testResource> </testResource>
</testResources> </testResources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.theoryinpractise</groupId> <groupId>com.theoryinpractise</groupId>
<artifactId>clojure-maven-plugin</artifactId> <artifactId>clojure-maven-plugin</artifactId>
<!-- snapshot repo is blank, so reverted to 1.3.2 --> <version>1.3.3</version>
<version>1.3.2</version> <configuration>
<executions> <sourceDirectories>
<execution> <sourceDirectory>src/main/clojure</sourceDirectory>
<id>compile-clojure</id> </sourceDirectories>
<phase>compile</phase> <testSourceDirectories>
<goals> <testSourceDirectory>src/test/clojure</testSourceDirectory>
<goal>compile</goal> </testSourceDirectories>
</goals> <clojureOptions>-Xmx512m -Djava.awt.headless=true -XX:MaxPermSize=256m</clojureOptions>
</execution> <warnOnReflection>true</warnOnReflection>
<execution> <testDeclaredNamespaceOnly>false</testDeclaredNamespaceOnly>
<id>test-clojure</id> </configuration>
<phase>test</phase> <executions>
<goals> <execution>
<goal>test</goal> <id>compile-clojure</id>
</goals> <phase>compile</phase>
</execution> <goals>
</executions> <goal>compile</goal>
<configuration> </goals>
<!-- we want the AOT compile sanity check, but still only ship source --> </execution>
<outputDirectory>${project.build.directory}/clojure-classes</outputDirectory> <execution>
<clojureOptions>-Xms128m -Xmx512m</clojureOptions> <id>test-clojure</id>
<testDeclaredNamespaceOnly>false</testDeclaredNamespaceOnly> <phase>test</phase>
</configuration> <goals>
</plugin> <goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<executions> <executions>
@ -644,13 +669,13 @@ pageTracker._trackPageview();
<dependency> <dependency>
<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-RC2</version>
<optional>true</optional> <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-RC2</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>