Author: ssmiweve
Date: 2008-11-07 16:23:34 +0100 (Fri, 07 Nov 2008)
New Revision: 6917
Added:
trunk/generic.sesam/search-command-control/assemble/src/test/
trunk/generic.sesam/search-command-control/assemble/src/test/resources/
trunk/generic.sesam/search-command-control/assemble/src/test/resources/testng.xml
Modified:
trunk/generic.sesam/search-command-control/assemble/pom.xml
trunk/generic.sesam/search-command-control/assemble/src/assemble/assemble-default.xml
trunk/generic.sesam/search-command-control/assemble/src/assemble/assemble-include-fast.xml
Log:
Make the assembly also correctly build -tests.jar and -sources.jar
Modified: trunk/generic.sesam/search-command-control/assemble/pom.xml
===================================================================
--- trunk/generic.sesam/search-command-control/assemble/pom.xml 2008-11-07
15:05:28 UTC (rev 6916)
+++ trunk/generic.sesam/search-command-control/assemble/pom.xml 2008-11-07
15:23:34 UTC (rev 6917)
@@ -14,6 +14,14 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -31,7 +39,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>2.2-beta-2</version>
<configuration>
<descriptors>
<descriptor>src/assemble/assemble-default.xml</descriptor>
@@ -70,7 +78,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>2.2-beta-2</version>
<configuration>
<descriptors>
<descriptor>src/assemble/assemble-include-fast.xml</descriptor>
Modified:
trunk/generic.sesam/search-command-control/assemble/src/assemble/assemble-default.xml
===================================================================
---
trunk/generic.sesam/search-command-control/assemble/src/assemble/assemble-default.xml
2008-11-07 15:05:28 UTC (rev 6916)
+++
trunk/generic.sesam/search-command-control/assemble/src/assemble/assemble-default.xml
2008-11-07 15:23:34 UTC (rev 6917)
@@ -10,5 +10,13 @@
<directory>../default/target/classes</directory>
<outputDirectory>../classes</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../default/target/test-classes</directory>
+ <outputDirectory>../test-classes</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../default/src/main/java</directory>
+ <outputDirectory>../../src/main/java</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
Modified:
trunk/generic.sesam/search-command-control/assemble/src/assemble/assemble-include-fast.xml
===================================================================
---
trunk/generic.sesam/search-command-control/assemble/src/assemble/assemble-include-fast.xml
2008-11-07 15:05:28 UTC (rev 6916)
+++
trunk/generic.sesam/search-command-control/assemble/src/assemble/assemble-include-fast.xml
2008-11-07 15:23:34 UTC (rev 6917)
@@ -14,6 +14,22 @@
<directory>../fast/target/classes</directory>
<outputDirectory>../classes</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../default/target/test-classes</directory>
+ <outputDirectory>../test-classes</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../fast/target/test-classes</directory>
+ <outputDirectory>../test-classes</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../default/src/main/java</directory>
+ <outputDirectory>../../src/main/java</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../fast/src/main/java</directory>
+ <outputDirectory>../../src/main/java</outputDirectory>
+ </fileSe>
</fileSets>
<!--dependencySets>
<dependencySet>
Added:
trunk/generic.sesam/search-command-control/assemble/src/test/resources/testng.xml
===================================================================
---
trunk/generic.sesam/search-command-control/assemble/src/test/resources/testng.xml
(rev 0)
+++
trunk/generic.sesam/search-command-control/assemble/src/test/resources/testng.xml
2008-11-07 15:23:34 UTC (rev 6917)
@@ -0,0 +1,6 @@
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd"; >
+<suite name="No tests in assembly" verbose="10" parallel="false">
+
+ <!-- No tests in assembly -->
+
+</suite>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
