Author: aadamchik
Date: Wed Nov 20 16:59:28 2013
New Revision: 1543875
URL: http://svn.apache.org/r1543875
Log:
collapsing double declration of jar plugin
Modified:
cayenne/main/trunk/cayenne-server/pom.xml
Modified: cayenne/main/trunk/cayenne-server/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?rev=1543875&r1=1543874&r2=1543875&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Wed Nov 20 16:59:28 2013
@@ -154,19 +154,6 @@
</execution>
</executions>
</plugin>
-
- <!-- share tests with downstream modules -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
@@ -215,11 +202,20 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
+ <!-- include OSGi stuff -->
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
+ <!-- share tests with downstream modules -->
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
