mirror of https://github.com/apache/openjpa.git
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
This commit is contained in:
Donald Woods
parent
d85b6191bb
commit
fbdcce9b5b
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
</modules>
|
||||
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<!-- disable creating javadoc for these modules -->
|
||||
<plugin>
|
||||
|
|
@ -52,7 +53,9 @@
|
|||
<configuration>
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
<inherited>true</inherited>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@
|
|||
<excludes>
|
||||
<exclude>**/target/**</exclude>
|
||||
<exclude>**/*.log</exclude>
|
||||
<exclude>**/.*</exclude>
|
||||
<exclude>**/.*/**</exclude>
|
||||
</excludes>
|
||||
</fileSet>
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
</goals>
|
||||
<configuration>
|
||||
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||
<createSourcesJar>true</createSourcesJar>
|
||||
<createSourcesJar>${createSources}</createSourcesJar>
|
||||
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
|
||||
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
|
||||
<!--
|
||||
|
|
|
|||
32
pom.xml
32
pom.xml
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue