Author: veithen
Date: Sun Oct 9 11:08:28 2011
New Revision: 1180584
URL: http://svn.apache.org/viewvc?rev=1180584&view=rev
Log:
Produce the uber-JAR with the help of the shade plugin instead of the assembly
plugin, so that we will be able to use resource transformers.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-all/ (with props)
webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml (with
props)
Removed:
webservices/commons/trunk/modules/axiom/src/main/assembly/jar.xml
Modified:
webservices/commons/trunk/modules/axiom/pom.xml
webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-all/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 9 11:08:28 2011
@@ -0,0 +1 @@
+target
Added: webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml?rev=1180584&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml Sun Oct
9 11:08:28 2011
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-parent</artifactId>
+ <version>1.2.13-SNAPSHOT</version>
+ <relativePath>../axiom-parent/pom.xml</relativePath>
+ </parent>
+ <artifactId>axiom-all</artifactId>
+ <name>Axiom Uber-JAR</name>
+ <packaging>jar</packaging>
+ <description>Combines all Axiom artifacts into a single one.</description>
+ <!-- This needs to be set explicitly because the project structure implies
that the Maven calculated defaults are wrong -->
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-all</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-all</developerConnection>
+
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-all</url>
+ </scm>
+ <!-- This also needs to be set explicitly because the Maven calculated URL
would point to nowhere -->
+ <url>http://ws.apache.org/axiom/</url>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-c14n</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shade-plugin-patched</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${project.groupId}:*</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- If we deploy the uber-JAR to the Maven repositories, then
we will end up with
+ some projects depending on the uber-JAR while others
depend on the
+ individual artifacts. To avoid a dependency hell, we must
not allow this.
+ All Maven projects should depend on individual artifacts,
not the uber-JAR. -->
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=1180584&r1=1180583&r2=1180584&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Sun Oct 9 11:08:28 2011
@@ -488,21 +488,6 @@
<version>2.2-beta-5</version>
<executions>
<execution>
- <id>all-in-one-jar</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/jar.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- <finalName>axiom</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- <execution>
<id>bin</id>
<phase>package</phase>
<goals>
@@ -560,5 +545,6 @@
<module>modules/axiom-tests</module>
<module>modules/axiom-osgi-tests</module>
<module>modules/axiom-integration</module>
+ <module>modules/axiom-all</module>
</modules>
</project>
Modified: webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml?rev=1180584&r1=1180583&r2=1180584&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml (original)
+++ webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml Sun Oct
9 11:08:28 2011
@@ -70,11 +70,6 @@
<filtered>true</filtered>
<fileMode>0644</fileMode>
</file>
- <file>
- <source>${project.build.directory}/axiom.jar</source>
- <outputDirectory>/</outputDirectory>
- <destName>axiom.jar</destName>
- </file>
</files>
<moduleSets>
<moduleSet>
@@ -114,5 +109,16 @@
</dependencySets>
</binaries>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.apache.ws.commons.axiom:axiom-all</include>
+ </includes>
+ <binaries>
+ <outputDirectory>/</outputDirectory>
+ <unpack>false</unpack>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>axiom.jar</outputFileNameMapping>
+ </binaries>
+ </moduleSet>
</moduleSets>
</assembly>
