You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/03/23 16:00:13 UTC
svn commit: r926606 - in /openjpa/trunk: openjpa-all/pom.xml openjpa/pom.xml
pom.xml
Author: dwoods
Date: Tue Mar 23 15:00:12 2010
New Revision: 926606
URL: http://svn.apache.org/viewvc?rev=926606&view=rev
Log:
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
Modified:
openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=926606&r1=926605&r2=926606&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Tue Mar 23 15:00:12 2010
@@ -60,7 +60,7 @@
</goals>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
- <createSourcesJar>true</createSourcesJar>
+ <createSourcesJar>${createSources}</createSourcesJar>
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<!--
Modified: openjpa/trunk/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=926606&r1=926605&r2=926606&view=diff
==============================================================================
--- openjpa/trunk/openjpa/pom.xml (original)
+++ openjpa/trunk/openjpa/pom.xml Tue Mar 23 15:00:12 2010
@@ -60,7 +60,7 @@
</goals>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
- <createSourcesJar>true</createSourcesJar>
+ <createSourcesJar>${createSources}</createSourcesJar>
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<!--
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=926606&r1=926605&r2=926606&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Tue Mar 23 15:00:12 2010
@@ -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>
@@ -1023,6 +1011,20 @@
<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>
<executions>