Adapt POMs to use new contrib parent POM

5 files changed, 22 insertions, 119 deletions

diff --git a/modules/condition/pom.xml b/modules/condition/pom.xml
index 01be8f9f..b10f581a 100644
--- a/modules/condition/pom.xml
+++ b/modules/condition/pom.xml
@@ -32,6 +32,8 @@
 	<groupId>com.theoryinpractise</groupId>
 	<artifactId>clojure-maven-plugin</artifactId>
 	<configuration>
+	  <temporaryOutputDirectory>false</temporaryOutputDirectory>
+	  <compileDeclaredNamespaceOnly>true</compileDeclaredNamespaceOnly>
 	  <namespaces>
 	    <namespace>clojure\.contrib\.condition\.Condition</namespace>
 	  </namespaces>
diff --git a/modules/fnmap/pom.xml b/modules/fnmap/pom.xml
index 0dcfaca6..ee4b0964 100644
--- a/modules/fnmap/pom.xml
+++ b/modules/fnmap/pom.xml
@@ -8,20 +8,14 @@
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>fnmap</artifactId>
-  <dependencies>
-    <!-- AOT-compilation necessitates a specific Clojure dependency. -->
-    <dependency>
-      <groupId>org.clojure</groupId>
-      <artifactId>clojure</artifactId>
-      <version>${clojure.version}</version>
-    </dependency>
-  </dependencies>
   <build>
     <plugins>
       <plugin>
 	<groupId>com.theoryinpractise</groupId>
 	<artifactId>clojure-maven-plugin</artifactId>
 	<configuration>
+	  <temporaryOutputDirectory>false</temporaryOutputDirectory>
+	  <compileDeclaredNamespaceOnly>true</compileDeclaredNamespaceOnly>
 	  <namespaces>
 	    <namespace>clojure\.contrib\.fnmap\.PersistentFnMap</namespace>
 	  </namespaces>
diff --git a/modules/jmx/pom.xml b/modules/jmx/pom.xml
index 99121a79..aedcd603 100644
--- a/modules/jmx/pom.xml
+++ b/modules/jmx/pom.xml
@@ -27,6 +27,8 @@
 	<groupId>com.theoryinpractise</groupId>
 	<artifactId>clojure-maven-plugin</artifactId>
 	<configuration>
+	  <temporaryOutputDirectory>false</temporaryOutputDirectory>
+	  <compileDeclaredNamespaceOnly>true</compileDeclaredNamespaceOnly>
 	  <namespaces>
 	    <namespace>clojure\.contrib\.jmx\.Bean</namespace>
 	  </namespaces>
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
index 89cba625..00b0f16e 100644
--- a/modules/parent/pom.xml
+++ b/modules/parent/pom.xml
@@ -1,120 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <properties>
-    <clojure.version>1.3.0-SNAPSHOT</clojure.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
   <groupId>org.clojure.contrib</groupId>
   <artifactId>parent</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Clojure Contrib parent module</name>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/clojure</directory>
-      </resource>
-      <resource>
-        <directory>src/examples/clojure</directory>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>src/test/clojure</directory>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>com.theoryinpractise</groupId>
-        <artifactId>clojure-maven-plugin</artifactId>
-        <version>1.3.3</version>
-        <configuration>
-	  <compileDeclaredNamespaceOnly>true</compileDeclaredNamespaceOnly>
-	  <namespaces>
-	    <!-- By default, do not AOT-compile anything.
-		 Individual modules may override this. -->
-	    <namespace>!.*</namespace>
-	  </namespaces>
-        </configuration>
-        <executions>
-          <execution>
-            <id>compile-clojure</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-clojure</id>
-            <phase>test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.clojure</groupId>
-          <artifactId>clojure</artifactId>
-          <version>${clojure.version}</version>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>custom-clojure</id>
-      <activation>
-        <property>
-          <name>clojure.jar</name>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.clojure</groupId>
-          <artifactId>clojure</artifactId>
-          <version>CUSTOM</version>
-          <scope>system</scope>
-          <systemPath>${clojure.jar}</systemPath>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-  <repositories>
-    <repository>
-      <id>clojure-snapshots</id>
-      <url>http://build.clojure.org/snapshots</url>
-      <releases>
-	<enabled>false</enabled>
-      </releases>
-      <snapshots>
-	<enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>clojure-releases</id>
-      <url>http://build.clojure.org/releases</url>
-      <releases>
-	<enabled>true</enabled>
-      </releases>
-      <snapshots>
-	<enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-  <distributionManagement>
-    <repository>
-      <id>clojure-releases</id>
-      <url>scp://build.clojure.org/srv/www/releases</url>
-    </repository>
-  </distributionManagement>
+
+  <parent>
+    <groupId>org.clojure</groupId>
+    <artifactId>pom.contrib</artifactId>
+    <version>0.0.18</version>
+  </parent>
+
+  <!-- <dependencies>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>clojure</artifactId>
+      <version>1.3.0-master-SNAPSHOT</version>
+    </dependency>
+  </dependencies> -->
 </project>
diff --git a/modules/repl-ln/pom.xml b/modules/repl-ln/pom.xml
index 23049c66..1a736278 100644
--- a/modules/repl-ln/pom.xml
+++ b/modules/repl-ln/pom.xml
@@ -27,6 +27,8 @@
 	<groupId>com.theoryinpractise</groupId>
 	<artifactId>clojure-maven-plugin</artifactId>
 	<configuration>
+	  <temporaryOutputDirectory>false</temporaryOutputDirectory>
+	  <compileDeclaredNamespaceOnly>true</compileDeclaredNamespaceOnly>
 	  <namespaces>
 	    <namespace>clojure\.contrib\.repl-ln</namespace>
 	  </namespaces>