[seam-commits] Seam SVN: r13039 - in dist/trunk: dist and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2010-06-04 10:09:17 -0400 (Fri, 04 Jun 2010) New Revision: 13039 Modified: dist/trunk/dist/pom.xml dist/trunk/pom.xml Log: first steps towards uber jar Modified: dist/trunk/dist/pom.xml =================================================================== --- dist/trunk/dist/pom.xml 2010-06-04 10:24:09 UTC (rev 13038) +++ dist/trunk/dist/pom.xml 2010-06-04 14:09:17 UTC (rev 13039) @@ -4,7 +4,7 @@ <groupId>org.jboss.seam</groupId> <artifactId>seam-distribution</artifactId> - <packaging>pom</packaging> + <packaging>jar</packaging> <version>3.0.0-SNAPSHOT</version> <name>Seam Distribution</name> @@ -158,7 +158,6 @@ <dependency> <groupId>org.jboss.seam.jms</groupId> <artifactId>seam-jms</artifactId> - <version>${seam.jms.version}</version> <optional>true</optional> </dependency> @@ -186,7 +185,7 @@ <dependency> <groupId>org.jboss.seam.jms</groupId> - <artifactId>seam-jms</artifactId> + <artifactId>seam-jms-api</artifactId> <classifier>javadoc</classifier> <version>${seam.jms.version}</version> <optional>true</optional> @@ -194,7 +193,7 @@ <dependency> <groupId>org.jboss.seam.jms</groupId> - <artifactId>seam-jms</artifactId> + <artifactId>seam-jms-api</artifactId> <classifier>sources</classifier> <version>${seam.jms.version}</version> <optional>true</optional> @@ -245,7 +244,6 @@ <optional>true</optional> </dependency> - </dependencies> <build> @@ -255,6 +253,25 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>javadoc-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <includeDependencySources>true</includeDependencySources> + <dependencySourceIncludes> + <dependencySourceIncludes>org.jboss.seam:*</dependencySourceIncludes> + </dependencySourceIncludes> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Modified: dist/trunk/pom.xml =================================================================== --- dist/trunk/pom.xml 2010-06-04 10:24:09 UTC (rev 13038) +++ dist/trunk/pom.xml 2010-06-04 14:09:17 UTC (rev 13039) @@ -1,9 +1,10 @@ -<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"> +<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> <groupId>org.jboss.seam</groupId> <artifactId>seam</artifactId> - <packaging>pom</packaging> + <packaging>jar</packaging> <version>3.0.0-SNAPSHOT</version> <name>Seam BOM</name> @@ -182,43 +183,43 @@ <artifactId>seam-xml-config</artifactId> <version>${seam.xml.config.version}</version> </dependency> - + <dependency> <groupId>org.jboss.seam.remoting</groupId> <artifactId>seam-remoting-core</artifactId> <version>${seam.remoting.version}</version> </dependency> - + <dependency> <groupId>org.jboss.seam.faces</groupId> <artifactId>seam-faces</artifactId> <version>${seam.faces.version}</version> </dependency> - + <dependency> <groupId>org.jboss.seam.faces</groupId> <artifactId>seam-faces-api</artifactId> <version>${seam.faces.version}</version> </dependency> - + <dependency> <groupId>org.jboss.seam.jms</groupId> <artifactId>seam-jms</artifactId> <version>${seam.jms.version}</version> </dependency> - + <dependency> <groupId>org.jboss.seam.jms</groupId> <artifactId>seam-jms-api</artifactId> <version>${seam.jms.version}</version> </dependency> - + <dependency> <groupId>org.jboss.seam.international</groupId> <artifactId>seam-international</artifactId> <version>${seam.international.version}</version> </dependency> - + <dependency> <groupId>org.jboss.seam.international</groupId> <artifactId>seam-international-api</artifactId> @@ -227,19 +228,111 @@ </dependencies> </dependencyManagement> - + + <!-- Dependecies for shaded jar --> + <dependencies> + <dependency> + <groupId>org.jboss.seam.xml</groupId> + <artifactId>seam-xml-config</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.seam.remoting</groupId> + <artifactId>seam-remoting-core</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.seam.faces</groupId> + <artifactId>seam-faces</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.seam.faces</groupId> + <artifactId>seam-faces-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.seam.jms</groupId> + <artifactId>seam-jms</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.seam.jms</groupId> + <artifactId>seam-jms-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.seam.international</groupId> + <artifactId>seam-international</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.seam.international</groupId> + <artifactId>seam-international-api</artifactId> + <optional>true</optional> + </dependency> + + </dependencies> + <profiles> <profile> - <id>distribution</id> - <activation> - <property> - <name>dist</name> - </property> - </activation> - <modules> - <module>dist</module> - </modules> - </profile> + <id>distribution</id> + <activation> + <property> + <name>dist</name> + </property> + </activation> + <modules> + <module>dist</module> + </modules> + </profile> + <profile> + <id>uber-jar</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <id>uber-jar</id> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <createSourcesJar /> + <artifactSet> + <includes> + <include>org.jboss.seam.*:*</include> + </includes> + </artifactSet> + <transformers> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <!-- XmlAppendingTransformer isn't that useful, it has annoying design and bugs --> +<!-- <transformer--> +<!-- implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">--> +<!-- <resource>META-INF/beans.xml</resource>--> +<!-- </transformer>--> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <scm>