Author: veithen
Date: Tue Jun 9 07:24:42 2015
New Revision: 1684334
URL: http://svn.apache.org/r1684334
Log:
Fix an issue with maven-shade-plugin and Maven 3.3.
Modified:
webservices/axiom/trunk/implementations/axiom-dom/pom.xml
webservices/axiom/trunk/implementations/axiom-impl/pom.xml
webservices/axiom/trunk/implementations/pom.xml
Modified: webservices/axiom/trunk/implementations/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/pom.xml?rev=1684334&r1=1684333&r2=1684334&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/pom.xml (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/pom.xml Tue Jun 9
07:24:42 2015
@@ -43,11 +43,13 @@
<groupId>${project.groupId}</groupId>
<artifactId>om-aspects</artifactId>
<version>${project.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dom-aspects</artifactId>
<version>${project.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>${stax.impl.groupid}</groupId>
Modified: webservices/axiom/trunk/implementations/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/pom.xml?rev=1684334&r1=1684333&r2=1684334&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/pom.xml (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/pom.xml Tue Jun 9
07:24:42 2015
@@ -43,6 +43,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>om-aspects</artifactId>
<version>${project.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>${stax.impl.groupid}</groupId>
Modified: webservices/axiom/trunk/implementations/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/pom.xml?rev=1684334&r1=1684333&r2=1684334&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/pom.xml (original)
+++ webservices/axiom/trunk/implementations/pom.xml Tue Jun 9 07:24:42 2015
@@ -95,6 +95,11 @@
<transformers>
<transformer
implementation="org.apache.axiom.buildutils.shade.osgi.OSGiManifestResourceTransformer"
/>
</transformers>
+ <!-- Avoid dependency reduced POMs because the artifacts
are used as dependencies by other modules
+ in the project and this causes recurring problems.
E.g. in Maven 3.3, downstream modules in the
+ same build still see the original dependencies of the
unshaded JAR. Instead of producing
+ dependency reduced POMs, we simply declare the
relevant dependencies as optional. -->
+
<createDependencyReducedPom>false</createDependencyReducedPom>
<!-- This removes most of the AspectJ runtime classes from
the shaded JAR -->
<minimizeJar>true</minimizeJar>
<createSourcesJar>true</createSourcesJar>
