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

OPENJPA-1712 Merge in build updates from 2.0.x branch 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@989256 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-08-25 17:46:12 +00:00
parent 581494293a
commit c772a6f26d
7 changed files with 269 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openjpa-all/pom.xml
View File

@ -38,19 +38,21 @@
<build> <build>
<plugins> <plugins>
<!-- <!-- disable creating javadoc for this module -->
Need to disable source plugin here, as it overwrites the shade <plugin>
plugin created sources jar. <groupId>org.apache.maven.plugins</groupId>
--> <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<!-- disable creating source jars for this module -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<executions> <configuration>
<execution> <attach>false</attach>
<id>attach-sources</id> </configuration>
<phase>none</phase>
</execution>
</executions>
</plugin> </plugin>
<!-- <!--
Need to disable jar plugin here, as it overwrites the shade Need to disable jar plugin here, as it overwrites the shade
@ -61,11 +63,12 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>attach-tests</id> <id>default-jar</id>
<phase>none</phase> <phase>none</phase>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- Create our aggregate all JAR --> <!-- Create our aggregate all JAR -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

13
openjpa-integration/pom.xml
View File

@ -44,4 +44,17 @@
<module>validation</module> <module>validation</module>
<module>jmx</module> <module>jmx</module>
</modules> </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>
</build>
</project> </project>

39
openjpa-persistence-locking/pom.xml
View File

@ -692,7 +692,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-testsupport</artifactId> <artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
@ -713,8 +713,45 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<!-- disable creating javadoc for this module -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<!-- Extract the common test support files from o-p-j-tests.jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>test-compile</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<includes>org/apache/openjpa/persistence/test/*.class</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>

117
openjpa-testsupport/pom.xml
View File

@ -1,117 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
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
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<!--
Please keep the project tag on one line to avoid confusing
the release plugin.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-testsupport</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Test Support Jar</name>
<dependencies>
<!-- make sure we build after o-p-j -->
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<!-- need a depend on o-p-j tests jar -->
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta-regexp</groupId>
<artifactId>jakarta-regexp</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<!--
Manually build a subset jar of o-p-j-tests.jar
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>extract-jar</id>
<phase>test-compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<unjar overwrite="true" dest="${project.build.testOutputDirectory}">
<fileset dir="${basedir}/../openjpa-persistence-jdbc">
<include name="target/openjpa-persistence-jdbc-${project.version}-tests.jar" />
</fileset>
</unjar>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<includes>
<!-- Note: Including entities in this jar will
cause problems for any modules that need
to enhance their own entities.
-->
<include>org/apache/openjpa/persistence/test/*.class</include>
<include>META-INF/LICENSE*</include>
<include>META-INF/NOTICE*</include>
<include>META-INF/persistence.xml</include>
</includes>
</configuration>
</plugin>
<!-- Don't run any of the extracted tests here... -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>**</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>

29
openjpa-xmlstore/pom.xml
View File

@ -50,7 +50,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-testsupport</artifactId> <artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
@ -59,6 +59,33 @@
<build> <build>
<plugins> <plugins>
<!-- Extract the common test support files from o-p-j-tests.jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>test-compile</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<includes>org/apache/openjpa/persistence/test/*.class</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<!-- new way of using openjpa-maven-plugin to enhance classes --> <!-- new way of using openjpa-maven-plugin to enhance classes -->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>

22
openjpa/pom.xml
View File

@ -37,19 +37,21 @@
<build> <build>
<plugins> <plugins>
<!-- <!-- disable creating javadoc for this module -->
Need to disable source plugin here, as it overwrites the shade <plugin>
plugin created sources jar. <groupId>org.apache.maven.plugins</groupId>
--> <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<!-- disable creating source jars for this module -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<executions> <configuration>
<execution> <attach>false</attach>
<id>attach-sources</id> </configuration>
<phase>none</phase>
</execution>
</executions>
</plugin> </plugin>
<!-- Create our aggregate JAR --> <!-- Create our aggregate JAR -->

271
pom.xml
View File

@ -76,6 +76,19 @@
<slf4jVersion>1.6.1</slf4jVersion> <slf4jVersion>1.6.1</slf4jVersion>
</properties> </properties>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
<url>http://openjpa.apache.org</url> <url>http://openjpa.apache.org</url>
<issueManagement> <issueManagement>
@ -83,6 +96,11 @@
<url>http://issues.apache.org/jira/browse/OPENJPA</url> <url>http://issues.apache.org/jira/browse/OPENJPA</url>
</issueManagement> </issueManagement>
<ciManagement>
<system>Hudson</system>
<url>https://hudson.apache.org/hudson/job/OpenJPA-trunk-deploy/</url>
</ciManagement>
<inceptionYear>2006</inceptionYear> <inceptionYear>2006</inceptionYear>
<mailingLists> <mailingLists>
@ -128,7 +146,6 @@
<module>openjpa-jdbc</module> <module>openjpa-jdbc</module>
<module>openjpa-persistence</module> <module>openjpa-persistence</module>
<module>openjpa-persistence-jdbc</module> <module>openjpa-persistence-jdbc</module>
<module>openjpa-testsupport</module>
<module>openjpa-persistence-locking</module> <module>openjpa-persistence-locking</module>
<module>openjpa-xmlstore</module> <module>openjpa-xmlstore</module>
<module>openjpa-slice</module> <module>openjpa-slice</module>
@ -144,11 +161,53 @@
<!-- Build Profiles --> <!-- Build Profiles -->
<!-- ================ --> <!-- ================ -->
<!-- Release profile is inherited from parent apache-7.pom <!-- Override some release settings inherited from apache-7.pom -->
<profile> <profile>
<id>apache-release</id> <id>apache-release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
<excludes>
<!-- comments are usupported in services files -->
<exclude>**/javax.persistence.spi.PersistenceProvider</exclude>
<exclude>**/javax.annotation.processing.Processor</exclude>
<!-- comments are usupported by our rsrc parser -->
<exclude>**/*.rsrc</exclude>
<!-- comments are usupported in these files -->
<exclude>**/org.apache.openjpa.revision.properties</exclude>
<exclude>scripts/*.list</exclude>
<exclude>scripts/*.options</exclude>
<exclude>scripts/*.dict</exclude>
<!-- generated content -->
<exclude>**/.*/**</exclude>
<exclude>**/target/**/*</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/*.log</exclude>
<exclude>**/maven-eclipse.xml</exclude>
<exclude>**/rat.txt</exclude>
<exclude>release.properties</exclude>
<exclude>DEPENDENCIES</exclude>
<!-- Exclude internal build-only repository -->
<exclude>**/internal-repository/**</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
-->
<profile> <profile>
<id>sign-release</id> <id>sign-release</id>
@ -580,60 +639,37 @@
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
</testResource>
</testResources>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!-- apache-7.pom default of 2.0.2 fails for JDK5 testing --> <!-- apache-7.pom default of 2.0.2 fails for JDK5 testing -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.1</version> <version>2.3.1</version>
<configuration> <configuration>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<phase>process-classes</phase>
<goals>
<goal>javadoc</goal>
</goals>
<configuration>
<additionalparam>
${javadoc.additionalparam}
</additionalparam>
<aggregate>true</aggregate>
<subpackages>org.apache.openjpa</subpackages>
<!-- <linksource>true</linksource> -->
<verbose>false</verbose>
<maxmemory>512m</maxmemory>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://java.sun.com/javaee/6/docs/api</link>
<link>http://jakarta.apache.org/commons/collections/api-release</link>
</links>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version> <version>2.6</version>
<configuration> <configuration>
<argLine>${surefire.jvm.args}</argLine> <argLine>${surefire.jvm.args}</argLine>
<useFile>false</useFile> <useFile>false</useFile>
@ -672,41 +708,11 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<version>0.7</version> <version>0.7</version>
<executions> </plugin>
<execution> <plugin>
<phase>verify</phase> <groupId>org.apache.maven.plugins</groupId>
<goals> <artifactId>maven-dependency-plugin</artifactId>
<goal>check</goal> <version>2.1</version>
</goals>
</execution>
</executions>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
<excludes>
<!-- comments are usupported in services files -->
<exclude>**/javax.persistence.spi.PersistenceProvider</exclude>
<exclude>**/javax.annotation.processing.Processor</exclude>
<!-- comments are usupported by our rsrc parser -->
<exclude>**/*.rsrc</exclude>
<!-- comments are usupported in these files -->
<exclude>**/org.apache.openjpa.revision.properties</exclude>
<exclude>scripts/*.list</exclude>
<exclude>scripts/*.options</exclude>
<exclude>scripts/*.dict</exclude>
<!-- generated content -->
<exclude>**/.*/**</exclude>
<exclude>**/target/**/*</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/*.log</exclude>
<exclude>**/maven-eclipse.xml</exclude>
<exclude>**/rat.txt</exclude>
<exclude>release.properties</exclude>
<exclude>DEPENDENCIES</exclude>
<!-- Exclude internal build-only repository -->
<exclude>**/internal-repository/**</exclude>
</excludes>
</configuration>
</plugin> </plugin>
<!-- inherited from apache-7.pom, but need config updates --> <!-- inherited from apache-7.pom, but need config updates -->
<plugin> <plugin>
@ -715,7 +721,7 @@
<configuration> <configuration>
<useReleaseProfile>false</useReleaseProfile> <useReleaseProfile>false</useReleaseProfile>
<goals>deploy site site-deploy</goals> <goals>deploy site site-deploy</goals>
<arguments>-Papache-release,docbook-profile,test-derby -DskipTests</arguments> <arguments>-Papache-release,docbook-profile,test-derby,bval -DskipTests</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules> <autoVersionSubmodules>true</autoVersionSubmodules>
</configuration> </configuration>
</plugin> </plugin>
@ -815,6 +821,42 @@
<artifactId>openjpa-maven-plugin</artifactId> <artifactId>openjpa-maven-plugin</artifactId>
<version>1.1</version> <version>1.1</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
<executions>
<execution>
<id>attach-javadoc</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<phase>process-classes</phase>
<goals>
<goal>javadoc</goal>
</goals>
<configuration>
<additionalparam>
${javadoc.additionalparam}
</additionalparam>
<aggregate>true</aggregate>
<subpackages>org.apache.openjpa</subpackages>
<verbose>false</verbose>
<maxmemory>512m</maxmemory>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://java.sun.com/javaee/6/docs/api</link>
<link>http://jakarta.apache.org/commons/collections/api-release</link>
</links>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
@ -894,6 +936,37 @@
<plugin> <plugin>
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
<excludes>
<!-- generated content -->
<exclude>**/.*/**</exclude>
<exclude>**/target/**/*</exclude>
</excludes>
<includes>
<!-- only check common source files -->
<include>**/src/**/*.bat</include>
<include>**/src/**/*.css</include>
<include>**/src/**/*.html</include>
<include>**/src/**/*.java</include>
<include>**/src/**/*.js</include>
<include>**/src/**/*.jsp</include>
<include>**/src/**/*.properties</include>
<include>**/src/**/*.sh</include>
<include>**/src/**/*.txt</include>
<include>**/src/**/*.vm</include>
<include>**/src/**/*.xml</include>
</includes>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -904,28 +977,25 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1.1</version> <version>2.1.1</version>
<reportSets>
<reportSet>
<reports>
<report>jdepend-maven-plugin</report>
<!-- <report>jxr-maven-plugin</report> -->
<report>surefire-report-maven-plugin</report>
<report>maven-javadoc-plugin</report>
<report>mailing-list</report>
<report>issue-tracking</report>
<report>license</report>
</reports>
</reportSet>
</reportSets>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.6</version>
<configuration>
<show>package</show>
<quiet>true</quiet>
<source>1.5</source>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://java.sun.com/javaee/6/docs/api</link>
<link>http://jakarta.apache.org/commons/collections/api-release</link>
</links>
</configuration>
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>
<report>javadoc</report> <report>javadoc</report>
<report>test-javadoc</report>
</reports> </reports>
</reportSet> </reportSet>
</reportSets> </reportSets>
@ -936,21 +1006,8 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId> <artifactId>jdepend-maven-plugin</artifactId>
</plugin> <version>2.0-beta-2</version>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.2</version>
<configuration>
<configLocation>${checkstyle.config.location}</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<excludes>**/*_.java</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>