Skip to content

Commit

Permalink
Make clojars a proper maven module.
Browse files Browse the repository at this point in the history
This will give us a place to test the clojars packages.
  • Loading branch information
tobias committed Sep 11, 2012
1 parent 5a09886 commit 2dc5a93
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 14 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ release.properties
TAGS TAGS
.repository .repository
.DS_Store .DS_Store
build/clojars
64 changes: 64 additions & 0 deletions build/clojars/pom.xml
Original file line number Original file line Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions build/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@


<modules> <modules>
<module>assembly</module> <module>assembly</module>
<module>clojars</module>
</modules> </modules>


<build> <build>
Expand Down
2 changes: 1 addition & 1 deletion modules/cache/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<execution> <execution>
<id>generate-clojars-project</id> <id>generate-clojars-project</id>
<configuration> <configuration>
<args>../../build/clojars/ ${project.artifactId} ${project.version} <args>${project.artifactId} ${project.version}
:exclude {org.clojure/core.cache [[org.clojure/clojure]] :exclude {org.clojure/core.cache [[org.clojure/clojure]]
org.clojure/core.memoize [[org.clojure/clojure]]}</args> org.clojure/core.memoize [[org.clojure/clojure]]}</args>
</configuration> </configuration>
Expand Down
2 changes: 1 addition & 1 deletion modules/daemons/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<execution> <execution>
<id>generate-clojars-project</id> <id>generate-clojars-project</id>
<configuration> <configuration>
<args>../../build/clojars/ ${project.artifactId} ${project.version}</args> <args>${project.artifactId} ${project.version}</args>
</configuration> </configuration>
</execution> </execution>


Expand Down
2 changes: 1 addition & 1 deletion modules/jobs/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<execution> <execution>
<id>generate-clojars-project</id> <id>generate-clojars-project</id>
<configuration> <configuration>
<args>../../build/clojars/ ${project.artifactId} ${project.version}</args> <args>${project.artifactId} ${project.version}</args>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
Expand Down
2 changes: 1 addition & 1 deletion modules/messaging/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<execution> <execution>
<id>generate-clojars-project</id> <id>generate-clojars-project</id>
<configuration> <configuration>
<args>../../build/clojars/ ${project.artifactId} ${project.version}</args> <args>${project.artifactId} ${project.version}</args>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
Expand Down
2 changes: 1 addition & 1 deletion modules/web/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<execution> <execution>
<id>generate-clojars-project</id> <id>generate-clojars-project</id>
<configuration> <configuration>
<args>../../build/clojars/ ${project.artifactId} ${project.version} <args>${project.artifactId} ${project.version}
:exclude {ring/ring-servlet [[org.clojure/clojure]]}</args> :exclude {ring/ring-servlet [[org.clojure/clojure]]}</args>
</configuration> </configuration>
</execution> </execution>
Expand Down
2 changes: 1 addition & 1 deletion modules/xa/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<execution> <execution>
<id>generate-clojars-project</id> <id>generate-clojars-project</id>
<configuration> <configuration>
<args>../../build/clojars/ ${project.artifactId} ${project.version} <args>${project.artifactId} ${project.version}
:exclude {org.clojure/java.jdbc [[org.clojure/clojure]]}</args> :exclude {org.clojure/java.jdbc [[org.clojure/clojure]]}</args>
</configuration> </configuration>
</execution> </execution>
Expand Down
2 changes: 1 addition & 1 deletion namespaces/common/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<execution> <execution>
<id>generate-clojars-project</id> <id>generate-clojars-project</id>
<configuration> <configuration>
<args>../../build/clojars/ ${project.artifactId} ${project.version}</args> <args>${project.artifactId} ${project.version}</args>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
Expand Down
2 changes: 1 addition & 1 deletion namespaces/immutant/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<execution> <execution>
<id>generate-clojars-project</id> <id>generate-clojars-project</id>
<configuration> <configuration>
<args>../../build/clojars/ ${project.artifactId} ${project.version}</args> <args>${project.artifactId} ${project.version}</args>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
([] ([]
;; ffs maven - this allows us to setup an execution to call this in ;; 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 ;; the top-level pom, but only have it do work for poms that configure it
(println "Not configured - skipping.") (println "Not configured - skipping."))
)
([target-dir project-name version & opts] ([project-name version & opts]
(let [dir (io/file target-dir project-name ) (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") project-file (io/file dir "project.clj")
opts (apply hash-map (read-string (str "[" (str/join " " opts) "]")))
deps (->> (read-deps "target/deps.txt") deps (->> (read-deps "target/deps.txt")
(filter #(= "compile" (:scope %))) (filter #(= "compile" (:scope %)))
(map (fn [d] [(symbol (:group d) (:name d)) (map (fn [d] [(symbol (:group d) (:name d))
Expand Down

0 comments on commit 2dc5a93

Please sign in to comment.