aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Brenk <mail@andreasbrenk.com>2010-10-01 19:26:15 +0200
committerAndreas Brenk <mail@andreasbrenk.com>2010-10-01 19:26:15 +0200
commitd6b88cba1065c4ae9c7df2c0966147dd428c1c41 (patch)
treee80fb3e6bf9ea8abe283da753ddff6a513c47961
parent2e7ef0b12838b33f12e5c13ae41d4dd34a5469e8 (diff)
Fix build of complete/standalone artifact.
Dependency on single, large JAR: groupId: org.clojure.contrib artifactId: clojure-contrib version: 1.3.0-SNAPSHOT classifier: standalone Dependency on multiple, small JARs: groupId: org.clojure.contrib artifactId: complete version: 1.3.0-SNAPSHOT
-rw-r--r--modules/complete/pom.xml2
-rw-r--r--modules/complete/src/main/assemblies/bin.xml17
-rw-r--r--pom.xml15
-rw-r--r--src/main/assembly/standalone.xml22
4 files changed, 38 insertions, 18 deletions
diff --git a/modules/complete/pom.xml b/modules/complete/pom.xml
index 94c0d0eb..ca9b97c0 100644
--- a/modules/complete/pom.xml
+++ b/modules/complete/pom.xml
@@ -8,7 +8,7 @@
<relativePath>../parent</relativePath>
</parent>
<artifactId>complete</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.clojure.contrib</groupId>
diff --git a/modules/complete/src/main/assemblies/bin.xml b/modules/complete/src/main/assemblies/bin.xml
deleted file mode 100644
index 607ac863..00000000
--- a/modules/complete/src/main/assemblies/bin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>true</unpack>
- <excludes>
- <exclude>org.clojure:clojure</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly> \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 01302b67..dc29d511 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,11 +90,26 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/dist.xml</descriptor>
</descriptors>
</configuration>
+ <executions>
+ <execution>
+ <id>standalone</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/standalone.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/src/main/assembly/standalone.xml b/src/main/assembly/standalone.xml
new file mode 100644
index 00000000..94cbfcd5
--- /dev/null
+++ b/src/main/assembly/standalone.xml
@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>standalone</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <sources>
+ <includeModuleDirectory>false</includeModuleDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/clojure</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+</assembly>