From 799f48c54a888d4696c42005000a1327751fa88e Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Tue, 23 Mar 2010 15:00:12 +0000
Subject: [PATCH] merge in fix for source jar generation from 2.0.x branch. 
 Developers can still turn off source jar generation for local builds by
 setting -DcreateSource=none and -DcreateSources=false

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@926606 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-all/pom.xml |  2 +-
 openjpa/pom.xml     |  2 +-
 pom.xml             | 32 +++++++++++++++++---------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index 36d76b3b8..936f9934a 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -60,7 +60,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <createSourcesJar>true</createSourcesJar>
+                            <createSourcesJar>${createSources}</createSourcesJar>
                             <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <!-- 
diff --git a/openjpa/pom.xml b/openjpa/pom.xml
index d01683612..4ff298b1a 100644
--- a/openjpa/pom.xml
+++ b/openjpa/pom.xml
@@ -60,7 +60,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 026963a4e..3b74c4aae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,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>
@@ -154,7 +157,6 @@
     </modules>
 
     <profiles>
-
         <!-- ================ -->
         <!--  Build Profiles  -->
         <!-- ================ -->
@@ -310,20 +312,6 @@
                                 </excludes>
                             </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -1022,6 +1010,20 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-remote-resources-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>${createSource}</phase>
+                        <goals>
+                            <goal>jar</goal>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>ianal-maven-plugin</artifactId>