Permalink
Browse files

Make clojars a proper maven module.

This will give us a place to test the clojars packages.
  • Loading branch information...
1 parent 5a09886 commit 2dc5a9324f3b877d8437cd4d912f3d3dab72e9d6 @tobias tobias committed Sep 11, 2012
View
1 .gitignore
@@ -20,4 +20,3 @@ release.properties
TAGS
.repository
.DS_Store
-build/clojars
View
64 build/clojars/pom.xml
@@ -0,0 +1,64 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.immutant</groupId>
+ <artifactId>immutant-build</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>immutant-build-clojars</artifactId>
+ <packaging>pom</packaging>
+ <name>Immutant Clojars Build Packages</name>
+
+ <!-- <dependencies> -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.immutant</groupId> -->
+ <!-- <artifactId>immutant-modules-parent</artifactId> -->
+ <!-- <version>${project.version}</version> -->
+ <!-- <type>pom</type> -->
+ <!-- </dependency> -->
+
+ <!-- <dependency> -->
+ <!-- <groupId>org.clojure</groupId> -->
+ <!-- <artifactId>clojure</artifactId> -->
+ <!-- <scope>provided</scope> -->
+ <!-- </dependency> -->
+
+ <!-- </dependencies> -->
+
+ <!-- <modules> -->
+ <!-- <module>assembly</module> -->
+ <!-- </modules> -->
+
+ <!-- <build> -->
+ <!-- <plugins> -->
+ <!-- <plugin> -->
+ <!-- <groupId>org.apache.maven.plugins</groupId> -->
+ <!-- <artifactId>maven-deploy-plugin</artifactId> -->
+ <!-- <configuration> -->
+ <!-- <skip>true</skip> -->
+ <!-- </configuration> -->
+ <!-- </plugin> -->
+ <!-- </plugins> -->
+ <!-- </build> -->
+
+ <!-- <profiles> -->
+ <!-- <profile> -->
+ <!-- <id>full</id> -->
+ <!-- <modules> -->
+ <!-- <module>dist</module> -->
+ <!-- <module>incremental</module> -->
+ <!-- </modules> -->
+ <!-- </profile> -->
+ <!-- <profile> -->
+ <!-- <id>dist</id> -->
+ <!-- <modules> -->
+ <!-- <module>dist</module> -->
+ <!-- </modules> -->
+ <!-- </profile> -->
+ <!-- </profiles> -->
+
+</project>
View
1 build/pom.xml
@@ -31,6 +31,7 @@
<modules>
<module>assembly</module>
+ <module>clojars</module>
</modules>
<build>
View
2 modules/cache/pom.xml
@@ -115,7 +115,7 @@
<execution>
<id>generate-clojars-project</id>
<configuration>
- <args>../../build/clojars/ ${project.artifactId} ${project.version}
+ <args>${project.artifactId} ${project.version}
:exclude {org.clojure/core.cache [[org.clojure/clojure]]
org.clojure/core.memoize [[org.clojure/clojure]]}</args>
</configuration>
View
2 modules/daemons/pom.xml
@@ -90,7 +90,7 @@
<execution>
<id>generate-clojars-project</id>
<configuration>
- <args>../../build/clojars/ ${project.artifactId} ${project.version}</args>
+ <args>${project.artifactId} ${project.version}</args>
</configuration>
</execution>
View
2 modules/jobs/pom.xml
@@ -97,7 +97,7 @@
<execution>
<id>generate-clojars-project</id>
<configuration>
- <args>../../build/clojars/ ${project.artifactId} ${project.version}</args>
+ <args>${project.artifactId} ${project.version}</args>
</configuration>
</execution>
</executions>
View
2 modules/messaging/pom.xml
@@ -95,7 +95,7 @@
<execution>
<id>generate-clojars-project</id>
<configuration>
- <args>../../build/clojars/ ${project.artifactId} ${project.version}</args>
+ <args>${project.artifactId} ${project.version}</args>
</configuration>
</execution>
</executions>
View
2 modules/web/pom.xml
@@ -99,7 +99,7 @@
<execution>
<id>generate-clojars-project</id>
<configuration>
- <args>../../build/clojars/ ${project.artifactId} ${project.version}
+ <args>${project.artifactId} ${project.version}
:exclude {ring/ring-servlet [[org.clojure/clojure]]}</args>
</configuration>
</execution>
View
2 modules/xa/pom.xml
@@ -102,7 +102,7 @@
<execution>
<id>generate-clojars-project</id>
<configuration>
- <args>../../build/clojars/ ${project.artifactId} ${project.version}
+ <args>${project.artifactId} ${project.version}
:exclude {org.clojure/java.jdbc [[org.clojure/clojure]]}</args>
</configuration>
</execution>
View
2 namespaces/common/pom.xml
@@ -71,7 +71,7 @@
<execution>
<id>generate-clojars-project</id>
<configuration>
- <args>../../build/clojars/ ${project.artifactId} ${project.version}</args>
+ <args>${project.artifactId} ${project.version}</args>
</configuration>
</execution>
</executions>
View
2 namespaces/immutant/pom.xml
@@ -59,7 +59,7 @@
<execution>
<id>generate-clojars-project</id>
<configuration>
- <args>../../build/clojars/ ${project.artifactId} ${project.version}</args>
+ <args>${project.artifactId} ${project.version}</args>
</configuration>
</execution>
</executions>
View
10 support/build-support/src/main/clojure/immutant/build/generate_clojars_project.clj
@@ -54,12 +54,12 @@
([]
;; ffs maven - this allows us to setup an execution to call this in
;; the top-level pom, but only have it do work for poms that configure it
- (println "Not configured - skipping.")
- )
- ([target-dir project-name version & opts]
- (let [dir (io/file target-dir project-name )
+ (println "Not configured - skipping."))
+
+ ([project-name version & opts]
+ (let [opts (apply hash-map (read-string (str "[" (str/join " " opts) "]")))
+ dir (io/file (:target-dir opts "../../build/clojars/target") project-name)
project-file (io/file dir "project.clj")
- opts (apply hash-map (read-string (str "[" (str/join " " opts) "]")))
deps (->> (read-deps "target/deps.txt")
(filter #(= "compile" (:scope %)))
(map (fn [d] [(symbol (:group d) (:name d))

0 comments on commit 2dc5a93

Please sign in to comment.