Permalink
Browse files

[SHRINKWRAP-262] Restructure the build/dist setup to unify the POM pa…

…rent and the Aggregator. Still TODO: Hook in reporting for "mvn site" and get API Docs and othe reports reflected
  • Loading branch information...
ALRubinger committed Mar 16, 2011
1 parent 38a2274 commit 946e08a15ad8a694061dc3e1ee1794ecc772f945
View
@@ -7,9 +7,9 @@
<!-- Parent -->
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-build</artifactId>
+ <artifactId>shrinkwrap-parent</artifactId>
<version>1.0.0-alpha-13-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<!-- Model Version -->
View
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!--
- vi:ts=2:sw=2:expandtab:
--->
-<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">
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>5</version>
- </parent>
-
- <!-- Model Version -->
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Artifact Configuration -->
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-alpha-13-SNAPSHOT</version>
- <name>ShrinkWrap Build</name>
- <description>ShrinkWrap Build Configuration</description>
- <packaging>pom</packaging>
-
- <!-- Properties -->
- <properties>
-
- <!-- Versioning -->
- <version.junit_junit>4.6</version.junit_junit>
-
- </properties>
-
- <!-- SCM -->
- <scm>
- <connection>scm:git:git://github.com/shrinkwrap/shrinkwrap.git</connection>
- <developerConnection>scm:git:git@github.com:shrinkwrap/shrinkwrap.git</developerConnection>
- <url>https://github.com/shrinkwrap/shrinkwrap</url>
- </scm>
-
- <!-- Issues -->
- <issueManagement>
- <system>jira</system>
- <url>http://jira.jboss.com/jira/browse/SHRINKWRAP</url>
- </issueManagement>
-
- <!-- Licenses -->
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <!-- Build -->
- <build>
-
- <plugins>
-
- <!-- JBoss-specific Packaging -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <extensions>true</extensions>
- </plugin>
-
- <!-- Compiler -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>false</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- <compilerVersion>1.6</compilerVersion>
- <fork>true</fork>
- <argLine>-Xmx512M</argLine>
- <executable>${JAVA_HOME}/bin/javac</executable>
- </configuration>
- </plugin>
-
- <!-- Surefire -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <trimStackTrace>false</trimStackTrace>
- <printSummary>true</printSummary>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/*TestSuite.java</include>
- </includes>
- <forkMode>always</forkMode>
- </configuration>
- </plugin>
-
- <!-- Maven Release Plugin Configuration -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
-
- <!-- Enforce Maven Environment -->
- <plugin>
- <artifactId>maven-enforcer-plugin
- </artifactId>
- <executions>
- <execution>
- <id>enforce-maven-environment</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.2.0,)</version>
- <!--
- Must be more that 2.2 to support
- Assembly "includeModuleDirectory":
- http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html
- -->
- </requireMavenVersion>
- <requireJavaVersion>
- <version>1.6.0</version> <!-- Must be JDK6 -->
- </requireJavaVersion>
- <requireProperty>
- <property>env.JAVA_HOME</property>
- <message>"JAVA_HOME needs to be set to compile"</message>
- </requireProperty>
- <requireProperty>
- <property>env.JAVA5_HOME</property>
- <message>"JAVA5_HOME needs to be set to run some tests in the JRE5 runtime"</message>
- </requireProperty>
- </rules>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <!-- Dependency Management -->
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit_junit}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <!-- Reporting -->
- <reporting>
- <plugins>
-
- <!-- Cobertura (Code Coverage) -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- </configuration>
- </plugin>
-
- <!-- FindBugs -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <findbugsXmlOutputDirectory>target/site</findbugsXmlOutputDirectory>
- </configuration>
- </plugin>
-
- <!-- SHRINKWRAP-157 Workaround -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>project-team</report>
- <report>mailing-list</report>
- <report>cim</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- </plugins>
- </reporting>
-
- <repositories>
- <repository>
- <id>jboss-public-repository</id>
- <name>JBoss Repository</name>
- <url> https://repository.jboss.org/nexus/content/groups/public </url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository</id>
- <name>JBoss Repository</name>
- <url> https://repository.jboss.org/nexus/content/groups/public </url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
-</project>
-
File renamed without changes.
@@ -16,6 +16,7 @@
<!-- All module dependencies -->
<moduleSets>
<moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
<sources>
<fileSets>
<fileSet>
View
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-parent</artifactId>
+ <version>1.0.0-alpha-13-SNAPSHOT</version>
+ </parent>
+
+ <!-- Artifact Information -->
+ <artifactId>shrinkwrap-distribution</artifactId>
+ <packaging>pom</packaging>
+ <name>ShrinkWrap Distribution</name>
+
+ <!--
+
+ Declare dependencies such that this module runs LAST in the Aggregator
+
+ -->
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-glassfish</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-jetty-6</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-jetty-7</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-mobicents-sip-servlets-1x</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-openejb</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.sip</groupId>
+ <artifactId>shrinkwrap-extension-sip-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-tomcat-6</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-vdf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-vfs3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-descriptors</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-vfs3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <!-- Assembly Plugin -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distro-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>shrinkwrap-${project.version}</finalName>
+ <descriptors>
+ <descriptor>dist.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
View
@@ -4,9 +4,9 @@
<!-- Parent -->
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-build</artifactId>
+ <artifactId>shrinkwrap-parent</artifactId>
<version>1.0.0-alpha-13-SNAPSHOT</version>
- <relativePath>../../build/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Oops, something went wrong.

0 comments on commit 946e08a

Please sign in to comment.