Index: trunk/pom.xml
===================================================================
diff -u -N -r2076 -r2100
--- trunk/pom.xml	(.../pom.xml)	(revision 2076)
+++ trunk/pom.xml	(.../pom.xml)	(revision 2100)
@@ -35,7 +35,8 @@
     <slf4j.version>1.6.4</slf4j.version>
     <c3p0.version>0.9.1.1</c3p0.version>
     <log4j.version>1.2.16</log4j.version>
-    <maven-forge-plugin.version>1.0.5</maven-forge-plugin.version>
+    <maven-forge-plugin.version>1.0.6-SNAPSHOT</maven-forge-plugin.version>
+    <gmaven-plugin.version>1.4</gmaven-plugin.version>
 
     <checkstyle-suppressions-file>suppressions.xml</checkstyle-suppressions-file>
     <checkstyle-config-file>checkstyle.xml</checkstyle-config-file>
Index: trunk/quartz/pom.xml
===================================================================
diff -u -N -r1935 -r2100
--- trunk/quartz/pom.xml	(.../pom.xml)	(revision 1935)
+++ trunk/quartz/pom.xml	(.../pom.xml)	(revision 2100)
@@ -11,24 +11,12 @@
   <artifactId>quartz</artifactId>
   <packaging>jar</packaging>
   <name>quartz</name>
+  <description>Enterprise Job Scheduler</description>
 
   <properties>
   </properties>
 
   <dependencies>  
-    <!--Compile scope. If you add something to compile scope, you have to do the same thing in quartz-core/pom.xml -->
-    <dependency>
-      <groupId>c3p0</groupId>
-      <artifactId>c3p0</artifactId>
-      <version>${c3p0.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-  
     <!-- provided scope, used for packaging purpose only -->
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -43,58 +31,52 @@
       <scope>provided</scope>
     </dependency>   
     <dependency>
-      <groupId>org.quartz-scheduler.internal</groupId>
-      <artifactId>quartz-terracotta-bootstrap</artifactId>
+      <groupId>org.terracotta.modules</groupId>
+      <artifactId>tim-quartz</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    
+    <!-- internal components used for shading -- will be removed in final pom -->
     <dependency>
-      <groupId>org.terracotta.modules</groupId>
-      <artifactId>tim-quartz</artifactId>
+      <groupId>org.quartz-scheduler.internal</groupId>
+      <artifactId>quartz-terracotta-bootstrap</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.quartz-scheduler.internal</groupId>
       <artifactId>quartz-core</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.quartz-scheduler.internal</groupId>
       <artifactId>quartz-commonj</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.quartz-scheduler.internal</groupId>
       <artifactId>quartz-jboss</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.quartz-scheduler.internal</groupId>
       <artifactId>quartz-oracle</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.quartz-scheduler.internal</groupId>
       <artifactId>quartz-weblogic</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.quartz-scheduler.internal</groupId>
       <artifactId>quartz-jobs</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.quartz-scheduler.internal</groupId>
       <artifactId>quartz-plugins</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>    
   </dependencies>
   
@@ -132,22 +114,8 @@
               </artifactItems>
             </configuration>
           </execution>
-          
+            
           <execution>
-            <id>unpack-standalone-and-terracotta</id>
-            <configuration>
-              <includeGroupIds>org.quartz-scheduler.internal</includeGroupIds>
-              <excludeArtifactIds>quartz-stubs</excludeArtifactIds>
-              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-              <excludes>**/META-INF/maven/**,**/license.txt,**/thirdpartylicenses.txt</excludes>
-            </configuration>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-          </execution>
-          
-          <execution>
             <id>copy-TIMs</id>
             <configuration>
               <includeGroupIds>org.terracotta.modules</includeGroupIds>
@@ -249,17 +217,76 @@
           </execution>           
         </executions>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.2</version>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.7.1</version>
         <configuration>
-          <archive>
-            <manifestFile>${project.build.directory}/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>  
-      </plugin>
+          <artifactSet>
+            <includes>
+              <include>org.quartz-scheduler.internal:*</include>
+            </includes>
+            <excludes>
+              <exclude>*:quartz-stubs:*</exclude>
+            </excludes>
+          </artifactSet>       
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <excludes>
+                <exclude>**/META-INF/maven/org.quartz-scheduler.internal/**</exclude>
+                <exclude>**/license.txt</exclude>
+                <exclude>**/thirdpartylicenses.txt</exclude>
+              </excludes>
+            </filter>		  
+          </filters>    
+          <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+          <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>           
+          <transformers>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+              <resource>MANIFEST.MF</resource>
+            </transformer>          
+            <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+              <resource>META-INF/MANIFEST.MF</resource>
+              <file>${project.build.directory}/MANIFEST.MF</file>
+            </transformer>          
+          </transformers>            
+        </configuration>
+        <executions>
+          <execution>
+            <id>shade-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>      
       <plugin>
+        <groupId>org.codehaus.gmaven</groupId>
+        <artifactId>gmaven-plugin</artifactId>
+        <version>${gmaven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>inject-correct-pom-to-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <source>
+                def jarFile = new File(project.build.directory, "${project.artifactId}-${project.version}.jar")
+                ant.jar(destfile: jarFile, update: "true") {
+                  zipfileset(file: new File(project.build.directory, "dependency-reduced-pom.xml"), 
+                             fullpath: "META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml")
+                }
+              </source>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>       
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <version>1.5</version>