Index: trunk/quartz/pom.xml
===================================================================
diff -u -N -r2242 -r2262
--- trunk/quartz/pom.xml	(.../pom.xml)	(revision 2242)
+++ trunk/quartz/pom.xml	(.../pom.xml)	(revision 2262)
@@ -72,66 +72,28 @@
     <plugins>    
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.5.1</version>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9</version>
+        <configuration>
+          <skip>${skipJavadoc}</skip>
+          <doctitle>Quartz Enterprise Job Scheduler ${project.version} API</doctitle>
+          <windowtitle>Quartz Enterprise Job Scheduler ${project.version} API</windowtitle>
+          <bottom>Copyright 2001-{currentYear}, Terracotta, Inc.</bottom>
+          <includeDependencySources>true</includeDependencySources>      
+          <dependencySourceIncludes>
+            <dependencySourceInclude>org.quartz-scheduler.internal:*</dependencySourceInclude>
+          </dependencySourceIncludes>
+        </configuration>
         <executions>
           <execution>
-            <id>copy-TIMs</id>
-            <configuration>
-              <includeGroupIds>org.terracotta.modules</includeGroupIds>
-              <outputDirectory>${project.build.outputDirectory}/META-INF/terracotta/TIMs</outputDirectory>
-              <excludes>**/META-INF/maven/**,**/license.txt,**/thirdpartylicenses.txt</excludes>
-            </configuration>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-          </execution>
-
-          <execution>
-            <id>copy-javadoc-sources</id>
+            <id>create-javadoc</id>
             <phase>package</phase>
             <goals>
-              <goal>copy</goal>
+              <goal>jar</goal>
             </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.quartz-scheduler</groupId>
-                  <artifactId>quartz-parent</artifactId>
-                  <version>${project.version}</version>
-                  <classifier>sources</classifier>
-                  <overWrite>true</overWrite>
-                  <destFileName>${project.artifactId}-${project.version}-sources.jar</destFileName>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.quartz-scheduler</groupId>
-                  <artifactId>quartz-parent</artifactId>
-                  <version>${project.version}</version>
-                  <classifier>javadoc</classifier>
-                  <overWrite>true</overWrite>
-                  <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-            </configuration>
-          </execution>          
-        </executions>
-      </plugin>      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.3</version>
-        <executions>
-          <execution>
-            <id>unjar-classes</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
           </execution>
         </executions>
-      </plugin>
+      </plugin>    
       <plugin>
         <groupId>org.terracotta</groupId>
         <artifactId>maven-forge-plugin</artifactId>
@@ -236,36 +198,8 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>       
+      </plugin>           
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <id>attach-javadoc-sources</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</file>
-                  <type>jar</type>
-                  <classifier>sources</classifier>
-                </artifact>
-                <artifact>
-                  <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                  <type>jar</type>
-                  <classifier>javadoc</classifier>
-                </artifact>               
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>      
-      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>2.3.7</version>
Index: trunk/pom.xml
===================================================================
diff -u -N -r2242 -r2262
--- trunk/pom.xml	(.../pom.xml)	(revision 2242)
+++ trunk/pom.xml	(.../pom.xml)	(revision 2262)
@@ -168,41 +168,16 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
           <version>2.1.2</version>
-          <inherited>false</inherited>
           <executions>
             <execution>
               <id>sources-jar</id>
               <goals>
-                <goal>aggregate</goal>
+                <goal>jar</goal>
               </goals>
             </execution>
           </executions>
-        </plugin>          
+        </plugin>               
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.8.1</version>
-          <inherited>false</inherited>
-          <executions>
-            <execution>
-              <id>javadoc</id>
-              <goals>
-                <goal>aggregate-jar</goal>
-              </goals>
-              <configuration>
-                <inherited>false</inherited>
-                <quiet>true</quiet>
-                <skip>${skipJavadoc}</skip>
-                <doctitle>Quartz Enterprise Job Scheduler ${project.version} API</doctitle>
-                <windowtitle>Quartz Enterprise Job Scheduler ${project.version} API</windowtitle>
-                <bottom>Copyright 2001-{currentYear}, Terracotta, Inc.</bottom>
-                <excludePackageNames>org.quartz.examples:*.spi:org.terracotta.quartz</excludePackageNames>
-                <sourcepath>${basedir}/quartz-core/src/main/java;${basedir}/quartz-commonj/src/main/java;${basedir}/quartz-jboss/src/main/java;${basedir}/quartz-jobs/src/main/java;${basedir}/quartz-oracle/src/main/java;${basedir}/quartz-plugins/src/main/java;${basedir}/quartz-weblogic/src/main/java</sourcepath>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>       
-        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>findbugs-maven-plugin</artifactId>
           <version>2.4.0</version>
@@ -216,7 +191,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <version>2.9.1</version>
-          <inherited>false</inherited>
           <dependencies>
             <dependency>
               <groupId>org.quartz-scheduler.internal</groupId>
@@ -243,7 +217,7 @@
               <id>run-checkstyle</id>
               <phase>verify</phase>
               <goals>
-                <goal>checkstyle-aggregate</goal>
+                <goal>checkstyle</goal>
               </goals>
             </execution>
           </executions>
@@ -261,10 +235,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>      
     </plugins>