mirror of https://github.com/apache/openjpa.git
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
This commit is contained in:
parent
3701538ff6
commit
799f48c54a
|
@ -60,7 +60,7 @@
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<createDependencyReducedPom>true</createDependencyReducedPom>
|
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||||
<createSourcesJar>true</createSourcesJar>
|
<createSourcesJar>${createSources}</createSourcesJar>
|
||||||
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
|
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
|
||||||
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
|
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
|
||||||
<!--
|
<!--
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<createDependencyReducedPom>true</createDependencyReducedPom>
|
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||||
<createSourcesJar>true</createSourcesJar>
|
<createSourcesJar>${createSources}</createSourcesJar>
|
||||||
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
|
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
|
||||||
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
|
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
|
||||||
<!--
|
<!--
|
||||||
|
|
32
pom.xml
32
pom.xml
|
@ -63,6 +63,9 @@
|
||||||
anything else allows the test to execute normally
|
anything else allows the test to execute normally
|
||||||
-->
|
-->
|
||||||
<tests.openjpa.allowfailure>ignore</tests.openjpa.allowfailure>
|
<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 -->
|
<!-- common JDBC driver versions -->
|
||||||
<derby.version>10.5.3.0_1</derby.version>
|
<derby.version>10.5.3.0_1</derby.version>
|
||||||
<hsqldb.version>1.8.0.10</hsqldb.version>
|
<hsqldb.version>1.8.0.10</hsqldb.version>
|
||||||
|
@ -154,7 +157,6 @@
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
|
|
||||||
<!-- ================ -->
|
<!-- ================ -->
|
||||||
<!-- Build Profiles -->
|
<!-- Build Profiles -->
|
||||||
<!-- ================ -->
|
<!-- ================ -->
|
||||||
|
@ -310,20 +312,6 @@
|
||||||
</excludes>
|
</excludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</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>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
@ -1022,6 +1010,20 @@
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-remote-resources-plugin</artifactId>
|
<artifactId>maven-remote-resources-plugin</artifactId>
|
||||||
</plugin>
|
</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>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>ianal-maven-plugin</artifactId>
|
<artifactId>ianal-maven-plugin</artifactId>
|
||||||
|
|
Loading…
Reference in New Issue