Author: veithen
Date: Sun Nov 15 17:43:41 2015
New Revision: 1714475
URL: http://svn.apache.org/viewvc?rev=1714475&view=rev
Log:
Fix the creation of the source JAR for modules that use maven-shade-plugin.
Modified:
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1714475&r1=1714474&r2=1714475&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sun Nov 15 17:43:41 2015
@@ -921,6 +921,11 @@
<executions>
<execution>
<id>source-jars</id>
+ <!-- Execute in phase prepare-package to make sure
that the source JAR is built before
+ maven-shade-plugin is invoked. (Note that
activation of the apache-release profile
+ may cause an inversion of the order in which
these goals are executed if they are
+ bound to the same phase.) -->
+ <phase>prepare-package</phase>
<goals>
<!-- Use "jar-no-fork" instead of "jar" to avoid
forking the build
(which is not a problem, but unnecessary) -->
Modified: webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml?rev=1714475&r1=1714474&r2=1714475&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml
(original)
+++ webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml Sun
Nov 15 17:43:41 2015
@@ -89,6 +89,19 @@
<argLine>${jacoco.surefireArgLine}</argLine>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- For some reason maven-source-plugin causes
problems here; deactivate it -->
+ <id>source-jars</id>
+ <phase>none</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>