Skip to content
Browse files

Merge commit 'alexott/master'

  • Loading branch information...
2 parents 706377b + 1718511 commit d17c289da5e7ce62c9057e1343aa1ab5bf8aa818 @liebke liebke committed Dec 18, 2009
Showing with 56 additions and 36 deletions.
  1. +49 −29 pom.xml
  2. +7 −7 src/test/clojure/incanter/tests.clj
View
78 pom.xml
@@ -17,16 +17,32 @@
<configuration>
<testScript>src/test/clojure/incanter/mvn_tests.clj</testScript>
</configuration>
+ <executions>
+<!-- <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>-->
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
-
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
- </plugin>
- <plugin>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
@@ -47,9 +63,16 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/clojure</directory>
+ </resource>
+ </resources>
</build>
+
<dependencies>
<dependency>
<groupId>org.clojure</groupId>
@@ -61,11 +84,6 @@
<artifactId>clojure-contrib</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
- <!-- <dependency>
- <groupId>swank-clojure</groupId>
- <artifactId>swank-clojure</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency> -->
<dependency>
<groupId>incanter</groupId>
<artifactId>processing-core</artifactId>
@@ -111,11 +129,11 @@
<artifactId>jfreechart</artifactId>
<version>1.0.13</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.danlarkin</groupId>
<artifactId>clojure-json</artifactId>
<version>1.1-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
@@ -127,22 +145,24 @@
<version>5.1.6</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>build.clojure.org</id>
- <url>http://build.clojure.org/snapshots</url>
- </repository>
- <repository>
- <id>clojars.org</id>
- <url>http://clojars.org/repo</url>
- </repository>
- <repository>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>ibiblio</id>
- <name>Ibiblio - the public's library and digital archive</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- </repositories>
+
+ <repositories>
+ <repository>
+ <id>build.clojure.org</id>
+ <url>http://build.clojure.org/snapshots</url>
+ </repository>
+ <repository>
+ <id>clojars.org</id>
+ <url>http://clojars.org/repo</url>
+ </repository>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>ibiblio</id>
+ <name>Ibiblio - the public's library and digital archive</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </repository>
+ </repositories>
+
</project>
View
14 src/test/clojure/incanter/tests.clj
@@ -3,14 +3,14 @@
(:gen-class))
(def test-names [:core-tests
- :stats-tests
- :io-tests
+ :stats-tests
+ :io-tests
:charts-tests
:internal-tests
- :chrono-test
- :transformations-tests
- :probability-tests
- :information-theory-tests
+ :chrono-test
+ :transformations-tests
+ :probability-tests
+ :information-theory-tests
:bayes-tests])
(def test-namespaces
@@ -21,7 +21,7 @@
"Runs all defined tests"
[]
(println "Loading tests...")
- (apply require :reload-all test-namespaces)
+ (apply require :reload test-namespaces)
(apply run-tests test-namespaces))
(defn -main

0 comments on commit d17c289

Please sign in to comment.
Something went wrong with that request. Please try again.