You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by ah...@apache.org on 2006/11/17 16:07:15 UTC
svn commit: r476167 - in /hivemind/branches/branch-2-0-annot: pom.xml
xml/pom.xml xml/src/descriptor/META-INF/test-jar-dummy/
xml/src/descriptor/META-INF/test-jar-dummy/MANIFEST.MF
Author: ahuegen
Date: Fri Nov 17 07:07:14 2006
New Revision: 476167
URL: http://svn.apache.org/viewvc?view=rev&rev=476167
Log:
Fixed double provider entries
Added:
hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/test-jar-dummy/
hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/test-jar-dummy/MANIFEST.MF
Modified:
hivemind/branches/branch-2-0-annot/pom.xml
hivemind/branches/branch-2-0-annot/xml/pom.xml
Modified: hivemind/branches/branch-2-0-annot/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/pom.xml?view=diff&rev=476167&r1=476166&r2=476167
==============================================================================
--- hivemind/branches/branch-2-0-annot/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/pom.xml Fri Nov 17 07:07:14 2006
@@ -119,6 +119,9 @@
</resource>
<resource>
<directory>src/descriptor</directory>
+ <excludes>
+ <exclude>**/test-jar-dummy/*.*</exclude>
+ </excludes>
</resource>
</resources>
<testSourceDirectory>src/test</testSourceDirectory>
Modified: hivemind/branches/branch-2-0-annot/xml/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/pom.xml?view=diff&rev=476167&r1=476166&r2=476167
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/pom.xml Fri Nov 17 07:07:14 2006
@@ -74,23 +74,28 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <id>test-jar</id>
<goals>
<!-- Create jar with unit tests, so they can be reused by the other modules -->
<goal>test-jar</goal>
</goals>
- </execution>
- <execution>
- <goals>
- <goal>package</goal>
- </goals>
- <configuration>
+ <configuration>
<archive>
- <manifestFile>src/descriptor/META-INF/MANIFEST.MF</manifestFile>
+ <!-- Don't include the MANIFEST.MF in the test-jar because this will result in
+ duplicate module exceptions during the library tests. So override the
+ global configuration which is inherited with dummy value.
+ In theory it might be possible to use different configurations for
+ jar and test-jar goal, but I found no working syntax and gave up -->
+ -->
+ <manifestFile>src/descriptor/META-INF/test-jar-dummy/MANIFEST.MF</manifestFile>
</archive>
- </configuration>
- </execution>
- </executions>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifestFile>src/descriptor/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
</plugin>
</plugins>
</build>
Added: hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/test-jar-dummy/MANIFEST.MF
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/test-jar-dummy/MANIFEST.MF?view=auto&rev=476167
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/test-jar-dummy/MANIFEST.MF (added)
+++ hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/test-jar-dummy/MANIFEST.MF Fri Nov 17 07:07:14 2006
@@ -0,0 +1 @@
+