SEAMCATCH-35 add combined jar to build

seam · Dec 24, 2010 · 37dda36 · 37dda36
1 parent a6dd99d
commit 37dda36
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 19 deletions.
diff --git a/combined/pom.xml b/combined/pom.xml
@@ -0,0 +1,84 @@
+<?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/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.jboss.seam.catch</groupId>
+      <artifactId>seam-catch-parent</artifactId>
+      <version>3.0.0-SNAPSHOT</version>
+      <relativePath>../pom.xml</relativePath>
+   </parent>
+
+   <artifactId>seam-catch</artifactId>
+
+   <packaging>jar</packaging>
+   <name>Seam Catch</name>
+   <!-- url required for JAR Manifest -->
+   <url>${project.parent.url}</url>
+
+   <build>
+      <plugins>
+         <!-- skip test phase -->
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <skip>true</skip>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <executions>
+               <execution>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>shade</goal>
+                  </goals>
+                  <configuration>
+                     <createSourcesJar>true</createSourcesJar>
+                     <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                     <artifactSet>
+                        <includes>
+                           <include>org.jboss.seam.catch:*</include>
+                        </includes>
+                     </artifactSet>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+   <dependencies>
+
+      <dependency>
+         <groupId>org.jboss.seam.catch</groupId>
+         <artifactId>seam-catch-api</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.catch</groupId>
+         <artifactId>seam-catch-impl</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.seam.solder</groupId>
+               <artifactId>seam-solder-api</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>org.jboss.seam.solder</groupId>
+               <artifactId>seam-solder-impl</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.solder</groupId>
+         <artifactId>seam-solder</artifactId>
+         <scope>compile</scope>
+      </dependency>
+
+   </dependencies>
+
+</project>
+
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -39,61 +39,56 @@
       <dependency>
          <groupId>org.jboss.seam.catch</groupId>
          <artifactId>seam-catch-api</artifactId>
-         <version>3.0.0-SNAPSHOT</version>
-         <optional>false</optional>
+         <optional>true</optional>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.catch</groupId>
          <artifactId>seam-catch-impl</artifactId>
-         <version>3.0.0-SNAPSHOT</version>
-         <optional>false</optional>
+         <optional>true</optional>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.catch</groupId>
-         <artifactId>seam-catch-api</artifactId>
-         <version>3.0.0-SNAPSHOT</version>
-         <classifier>sources</classifier>
+         <artifactId>seam-catch</artifactId>
          <optional>true</optional>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.catch</groupId>
          <artifactId>seam-catch-api</artifactId>
-         <version>3.0.0-SNAPSHOT</version>
-         <classifier>javadoc</classifier>
+         <version>${project.version}</version>
+         <classifier>sources</classifier>
          <optional>true</optional>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.catch</groupId>
          <artifactId>seam-catch-impl</artifactId>
-         <version>3.0.0-SNAPSHOT</version>
+         <version>${project.version}</version>
          <classifier>sources</classifier>
          <optional>true</optional>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.catch</groupId>
-         <artifactId>seam-catch-impl</artifactId>
-         <version>3.0.0-SNAPSHOT</version>
+         <artifactId>seam-catch-api</artifactId>
+         <version>${project.version}</version>
          <classifier>javadoc</classifier>
-         <optional>true</optional>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.catch</groupId>
          <artifactId>seam-catch-reference-guide</artifactId>
-         <version>3.0.0-SNAPSHOT</version>
+         <version>${project.version}</version>
          <type>war</type>
          <optional>true</optional>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.catch</groupId>
          <artifactId>seam-catch-example-jaxrs</artifactId>
-         <version>3.0.0-SNAPSHOT</version>
+         <version>${project.version}</version>
          <type>war</type>
          <optional>true</optional>
       </dependency>

diff --git a/dist/src/main/assembly/readme.txt b/dist/src/main/assembly/readme.txt
@@ -1,7 +1,7 @@
 
  Seam Catch Module
  Next Generation Exception Handling
- ${project.version}
+ 3.0.0.Alpha3
 
  What is it?
  ===========
@@ -37,14 +37,14 @@
  Seam Catch URLs
  ===============
 
- Catch Module page:   http://sfwk.org/Seam3/CatchModule
+ Catch Module page:   http://sfwk.org/Seam3/Catch
  Seam 3 project:      http://sfwk.org/Seam3
  Downloads:           http://sfwk.org/Seam3/DistributionDownloads
  Forums:              http://sfwk.org/Community/Seam3Users
  Source Code:         http://github.com/seam/catch             
- Issue Tracking:      http://jira.jboss.org/browse/SEAMCATCH
+ Issue Tracking:      http://issues.jboss.org/browse/SEAMCATCH
 
  Release Notes
  =============
 
- * Initial public release
+
diff --git a/pom.xml b/pom.xml
@@ -41,6 +41,7 @@
    <modules>
       <module>api</module>
       <module>impl</module>
+      <module>combined</module>
    </modules>
 
    <dependencyManagement>