Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 2010-08-25 17:37:04 +00:00
parent d85b6191bb
commit fbdcce9b5b
5 changed files with 65 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
openjpa-all/pom.xml
View File

@ -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>

23
openjpa-integration/pom.xml
View File

@ -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>

2
openjpa-project/source-assembly.xml
View File

@ -36,6 +36,8 @@
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/*.log</exclude>
<exclude>**/.*</exclude>
<exclude>**/.*/**</exclude>
</excludes>
</fileSet>

2
openjpa/pom.xml
View File

@ -66,7 +66,7 @@
</goals>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
<createSourcesJar>true</createSourcesJar>
<createSourcesJar>${createSources}</createSourcesJar>
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<!--

36
pom.xml
View File

@ -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>