Merge branch 'fixrelease'

Conflicts:
	modules/parent/pom.xml [resolved]

* Must hard-code contrib version number in every POM

60 files changed, 172 insertions, 195 deletions

diff --git a/modules/accumulators/pom.xml b/modules/accumulators/pom.xml
index 7a925867..8e196eaf 100644
--- a/modules/accumulators/pom.xml
+++ b/modules/accumulators/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.clojure.contrib</groupId>
     <artifactId>parent</artifactId>
-    <version>${clojure.contrib.version}</version>
+    <version>1.3.0-alpha1</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>accumulators</artifactId>
@@ -12,17 +12,17 @@
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>def</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>generic</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>types</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/modules/agent-utils/pom.xml b/modules/agent-utils/pom.xml
index 14af9e6b..086acba9 100644
--- a/modules/agent-utils/pom.xml
+++ b/modules/agent-utils/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.clojure.contrib</groupId>
     <artifactId>parent</artifactId>
-    <version>${clojure.contrib.version}</version>
+    <version>1.3.0-alpha1</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>agent-utils</artifactId>
diff --git a/modules/base64/pom.xml b/modules/base64/pom.xml
index 02040a5b..c1f5a5e2 100644
--- a/modules/base64/pom.xml
+++ b/modules/base64/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.clojure.contrib</groupId>
     <artifactId>parent</artifactId>
-    <version>${clojure.contrib.version}</version>
+    <version>1.3.0-alpha1</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>base64</artifactId>
diff --git a/modules/classpath/pom.xml b/modules/classpath/pom.xml
index 8514b3f7..dd650f75 100644
--- a/modules/classpath/pom.xml
+++ b/modules/classpath/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.clojure.contrib</groupId>
     <artifactId>parent</artifactId>
-    <version>${clojure.contrib.version}</version>
+    <version>1.3.0-alpha1</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>classpath</artifactId>
@@ -12,7 +12,7 @@
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>jar</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/modules/combinatorics/pom.xml b/modules/combinatorics/pom.xml
index 1340c368..201f8dfa 100644
--- a/modules/combinatorics/pom.xml
+++ b/modules/combinatorics/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.clojure.contrib</groupId>
     <artifactId>parent</artifactId>
-    <version>${clojure.contrib.version}</version>
+    <version>1.3.0-alpha1</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>combinatorics</artifactId>
diff --git a/modules/command-line/pom.xml b/modules/command-line/pom.xml
index dabb6a08..ef7f5fa6 100644
--- a/modules/command-line/pom.xml
+++ b/modules/command-line/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.clojure.contrib</groupId>
     <artifactId>parent</artifactId>
-    <version>${clojure.contrib.version}</version>
+    <version>1.3.0-alpha1</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>command-line</artifactId>
diff --git a/modules/complete/pom.xml b/modules/complete/pom.xml
index 0d1d6a9a..fb814d82 100644
--- a/modules/complete/pom.xml
+++ b/modules/complete/pom.xml
@@ -4,323 +4,301 @@
   <parent>
     <groupId>org.clojure.contrib</groupId>
     <artifactId>parent</artifactId>
-    <version>${clojure.contrib.version}</version>
+    <version>1.3.0-alpha1</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>complete</artifactId>
   <packaging>pom</packaging>
-  <build>
-    <plugins>
-      <plugin>
-	<artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-5</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assemblies/bin.xml</descriptor>
-          </descriptors>
-        </configuration>
-	<executions>
-	  <execution>
-	    <id>complete-uberjar</id>
-	    <phase>package</phase>
-	    <goals>
-	      <goal>single</goal>
-	    </goals>
-	  </execution>
-	</executions>
-      </plugin>
-    </plugins>
-  </build>
   <dependencies>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>accumulators</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>agent-utils</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>base64</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>classpath</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>combinatorics</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>command-line</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>complex-numbers</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>cond</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>condition</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>core</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>dataflow</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>datalog</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>def</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>error-kit</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>except</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>fcase</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>find-namespaces</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>fnmap</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>gen-html-docs</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>generic</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>graph</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>greatest-least</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>import-static</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>jar</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>jmx</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>json</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>lazy-seqs</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>lazy-xml</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>logging</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>macro-utils</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>macros</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>map-utils</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>math</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>miglayout</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>mmap</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>mock</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>monadic-io-streams</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>monads</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>ns-utils</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>priority-map</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>probabilities</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>profile</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>prxml</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>reflect</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>repl-ln</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>repl-utils</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>seq</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>server-socket</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>set</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>singleton</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>sql</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>stream-utils</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>strint</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>swing-utils</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>trace</artifactId>
-      <version>${clojure.contrib.version}</version>
+      <version>1.3.0-alpha1</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
       <artifactId>types