From fbdcce9b5b468627784a48643de210b48298ba9b Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Wed, 25 Aug 2010 17:37:04 +0000
Subject: [PATCH] OPENJPA-1712 Add createSource options back in and remove
 test-javadoc reports which we don't need and take way too long to build

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@989243 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-all/pom.xml                 | 36 ++++++++++++++---------------
 openjpa-integration/pom.xml         | 23 ++++++++++--------
 openjpa-project/source-assembly.xml |  2 ++
 openjpa/pom.xml                     |  2 +-
 pom.xml                             | 36 +++++++++++++++++++++++++----
 5 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index f235874ce..e9b7c6062 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -36,23 +36,6 @@
     <packaging>jar</packaging>
     <name>OpenJPA Aggregate Jar with Dependencies</name>
 
-    <dependencies>
-        <!--
-            Start with openjpa.jar and let the maven-shade-plugin
-            determine the transitive dependencies to include from it.
-        -->
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- include commons-logging -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <!-- disable creating javadoc for this module -->
@@ -98,7 +81,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <createSourcesJar>true</createSourcesJar>
+                            <createSourcesJar>${createSources}</createSourcesJar>
                             <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <!-- 
@@ -133,4 +116,21 @@
             </plugin>
         </plugins>
     </build>
+
+    <dependencies>
+        <!--
+            Start with openjpa.jar and let the maven-shade-plugin
+            determine the transitive dependencies to include from it.
+        -->
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- include commons-logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/openjpa-integration/pom.xml b/openjpa-integration/pom.xml
index 0974b955d..4c3a9321c 100644
--- a/openjpa-integration/pom.xml
+++ b/openjpa-integration/pom.xml
@@ -44,15 +44,18 @@
     </modules>
 
     <build>
-        <plugins>
-            <!-- disable creating javadoc for these modules -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
+        <pluginManagement>
+            <plugins>
+                <!-- disable creating javadoc for these modules -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                    <inherited>true</inherited>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 </project>
diff --git a/openjpa-project/source-assembly.xml b/openjpa-project/source-assembly.xml
index d17aff015..8c062fa71 100644
--- a/openjpa-project/source-assembly.xml
+++ b/openjpa-project/source-assembly.xml
@@ -36,6 +36,8 @@
             <excludes>
                 <exclude>**/target/**</exclude>
                 <exclude>**/*.log</exclude>
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
             </excludes>
         </fileSet>
 
diff --git a/openjpa/pom.xml b/openjpa/pom.xml
index c5a1b127e..1e7279c1e 100644
--- a/openjpa/pom.xml
+++ b/openjpa/pom.xml
@@ -66,7 +66,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <createSourcesJar>true</createSourcesJar>
+                            <createSourcesJar>${createSources}</createSourcesJar>
                             <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <!--
diff --git a/pom.xml b/pom.xml
index 5ce193b10..8087499b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,9 @@
  to you under the Apache License, Version 2.0 (the
  "License"); you may not use this file except in compliance
  with the License.  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing,
  software distributed under the License is distributed on an
  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -65,6 +65,9 @@
              anything else allows the test to execute normally
         -->
         <tests.openjpa.allowfailure>ignore</tests.openjpa.allowfailure>
+        <!--turn off sources.jar generation by setting to none and false -->
+        <createSource>verify</createSource>
+        <createSources>true</createSources>
         <!-- common JDBC driver versions -->
         <derby.version>10.5.3.0_1</derby.version>
         <hsqldb.version>1.8.0.10</hsqldb.version>
@@ -250,7 +253,7 @@
 
         <profile>
             <!--                        
-                Aggregate Javadoc profile. Docs can be built by running:
+                Javadoc profile. Docs can be built by running:
                     mvn process-resources -Dtest=false -Pjavadoc-profile
             -->  
             <id>javadoc-profile</id>
@@ -590,14 +593,28 @@
                 <artifactId>jmock-junit3</artifactId>
                 <version>2.5.1</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.1</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sourceforge.findbugs</groupId>
+                <artifactId>annotations</artifactId>
+                <version>1.3.2</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>net.sourceforge.findbugs</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -821,6 +838,11 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>findbugs-maven-plugin</artifactId>
+                    <version>2.3.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -835,6 +857,7 @@
                 <executions>
                     <execution>
                         <id>attach-sources</id>
+                        <phase>${createSource}</phase>
                         <goals>
                             <goal>jar</goal>
                             <goal>test-jar</goal>
@@ -954,11 +977,14 @@
                     <reportSet>
                         <reports>
                             <report>javadoc</report>
-                            <report>test-javadoc</report>
                         </reports>
                     </reportSet>
                 </reportSets>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jdepend-maven-plugin</artifactId>