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

OPENJPA-633 updating pom.xml files to be compatible with the maven-release-plugin. There are a lot of formatting changes which are needed to prevent the plugin from removing our copyright header. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@666731 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Dick 2008-06-11 16:48:56 +00:00
parent 545c6732c8
commit 981c023e0e
14 changed files with 306 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openjpa-all/pom.xml
View File

@ -17,10 +17,11 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Please keep the project tag on one line to avoid confusing
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 the release plugin.
http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>openjpa</artifactId> <artifactId>openjpa</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -48,11 +49,10 @@
<phase>process-classes</phase> <phase>process-classes</phase>
<configuration> <configuration>
<tasks> <tasks>
<unjar overwrite="false" <unjar overwrite="false" dest="${basedir}/target/classes">
dest="${basedir}/target/classes">
<fileset dir="${basedir}/.."> <fileset dir="${basedir}/..">
<include name="*/target/openjpa-*.jar"/> <include name="*/target/openjpa-*.jar" />
<exclude name="*/target/openjpa-examples-*.jar"/> <exclude name="*/target/openjpa-examples-*.jar" />
</fileset> </fileset>
</unjar> </unjar>
@ -61,18 +61,18 @@
resources so they are aggregated resources so they are aggregated
--> -->
<macrodef name="aggregate-file"> <macrodef name="aggregate-file">
<attribute name="servicename"/> <attribute name="servicename" />
<sequential> <sequential>
<echo>Building service: @{servicename}</echo> <echo>Building service: @{servicename}</echo>
<concat destfile="${basedir}/target/classes/META-INF/services/@{servicename}"> <concat destfile="${basedir}/target/classes/META-INF/services/@{servicename}">
<fileset dir="${basedir}/.." includes="*/src/main/resources/META-INF/services/@{servicename}"/> <fileset dir="${basedir}/.." includes="*/src/main/resources/META-INF/services/@{servicename}" />
</concat> </concat>
</sequential> </sequential>
</macrodef> </macrodef>
<aggregate-file servicename="org.apache.openjpa.lib.conf.ProductDerivation"/> <aggregate-file servicename="org.apache.openjpa.lib.conf.ProductDerivation" />
<aggregate-file servicename="javax.persistence.spi.PersistenceProvider"/> <aggregate-file servicename="javax.persistence.spi.PersistenceProvider" />
<aggregate-file servicename="org.apache.openjpa.kernel.exps.ExpressionParser"/> <aggregate-file servicename="org.apache.openjpa.kernel.exps.ExpressionParser" />
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>

28
openjpa-examples/pom.xml
View File

@ -17,9 +17,11 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Please keep the project tag on one line to avoid confusing
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-examples</artifactId> <artifactId>openjpa-examples</artifactId>
@ -81,21 +83,19 @@
<configuration> <configuration>
<tasks> <tasks>
<path id="cp"> <path id="cp">
<path refid="maven.test.classpath"/> <path refid="maven.test.classpath" />
<path refid="maven.compile.classpath"/> <path refid="maven.compile.classpath" />
<path refid="maven.dependency.classpath"/> <path refid="maven.dependency.classpath" />
</path> </path>
<taskdef name="openjpac" classname= <taskdef name="openjpac" classname= "org.apache.openjpa.ant.PCEnhancerTask">
"org.apache.openjpa.ant.PCEnhancerTask"> <classpath refid="cp" />
<classpath refid="cp"/>
</taskdef> </taskdef>
<fileset id="enhance.path.ref" <fileset id="enhance.path.ref" dir="${project.build.testOutputDirectory}">
dir="${project.build.testOutputDirectory}"> <include name="**/*.class" />
<include name="**/*.class"/>
</fileset> </fileset>
<openjpac> <openjpac>
<classpath refid="cp"/> <classpath refid="cp" />
<fileset refid="enhance.path.ref"/> <fileset refid="enhance.path.ref" />
</openjpac> </openjpac>
</tasks> </tasks>
</configuration> </configuration>

28
openjpa-integration/examples/pom.xml
View File

@ -26,10 +26,11 @@
mvn integration-test -Pexamples-profile mvn integration-test -Pexamples-profile
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Please keep the project tag on one line to avoid confusing
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 the release plugin.
http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>examples</artifactId> <artifactId>examples</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -55,29 +56,23 @@
<tasks> <tasks>
<echo>Running OpenJPA Examples</echo> <echo>Running OpenJPA Examples</echo>
<property name="examples.base" <property name="examples.base" value="${basedir}/target/examples" />
value="${basedir}/target/examples"/> <mkdir dir="${examples.base}" />
<mkdir dir="${examples.base}"/>
<unzip overwrite="false" dest="${examples.base}" <unzip overwrite="false" dest="${examples.base}" src="../../target/site/downloads/apache-openjpa-${pom.version}-binary.zip" />
src="../../target/site/downloads/apache-openjpa-${pom.version}-binary.zip"/>
<path id="assembly.classpath"> <path id="assembly.classpath">
<fileset dir="${examples.base}"> <fileset dir="${examples.base}">
<include name="**/*.jar"/> <include name="**/*.jar" />
</fileset> </fileset>
</path> </path>
<available <available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
classname="org.apache.openjpa.conf.OpenJPAVersion"
classpathref="assembly.classpath"
property="unzip.success"/>
<fail unless="unzip.success"> <fail unless="unzip.success">
Could not extract assembly. Could not extract assembly.
</fail> </fail>
<subant inheritAll="false" failonerror="true"> <subant inheritAll="false" failonerror="true">
<fileset dir="${examples.base}" <fileset dir="${examples.base}" includes="*/examples/*/build.xml" />
includes="*/examples/*/build.xml"/>
</subant> </subant>
</tasks> </tasks>
@ -101,4 +96,3 @@
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

9
openjpa-integration/pom.xml
View File

@ -17,10 +17,11 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Please keep the project tag on one line to avoid confusing
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 the release plugin.
http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>openjpa-integration</artifactId> <artifactId>openjpa-integration</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>

149
openjpa-integration/tck/pom.xml
View File

@ -49,10 +49,11 @@
5. Run the TCK script 5. Run the TCK script
6. Parse the TCK result log to determine whether to fail the build or not 6. Parse the TCK result log to determine whether to fail the build or not
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Please keep the project tag on one line to avoid confusing
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 the release plugin.
http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>tck</artifactId> <artifactId>tck</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -78,57 +79,49 @@
<tasks> <tasks>
<echo>Running Sun JPA TCK</echo> <echo>Running Sun JPA TCK</echo>
<property name="tck.zip" value= <property name="tck.zip" value="${settings.localRepository}/../privaterepos/jpa-1_0b-tck.zip" />
"${settings.localRepository}/../privaterepos/jpa-1_0b-tck.zip"/> <available property="tck.available" file="${tck.zip}" />
<available property="tck.available" file="${tck.zip}"/>
<fail unless="tck.available">The TCK file ${tck.zip} does not exist. This file must be downloaded separately in order to be able to run the JPA TCK</fail> <fail unless="tck.available">The TCK file ${tck.zip} does not exist. This file must be downloaded separately in order to be able to run the JPA TCK</fail>
<available property="tck.available" file="${tck.zip}"/> <available property="tck.available" file="${tck.zip}" />
<fail unless="tck.available">The TCK file specific in the "tck.zip" system property (${tck.zip}) does not exist. This file must be downloaded separately in order to be able to run the JPA TCK</fail> <fail unless="tck.available">The TCK file specific in the "tck.zip" system property (${tck.zip}) does not exist. This file must be downloaded separately in order to be able to run the JPA TCK</fail>
<property name="tck.base" <property name="tck.base" value="${basedir}/target/tck" />
value="${basedir}/target/tck"/> <property name="tck.dir" value="${tck.base}/jpatck" />
<property name="tck.dir" value="${tck.base}/jpatck"/>
<delete dir="${tck.dir}"/> <delete dir="${tck.dir}" />
<unzip overwrite="false" <unzip overwrite="false" src="${tck.zip}" dest="${tck.base}" />
src="${tck.zip}" dest="${tck.base}"/>
<path id="cp"> <path id="cp">
<path refid="maven.compile.classpath"/> <path refid="maven.compile.classpath" />
<!-- use official JPA API instead of GM's --> <!-- use official JPA API instead of GM's -->
<fileset dir="${tck.dir}/lib"> <fileset dir="${tck.dir}/lib">
<include name="**/*.jar"/> <include name="**/*.jar" />
<exclude name="**/geronimo-jpa*"/> <exclude name="**/geronimo-jpa*" />
</fileset> </fileset>
<pathelement path="${java.class.path}"/> <pathelement path="${java.class.path}" />
<pathelement path="${db.jar}"/> <pathelement path="${db.jar}" />
</path> </path>
<pathconvert property="cp.property" refid="cp"/> <pathconvert property="cp.property" refid="cp" />
<property name="db.name" value="derby"/> <property name="db.name" value="derby" />
<property name="db.driver" <property name="db.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
value="org.apache.derby.jdbc.EmbeddedDriver"/> <property name="db.url" value="jdbc:derby:derby-database;create=true" />
<property name="db.url" <property name="db.username" value="nousername" />
value="jdbc:derby:derby-database;create=true"/> <property name="db.password" value="nopassword" />
<property name="db.username" value="nousername"/>
<property name="db.password" value="nopassword"/>
<property name="openjpa.log.level" value="WARN"/> <property name="openjpa.log.level" value="WARN" />
<property name="jpatck.pkg.dir" value="com"/> <property name="jpatck.pkg.dir" value="com" />
<property name="jpatck.test" value=""/> <property name="jpatck.test" value="" />
<property name="jpatck.work.dir" <property name="jpatck.work.dir" value="${tck.dir}/../work" />
value="${tck.dir}/../work"/> <property name="tck.log" value="${tck.base}/openjpa-tck.log" />
<property name="tck.log"
value="${tck.base}/openjpa-tck.log"/>
<property name="openjpa.properties" <property name="openjpa.properties" value="${tck.dir}/openjpa-provier.properties" />
value="${tck.dir}/openjpa-provier.properties"/>
<!-- create the OpenJPA properties for the TCK run --> <!-- create the OpenJPA properties for the TCK run -->
<echo append="false" file="${openjpa.properties}"> <echo append="false" file="${openjpa.properties}">
@ -146,8 +139,7 @@ openjpa.jdbc.SchemaFactory: native(ForeignKeys=true)
</echo> </echo>
<!-- Append OpenJPA-specific configuration --> <!-- Append OpenJPA-specific configuration -->
<property name="jpatck.config" <property name="jpatck.config" value="${tck.dir}/bin/ts.jte" />
value="${tck.dir}/bin/ts.jte"/>
<echo append="false" file="${jpatck.config}.tmp"> <echo append="false" file="${jpatck.config}.tmp">
@ -177,20 +169,18 @@ databaseName=${db.name}
<!-- convert backslashes and known paths with spaces <!-- convert backslashes and known paths with spaces
to get around a problem with the TCK testrunner to get around a problem with the TCK testrunner
on windows --> on windows -->
<replace summary="yes" file="${jpatck.config}.tmp" <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" />
replacefilterfile="windows-replacefilter.properties"/>
<concat append="true" destfile="${jpatck.config}"> <concat append="true" destfile="${jpatck.config}">
<fileset file="${jpatck.config}.tmp"/> <fileset file="${jpatck.config}.tmp" />
</concat> </concat>
<path id="agent.path"> <path id="agent.path">
<fileset dir="../../openjpa-all/target"> <fileset dir="../../openjpa-all/target">
<include name="*.jar"/> <include name="*.jar" />
</fileset> </fileset>
</path> </path>
<pathconvert dirsep="/" property="agent" <pathconvert dirsep="/" property="agent" refid="agent.path" />
refid="agent.path"/> <property name="agent.properties" value="" />
<property name="agent.properties" value=""/>
<echo>AGENT: ${agent}${agent.properties}</echo> <echo>AGENT: ${agent}${agent.properties}</echo>
<!-- <!--
@ -201,49 +191,39 @@ databaseName=${db.name}
persistent classes to work (like the SignatureTest) persistent classes to work (like the SignatureTest)
--> -->
<replace file="${jpatck.config}"> <replace file="${jpatck.config}">
<replacefilter token="-javaagent:${jpa.home}/lib/toplink-essentials-agent.jar" value="-javaagent:${agent}${agent.properties} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)"/> <replacefilter token="-javaagent:${jpa.home}/lib/toplink-essentials-agent.jar" value="-javaagent:${agent}${agent.properties} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)" />
</replace> </replace>
<!-- make a macro for the TCK harness launcher --> <!-- make a macro for the TCK harness launcher -->
<macrodef name="tsant"> <macrodef name="tsant">
<attribute name="buildfile"/> <attribute name="buildfile" />
<attribute name="target"/> <attribute name="target" />
<sequential> <sequential>
<java classname= <java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="true" dir="${tck.dir}/src" append="true" output="${tck.log}" timeout="7200000">
"org.apache.tools.ant.launch.Launcher" <arg value="-emacs" />
fork="true" failonerror="true" <arg value="-buildfile" />
dir="${tck.dir}/src" <arg value="@{buildfile}" />
append="true" <arg value="-listener" />
output="${tck.log}" <arg value="com.sun.ant.TSBuildListener" />
timeout="7200000"> <arg value="-logger" />
<arg value="-emacs"/> <arg value="com.sun.ant.TSLogger" />
<arg value="-buildfile"/> <arg value="@{target}" />
<arg value="@{buildfile}"/>
<arg value="-listener"/>
<arg value="com.sun.ant.TSBuildListener"/>
<arg value="-logger"/>
<arg value="com.sun.ant.TSLogger"/>
<arg value="@{target}"/>
<env key="TS_HOME" value=".."/> <env key="TS_HOME" value=".." />
<sysproperty key="ts.home" value=".."/> <sysproperty key="ts.home" value=".." />
<env key="ANT_HOME" <env key="ANT_HOME" value="${tck.dir}/tools/ant" />
value="${tck.dir}/tools/ant"/> <sysproperty key="ant.home" value="${tck.dir}/tools/ant" />
<sysproperty key="ant.home"
value="${tck.dir}/tools/ant"/>
<sysproperty key="pkg.dir" <sysproperty key="pkg.dir" value="${jpatck.pkg.dir}" />
value="${jpatck.pkg.dir}"/>
<!-- <!--
<sysproperty key="test" <sysproperty key="test" value="${jpatck.test}" />
value="${jpatck.test}"/>
--> -->
<classpath> <classpath>
<path refid="cp"/> <path refid="cp" />
<fileset dir="${tck.dir}/tools/ant/lib"> <fileset dir="${tck.dir}/tools/ant/lib">
<include name="**/*.jar"/> <include name="**/*.jar" />
</fileset> </fileset>
</classpath> </classpath>
</java> </java>
@ -253,32 +233,26 @@ databaseName=${db.name}
<echo>Logging JPA TCK output to ${tck.log}</echo> <echo>Logging JPA TCK output to ${tck.log}</echo>
<!-- first initialize the database --> <!-- first initialize the database -->
<tsant buildfile="${tck.dir}/bin/initdb.xml" <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />
target="init.database"/>
<!-- now run the TCK --> <!-- now run the TCK -->
<tsant buildfile="${tck.dir}/bin/build.xml" <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient" />
target="runclient"/>
<!-- <!--
The TCK's Java process doesn't actually fail when The TCK's Java process doesn't actually fail when
tests fail, so we need to parse the results file tests fail, so we need to parse the results file
for a string indicating whether or not it passed. for a string indicating whether or not it passed.
--> -->
<loadfile property="jpatck.results" <loadfile property="jpatck.results" srcfile="${jpatck.work.dir}/jtData/log.txt" />
srcfile="${jpatck.work.dir}/jtData/log.txt"/>
<condition property="jpatck.failed"> <condition property="jpatck.failed">
<contains string="${jpatck.results}" <contains string="${jpatck.results}" substring="Completed test run: not ok" />
substring="Completed test run: not ok"/>
</condition> </condition>
<fail if="jpatck.failed">Some tests failed</fail> <fail if="jpatck.failed">Some tests failed</fail>
<echo>JPA TCK Passed 100%!</echo> <echo>JPA TCK Passed 100%!</echo>
<property name="tck.results.archive" <property name="tck.results.archive" value="${tck.base}/openjpa-tck-results.zip" />
value="${tck.base}/openjpa-tck-results.zip"/> <zip destfile="${tck.results.archive}" basedir="${jpatck.work.dir}" />
<zip destfile="${tck.results.archive}"
basedir="${jpatck.work.dir}"/>
<echo>Results archive at: ${tck.results.archive}</echo> <echo>Results archive at: ${tck.results.archive}</echo>
</tasks> </tasks>
@ -323,4 +297,3 @@ databaseName=${db.name}
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

7
openjpa-jdbc/pom.xml
View File

@ -17,9 +17,10 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Maven release plugin requires the project tag to be on a single line.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId> <artifactId>openjpa-jdbc</artifactId>

71
openjpa-kernel/pom.xml
View File

@ -17,9 +17,10 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Maven release plugin requires the project tag to be on a single line.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId> <artifactId>openjpa-kernel</artifactId>
@ -52,14 +53,14 @@
<dependency> <dependency>
<groupId>commons-pool</groupId> <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ibm.websphere</groupId> <groupId>com.ibm.websphere</groupId>
<artifactId>websphere_uow_api</artifactId> <artifactId>websphere_uow_api</artifactId>
<version>0.0.1</version> <version>0.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
@ -124,8 +125,7 @@
<phase>process-classes</phase> <phase>process-classes</phase>
<configuration> <configuration>
<tasks> <tasks>
<java <java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>
@ -137,9 +137,8 @@
<phase>process-classes</phase> <phase>process-classes</phase>
<configuration> <configuration>
<tasks> <tasks>
<java <java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath"> <arg line="-utils 5" />
<arg line="-utils 5"/>
</java> </java>
</tasks> </tasks>
</configuration> </configuration>
@ -148,27 +147,27 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.2</version> <version>2.2</version>
<configuration> <configuration>
<excludes> <excludes>
<exclude>**/com/ibm/**</exclude> <exclude>**/com/ibm/**</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
<!-- <!--
Internal (in SVN) repository which contains jar files that are not Internal (in SVN) repository which contains jar files that are not
publicly available and cannot be re-distributed. publicly available and cannot be re-distributed.
--> -->
<repository> <repository>
<id>openjpa-internal</id> <id>openjpa-internal</id>
<name>Internal repository</name> <name>Internal repository</name>
<url>file://${basedir}/internal-repository</url> <url>file://${basedir}/internal-repository</url>
</repository> </repository>
</repositories> </repositories>
</project> </project>

38
openjpa-lib/pom.xml
View File

@ -17,9 +17,10 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Maven release plugin requires the project tag to be on a single line.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId> <artifactId>openjpa-lib</artifactId>
@ -96,8 +97,7 @@
<phase>process-classes</phase> <phase>process-classes</phase>
<configuration> <configuration>
<tasks> <tasks>
<delete failonerror="true" <delete failonerror="true" dir="${project.build.outputDirectory}/sun/" />
dir="${project.build.outputDirectory}/sun/"/>
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>
@ -109,33 +109,25 @@
<phase>compile</phase> <phase>compile</phase>
<configuration> <configuration>
<tasks> <tasks>
<property name="tmpdir" <property name="tmpdir" value="${java.io.tmpdir}/openjpamvntmp" />
value="${java.io.tmpdir}/openjpamvntmp"/> <condition property="outdir" value="${project.build.outputDirectory}">
<condition property="outdir" <available type="dir" file="${project.build.outputDirectory}" />
value="${project.build.outputDirectory}">
<available type="dir"
file="${project.build.outputDirectory}"/>
</condition> </condition>
<property name="outdir" value="${tmpdir}"/> <property name="outdir" value="${tmpdir}" />
<property name="svnversion.executable" <property name="svnversion.executable" value="svnversion" />
value="svnversion"/> <exec outputproperty="subversion.revision" failonerror="false" failifexecutionfails="false" executable="${svnversion.executable}">
<exec outputproperty="subversion.revision" <arg line="-c ${basedir}/.." />
failonerror="false"
failifexecutionfails="false"
executable="${svnversion.executable}">
<arg line="-c ${basedir}/.."/>
</exec> </exec>
<property name="subversion.revision" <property name="subversion.revision" value="unknown" />
value="unknown"/>
<echo>Revision: ${subversion.revision}</echo> <echo>Revision: ${subversion.revision}</echo>
<echo>OpenJPA version: ${project.version}</echo> <echo>OpenJPA version: ${project.version}</echo>
<mkdir dir="${outdir}/META-INF"/> <mkdir dir="${outdir}/META-INF" />
<echo file="${outdir}/META-INF/org.apache.openjpa.revision.properties">revision.number=${subversion.revision} <echo file="${outdir}/META-INF/org.apache.openjpa.revision.properties">revision.number=${subversion.revision}
openjpa.version=${project.version}</echo> openjpa.version=${project.version}</echo>
<delete dir="${tmpdir}"/> <delete dir="${tmpdir}" />
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>

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

@ -17,9 +17,10 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Maven release plugin requires the project tag to be on a single line.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId> <artifactId>openjpa-persistence-jdbc</artifactId>
@ -58,8 +59,8 @@
<properties> <properties>
<connection.driver.name>org.apache.derby.jdbc.EmbeddedDriver</connection.driver.name> <connection.driver.name>org.apache.derby.jdbc.EmbeddedDriver</connection.driver.name>
<connection.url>jdbc:derby:target/database/openjpa-derby-database;create=true</connection.url> <connection.url>jdbc:derby:target/database/openjpa-derby-database;create=true</connection.url>
<connection.username></connection.username> <connection.username />
<connection.password></connection.password> <connection.password />
</properties> </properties>
</profile> </profile>
@ -79,7 +80,7 @@
<connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name> <connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name>
<connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url> <connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>
<connection.username>sa</connection.username> <connection.username>sa</connection.username>
<connection.password></connection.password> <connection.password />
</properties> </properties>
</profile> </profile>
@ -282,25 +283,13 @@
<execution> <execution>
<phase>test-compile</phase> <phase>test-compile</phase>
<configuration> <configuration>
<tasks> <tasks>
<ant antfile="src/main/ant/enhancer.xml" <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
target="enhance" <property name="maven.test.skip" value="${maven.test.skip}" />
inheritRefs="true"> <property name="test" value="${test}" />
<!-- <property name="outdir" value="${project.build.outputDirectory}" />
InheritAll doesn't seem to work. Pass in <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
properties manually. <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
-->
<property name="maven.test.skip"
value="${maven.test.skip}" />
<property name="test"
value="${test}" />
<property name="outdir"
value="${project.build.outputDirectory}" />
<property
name="project.build.testOutputDirectory"
value="${project.build.testOutputDirectory}" />
<property name="openjpa.loglevel"
value="${openjpa.loglevel}" />
</ant> </ant>
</tasks> </tasks>
</configuration> </configuration>

7
openjpa-persistence/pom.xml
View File

@ -17,9 +17,10 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Maven release plugin requires the project tag to be on a single line.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId> <artifactId>openjpa-persistence</artifactId>

128
openjpa-project/pom.xml
View File

@ -17,10 +17,11 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Please keep the project tag on one line to avoid confusing
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 the release plugin.
http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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">
<!-- <!--
To build the distribution files from project root: To build the distribution files from project root:
@ -190,12 +191,11 @@
<postProcess> <postProcess>
<!-- copy to parent module for <!-- copy to parent module for
expanded access in upload --> expanded access in upload -->
<mkdir dir="${parent.site.docs}"/> <mkdir dir="${parent.site.docs}" />
<delete file="${docbook.target}/manual.fo"/> <delete file="${docbook.target}/manual.fo" />
<copy todir="${parent.site.docs}"> <copy todir="${parent.site.docs}">
<fileset <fileset dir="${docbook.target}">
dir="${docbook.target}"> <include name="manual.pdf" />
<include name="manual.pdf"/>
</fileset> </fileset>
</copy> </copy>
</postProcess> </postProcess>
@ -220,34 +220,29 @@
</htmlCustomization> </htmlCustomization>
<postProcess> <postProcess>
<!-- rename manual to index --> <!-- rename manual to index -->
<move <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html" />
file="${docbook.target}/manual.html"
tofile="${docbook.target}/index.html"/>
<!-- copy over images and styles --> <!-- copy over images and styles -->
<mkdir dir="${docbook.target}/img"/> <mkdir dir="${docbook.target}/img" />
<copy todir="${docbook.target}/img"> <copy todir="${docbook.target}/img">
<fileset <fileset dir="${docbook.source}/img">
dir="${docbook.source}/img"> <include name="*.*" />
<include name="*.*"/>
</fileset> </fileset>
</copy> </copy>
<mkdir dir="${docbook.target}/css"/> <mkdir dir="${docbook.target}/css" />
<copy todir="${docbook.target}/css"> <copy todir="${docbook.target}/css">
<fileset <fileset dir="${docbook.source}/css">
dir="${docbook.source}/css"> <include name="*.*" />
<include name="*.*"/>
</fileset> </fileset>
</copy> </copy>
<!-- copy to parent module for <!-- copy to parent module for
expanded access in upload --> expanded access in upload -->
<mkdir dir="${parent.site.docs}"/> <mkdir dir="${parent.site.docs}" />
<copy todir="${parent.site.docs}"> <copy todir="${parent.site.docs}">
<fileset <fileset dir="${docbook.target}">
dir="${docbook.target}"> <include name="*.*" />
<include name="*.*"/>
</fileset> </fileset>
</copy> </copy>
</postProcess> </postProcess>
@ -272,11 +267,10 @@
<postProcess> <postProcess>
<!-- copy to parent module for <!-- copy to parent module for
expanded access in upload --> expanded access in upload -->
<mkdir dir="${parent.site.docs}"/> <mkdir dir="${parent.site.docs}" />
<copy todir="${parent.site.docs}"> <copy todir="${parent.site.docs}">
<fileset <fileset dir="${docbook.target}">
dir="${docbook.target}"> <include name="manual.html" />
<include name="manual.html"/>
</fileset> </fileset>
</copy> </copy>
</postProcess> </postProcess>
@ -308,84 +302,6 @@
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
</profile> </profile>
<!-- sign the release files -->
<profile>
<id>sign-release</id>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>verify</phase>
<configuration>
<tasks>
<echo>Signing release files...</echo>
<macrodef name="sign-file">
<attribute name="file" />
<sequential>
<delete failonerror="false"
file="@{file}.asc"/>
<exec executable="gpg"
failonerror="true">
<arg value="--batch"/>
<arg value="--verbose"/>
<arg value="--default-key"/>
<arg value="${openjpa.release.keyAlias}"/>
<arg value="--armor"/>
<arg value="--detach-sig"/>
<arg value="@{file}"/>
</exec>
</sequential>
</macrodef>
<sign-file file="${openjpa.assembly.binaryFile}"/>
<sign-file file="${openjpa.assembly.sourceFile}"/>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-signature-artifacts</id>
<phase>verify</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${openjpa.assembly.binaryFile}.asc</file>
<classifier>${openjpa.assembly.binarySuffix}.zip</classifier>
<type>asc</type>
</artifact>
<artifact>
<file>${openjpa.assembly.sourceFile}.asc</file>
<classifier>${openjpa.assembly.sourceSuffix}.zip</classifier>
<type>asc</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<activation>
<property>
<name>sign</name>
<value>true</value>
</property>
</activation>
</profile>
</profiles> </profiles>
<!-- need to explicitly list dependencies for assembly to work --> <!-- need to explicitly list dependencies for assembly to work -->

62
openjpa-slice/pom.xml
View File

@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file or more contributor license agreements. See the NOTICE file
distributed with this work for additional information distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file regarding copyright ownership. The ASF licenses this file
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
KIND, either express or implied. See the License for the KIND, either express or implied. See the License for the
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Maven release plugin requires the project tag to be on a single line.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-slice</artifactId> <artifactId>openjpa-slice</artifactId>
@ -88,8 +89,8 @@
<connection.url> <connection.url>
jdbc:derby:target/database/slice-derby-One;create=true jdbc:derby:target/database/slice-derby-One;create=true
</connection.url> </connection.url>
<connection.username></connection.username> <connection.username />
<connection.password></connection.password> <connection.password />
</properties> </properties>
</profile> </profile>
<profile> <profile>
@ -139,19 +140,12 @@
<phase>test-compile</phase> <phase>test-compile</phase>
<configuration> <configuration>
<tasks> <tasks>
<ant antfile="src/main/ant/enhancer.xml" <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
target="enhance" inheritRefs="true"> <property name="maven.test.skip" value="${maven.test.skip}" />
<property name="maven.test.skip" <property name="test" value="${test}" />
value="${maven.test.skip}" /> <property name="outdir" value="${project.build.outputDirectory}" />
<property name="test" <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
value="${test}" /> <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
<property name="outdir"
value="${project.build.outputDirectory}" />
<property
name="project.build.testOutputDirectory"
value="${project.build.testOutputDirectory}" />
<property name="openjpa.loglevel"
value="${openjpa.loglevel}" />
</ant> </ant>
</tasks> </tasks>
</configuration> </configuration>

7
openjpa-xmlstore/pom.xml
View File

@ -17,9 +17,10 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Maven release plugin requires the project tag to be on a single line.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -->
<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> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-xmlstore</artifactId> <artifactId>openjpa-xmlstore</artifactId>

81
pom.xml
View File

@ -17,10 +17,10 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <!--
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Maven release plugin requires the project tag to be on a single line.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 -->
http://maven.apache.org/maven-v4_0_0.xsd"> <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> <modelVersion>4.0.0</modelVersion>
<prerequisites> <prerequisites>
<maven>2.0.4</maven> <maven>2.0.4</maven>
@ -131,7 +131,73 @@
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
</execution> </execution>
</executions> <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/5/docs/api</link>
<link>http://jakarta.apache.org/commons/collections/api-release</link>
</links>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.0-alpha-3</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-7</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
<arguments>-Prelease</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
<version>1.0-alpha-1</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<excludes>
<!--
Exclude internal repository. These files are
generated by Maven or only used for build purposes.
-->
<exclude>**/internal-repository/**</exclude>
<exclude>**/target/**</exclude>
</excludes>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -476,4 +542,9 @@
<url>scpexe://${user.name}@people.apache.org/www/openjpa.apache.org/builds/${pom.version}</url> <url>scpexe://${user.name}@people.apache.org/www/openjpa.apache.org/builds/${pom.version}</url>
</site> </site>
</distributionManagement> </distributionManagement>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/openjpa/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/openjpa/trunk</developerConnection>
<url>http://svn.apache.org/repos/asf/openjpa/trunk</url>
</scm>
</project> </project>