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> <packaging>jar</packaging>
<name>OpenJPA Aggregate Jar with Dependencies</name> <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> <build>
<plugins> <plugins>
<!-- disable creating javadoc for this module --> <!-- disable creating javadoc for this module -->
@ -98,7 +81,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>
<!-- <!--
@ -133,4 +116,21 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </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> </project>

23
openjpa-integration/pom.xml
View File

@ -44,15 +44,18 @@
</modules> </modules>
<build> <build>
<plugins> <pluginManagement>
<!-- disable creating javadoc for these modules --> <plugins>
<plugin> <!-- disable creating javadoc for these modules -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<configuration> <artifactId>maven-javadoc-plugin</artifactId>
<skip>true</skip> <configuration>
</configuration> <skip>true</skip>
</plugin> </configuration>
</plugins> <inherited>true</inherited>
</plugin>
</plugins>
</pluginManagement>
</build> </build>
</project> </project>

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

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

2
openjpa/pom.xml
View File

@ -66,7 +66,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>
<!-- <!--

36
pom.xml
View File

@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance "License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -65,6 +65,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>
@ -250,7 +253,7 @@
<profile> <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 mvn process-resources -Dtest=false -Pjavadoc-profile
--> -->
<id>javadoc-profile</id> <id>javadoc-profile</id>
@ -590,14 +593,28 @@
<artifactId>jmock-junit3</artifactId> <artifactId>jmock-junit3</artifactId>
<version>2.5.1</version> <version>2.5.1</version>
</dependency> </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> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>net.sourceforge.findbugs</groupId>
<artifactId>annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -821,6 +838,11 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.1</version>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@ -835,6 +857,7 @@
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
<phase>${createSource}</phase>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
<goal>test-jar</goal> <goal>test-jar</goal>
@ -954,11 +977,14 @@
<reportSet> <reportSet>
<reports> <reports>
<report>javadoc</report> <report>javadoc</report>
<report>test-javadoc</report>
</reports> </reports>
</reportSet> </reportSet>
</reportSets> </reportSets>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId> <artifactId>jdepend-maven-plugin</artifactId>