openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r666731 - in /openjpa/trunk: ./ openjpa-all/ openjpa-examples/ openjpa-integration/ openjpa-integration/examples/ openjpa-integration/tck/ openjpa-jdbc/ openjpa-kernel/ openjpa-lib/ openjpa-persistence-jdbc/ openjpa-persistence/ openjpa-pro...
Date Wed, 11 Jun 2008 16:48:57 GMT
Author: mikedd
Date: Wed Jun 11 09:48:56 2008
New Revision: 666731

URL: http://svn.apache.org/viewvc?rev=666731&view=rev
Log:
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.

Modified:
    openjpa/trunk/openjpa-all/pom.xml
    openjpa/trunk/openjpa-examples/pom.xml
    openjpa/trunk/openjpa-integration/examples/pom.xml
    openjpa/trunk/openjpa-integration/pom.xml
    openjpa/trunk/openjpa-integration/tck/pom.xml
    openjpa/trunk/openjpa-jdbc/pom.xml
    openjpa/trunk/openjpa-kernel/pom.xml
    openjpa/trunk/openjpa-lib/pom.xml
    openjpa/trunk/openjpa-persistence-jdbc/pom.xml
    openjpa/trunk/openjpa-persistence/pom.xml
    openjpa/trunk/openjpa-project/pom.xml
    openjpa/trunk/openjpa-slice/pom.xml
    openjpa/trunk/openjpa-xmlstore/pom.xml
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,10 +17,11 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    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>
     <artifactId>openjpa</artifactId>
     <packaging>jar</packaging>
@@ -48,11 +49,10 @@
                         <phase>process-classes</phase>
                         <configuration>
                             <tasks>
-                                <unjar overwrite="false"
-                                    dest="${basedir}/target/classes">
+                                <unjar overwrite="false" dest="${basedir}/target/classes">
                                     <fileset dir="${basedir}/..">
-                                        <include name="*/target/openjpa-*.jar"/>
-                                        <exclude name="*/target/openjpa-examples-*.jar"/>
+                                        <include name="*/target/openjpa-*.jar" />
+                                        <exclude name="*/target/openjpa-examples-*.jar" />
                                     </fileset>
                                 </unjar>
 
@@ -61,18 +61,18 @@
                                     resources so they are aggregated
                                 -->
                                 <macrodef name="aggregate-file">
-                                   <attribute name="servicename"/>
+                                   <attribute name="servicename" />
                                     <sequential>
                                         <echo>Building service: @{servicename}</echo>
                                         <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>
                                     </sequential>
                                 </macrodef>
 
-                                <aggregate-file servicename="org.apache.openjpa.lib.conf.ProductDerivation"/>
-                                <aggregate-file servicename="javax.persistence.spi.PersistenceProvider"/>
-                                <aggregate-file servicename="org.apache.openjpa.kernel.exps.ExpressionParser"/>
+                                <aggregate-file servicename="org.apache.openjpa.lib.conf.ProductDerivation" />
+                                <aggregate-file servicename="javax.persistence.spi.PersistenceProvider" />
+                                <aggregate-file servicename="org.apache.openjpa.kernel.exps.ExpressionParser" />
                             </tasks>
                         </configuration>
                         <goals>

Modified: openjpa/trunk/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,9 +17,11 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    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>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-examples</artifactId>
@@ -81,21 +83,19 @@
                         <configuration>
                             <tasks>
                                 <path id="cp">
-                                    <path refid="maven.test.classpath"/>
-                                    <path refid="maven.compile.classpath"/>
-                                    <path refid="maven.dependency.classpath"/>
+                                    <path refid="maven.test.classpath" />
+                                    <path refid="maven.compile.classpath" />
+                                    <path refid="maven.dependency.classpath" />
                                 </path>
-								<taskdef name="openjpac" classname=
-                                    "org.apache.openjpa.ant.PCEnhancerTask">
-									<classpath refid="cp"/>
+								<taskdef name="openjpac" classname= "org.apache.openjpa.ant.PCEnhancerTask">
+									<classpath refid="cp" />
 								</taskdef>
-                                <fileset id="enhance.path.ref"
-                                    dir="${project.build.testOutputDirectory}">
-                                    <include name="**/*.class"/>
+                                <fileset id="enhance.path.ref" dir="${project.build.testOutputDirectory}">
+                                    <include name="**/*.class" />
                                 </fileset>
 								<openjpac>
-									<classpath refid="cp"/>
-									<fileset refid="enhance.path.ref"/>
+									<classpath refid="cp" />
+									<fileset refid="enhance.path.ref" />
 								</openjpac>
                             </tasks>
                         </configuration>

Modified: openjpa/trunk/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/examples/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/examples/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/examples/pom.xml Wed Jun 11 09:48:56 2008
@@ -26,10 +26,11 @@
 
         mvn integration-test -Pexamples-profile
 -->
-<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">
+<!-- 
+    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>
     <artifactId>examples</artifactId>
     <packaging>pom</packaging>
@@ -55,29 +56,23 @@
                         <tasks>
                         <echo>Running OpenJPA Examples</echo>
 
-                        <property name="examples.base"
-                            value="${basedir}/target/examples"/>
-                        <mkdir dir="${examples.base}"/>
+                        <property name="examples.base" value="${basedir}/target/examples" />
+                        <mkdir dir="${examples.base}" />
 
-                        <unzip overwrite="false" dest="${examples.base}"
-                            src="../../target/site/downloads/apache-openjpa-${pom.version}-binary.zip"/>
+                        <unzip overwrite="false" dest="${examples.base}" src="../../target/site/downloads/apache-openjpa-${pom.version}-binary.zip" />
 
                         <path id="assembly.classpath"> 
                             <fileset dir="${examples.base}">
-                                <include name="**/*.jar"/>
+                                <include name="**/*.jar" />
                             </fileset>
                         </path>
-                        <available
-                            classname="org.apache.openjpa.conf.OpenJPAVersion"
-                            classpathref="assembly.classpath"
-                            property="unzip.success"/>
+                        <available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
                         <fail unless="unzip.success">
                             Could not extract assembly.
                         </fail>
 
                         <subant inheritAll="false" failonerror="true">
-                            <fileset dir="${examples.base}"
-                                includes="*/examples/*/build.xml"/>
+                            <fileset dir="${examples.base}" includes="*/examples/*/build.xml" />
                         </subant>
 
                         </tasks>
@@ -101,4 +96,3 @@
         </dependency>
     </dependencies>
 </project>
-

Modified: openjpa/trunk/openjpa-integration/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,10 +17,11 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    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>
     <artifactId>openjpa-integration</artifactId>
     <packaging>pom</packaging>

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

Modified: openjpa/trunk/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-jdbc/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,9 +17,10 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    Maven release plugin requires the project tag to be on a single line. 
+-->
+<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>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-jdbc</artifactId>

Modified: openjpa/trunk/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,9 +17,10 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    Maven release plugin requires the project tag to be on a single line. 
+-->
+<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>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-kernel</artifactId>
@@ -52,14 +53,14 @@
         <dependency>
             <groupId>commons-pool</groupId>
             <artifactId>commons-pool</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.ibm.websphere</groupId>
-            <artifactId>websphere_uow_api</artifactId>
-            <version>0.0.1</version>
-            <scope>provided</scope>
-        </dependency>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.websphere</groupId>
+            <artifactId>websphere_uow_api</artifactId>
+            <version>0.0.1</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -124,8 +125,7 @@
 						<phase>process-classes</phase>
 						<configuration>
 							<tasks>
-								<java
-									classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
+								<java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
 							</tasks>
 						</configuration>
 						<goals>
@@ -137,9 +137,8 @@
 						<phase>process-classes</phase>
 						<configuration>
 							<tasks>
-								<java
-									classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
-                                    <arg line="-utils 5"/>
+								<java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
+                                    <arg line="-utils 5" />
                                 </java>
 							</tasks>
 						</configuration>
@@ -148,27 +147,27 @@
 						</goals>
 					</execution>
                 </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/com/ibm/**</exclude>
-                    </excludes>
-                </configuration>                
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/com/ibm/**</exclude>
+                    </excludes>
+                </configuration>                
             </plugin>
         </plugins>
     </build>
-    <repositories>
-        <!-- 
-            Internal (in SVN) repository which contains jar files that are not
-            publicly available and cannot be re-distributed.
-         -->
-        <repository>
-            <id>openjpa-internal</id>
-            <name>Internal repository</name>
-            <url>file://${basedir}/internal-repository</url>
-        </repository>
-    </repositories>
+    <repositories>
+        <!-- 
+            Internal (in SVN) repository which contains jar files that are not
+            publicly available and cannot be re-distributed.
+         -->
+        <repository>
+            <id>openjpa-internal</id>
+            <name>Internal repository</name>
+            <url>file://${basedir}/internal-repository</url>
+        </repository>
+    </repositories>
 </project>

Modified: openjpa/trunk/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/pom.xml (original)
+++ openjpa/trunk/openjpa-lib/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,9 +17,10 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    Maven release plugin requires the project tag to be on a single line. 
+-->
+<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>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-lib</artifactId>
@@ -96,8 +97,7 @@
                         <phase>process-classes</phase>
                         <configuration>
                             <tasks>
-                                <delete failonerror="true"
-                                dir="${project.build.outputDirectory}/sun/"/>
+                                <delete failonerror="true" dir="${project.build.outputDirectory}/sun/" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -109,33 +109,25 @@
                         <phase>compile</phase>
                         <configuration>
                             <tasks>
-                                <property name="tmpdir"
-                                    value="${java.io.tmpdir}/openjpamvntmp"/>
-                                <condition property="outdir"
-                                    value="${project.build.outputDirectory}">
-                                    <available type="dir"
-                                    file="${project.build.outputDirectory}"/>
+                                <property name="tmpdir" value="${java.io.tmpdir}/openjpamvntmp" />
+                                <condition property="outdir" value="${project.build.outputDirectory}">
+                                    <available type="dir" file="${project.build.outputDirectory}" />
                                 </condition>
 
-                                <property name="outdir" value="${tmpdir}"/>
+                                <property name="outdir" value="${tmpdir}" />
 
-                                <property name="svnversion.executable"
-                                    value="svnversion"/>
-                                <exec outputproperty="subversion.revision"
-                                    failonerror="false"
-                                    failifexecutionfails="false"
-                                    executable="${svnversion.executable}">
-                                    <arg line="-c ${basedir}/.."/>
+                                <property name="svnversion.executable" value="svnversion" />
+                                <exec outputproperty="subversion.revision" failonerror="false" failifexecutionfails="false" executable="${svnversion.executable}">
+                                    <arg line="-c ${basedir}/.." />
                                 </exec>
-                                <property name="subversion.revision"
-                                    value="unknown"/>
+                                <property name="subversion.revision" value="unknown" />
                                 <echo>Revision: ${subversion.revision}</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}
 openjpa.version=${project.version}</echo>
-                                <delete dir="${tmpdir}"/>
+                                <delete dir="${tmpdir}" />
                             </tasks>
                         </configuration>
                         <goals>

Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,9 +17,10 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    Maven release plugin requires the project tag to be on a single line. 
+-->
+<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>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-persistence-jdbc</artifactId>
@@ -58,8 +59,8 @@
             <properties>
                 <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.username></connection.username>
-                <connection.password></connection.password>
+                <connection.username />
+                <connection.password />
             </properties>
         </profile>
 
@@ -79,7 +80,7 @@
                 <connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name>
                 <connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>
                 <connection.username>sa</connection.username>
-                <connection.password></connection.password>
+                <connection.password />
             </properties>
         </profile>
 
@@ -282,25 +283,13 @@
                     <execution>
                         <phase>test-compile</phase>
                         <configuration>
-                            <tasks>
-                                <ant antfile="src/main/ant/enhancer.xml"
-                                    target="enhance"
-                                    inheritRefs="true">
-                                    <!--
-                                        InheritAll doesn't seem to work. Pass in
-                                        properties manually.
-                                    -->
-                                    <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}" />
+                            <tasks>                           
+                                <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
+                                    <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>
                             </tasks>
                         </configuration>

Modified: openjpa/trunk/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,9 +17,10 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    Maven release plugin requires the project tag to be on a single line. 
+-->
+<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>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-persistence</artifactId>

Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,10 +17,11 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    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">
     <!--
         To build the distribution files from project root:
 
@@ -190,12 +191,11 @@
                                     <postProcess>
                                         <!-- copy to parent module for 
                                              expanded access in upload -->
-                                        <mkdir dir="${parent.site.docs}"/>
-                                        <delete file="${docbook.target}/manual.fo"/>
+                                        <mkdir dir="${parent.site.docs}" />
+                                        <delete file="${docbook.target}/manual.fo" />
                                         <copy todir="${parent.site.docs}">
-                                            <fileset
-                                                dir="${docbook.target}">
-                                                <include name="manual.pdf"/>
+                                            <fileset dir="${docbook.target}">
+                                                <include name="manual.pdf" />
                                             </fileset>
                                         </copy>
                                     </postProcess>
@@ -220,34 +220,29 @@
                                     </htmlCustomization>
                                     <postProcess>
                                         <!-- rename manual to index -->
-                                        <move
-                                        file="${docbook.target}/manual.html"
-                                        tofile="${docbook.target}/index.html"/>
+                                        <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html" />
 
                                         <!-- copy over images and styles -->
-                                        <mkdir dir="${docbook.target}/img"/>
+                                        <mkdir dir="${docbook.target}/img" />
                                         <copy todir="${docbook.target}/img">
-                                            <fileset
-                                                dir="${docbook.source}/img">
-                                                <include name="*.*"/>
+                                            <fileset dir="${docbook.source}/img">
+                                                <include name="*.*" />
                                             </fileset>
                                         </copy>
 
-                                        <mkdir dir="${docbook.target}/css"/>
+                                        <mkdir dir="${docbook.target}/css" />
                                         <copy todir="${docbook.target}/css">
-                                            <fileset
-                                                dir="${docbook.source}/css">
-                                                <include name="*.*"/>
+                                            <fileset dir="${docbook.source}/css">
+                                                <include name="*.*" />
                                             </fileset>
                                         </copy>
 
                                         <!-- copy to parent module for 
                                              expanded access in upload -->
-                                        <mkdir dir="${parent.site.docs}"/>
+                                        <mkdir dir="${parent.site.docs}" />
                                         <copy todir="${parent.site.docs}">
-                                            <fileset
-                                                dir="${docbook.target}">
-                                                <include name="*.*"/>
+                                            <fileset dir="${docbook.target}">
+                                                <include name="*.*" />
                                             </fileset>
                                         </copy>
                                     </postProcess>
@@ -272,11 +267,10 @@
                                     <postProcess>
                                         <!-- copy to parent module for 
                                              expanded access in upload -->
-                                        <mkdir dir="${parent.site.docs}"/>
+                                        <mkdir dir="${parent.site.docs}" />
                                         <copy todir="${parent.site.docs}">
-                                            <fileset
-                                                dir="${docbook.target}">
-                                                <include name="manual.html"/>
+                                            <fileset dir="${docbook.target}">
+                                                <include name="manual.html" />
                                             </fileset>
                                         </copy>
                                     </postProcess>
@@ -308,84 +302,6 @@
                 </pluginRepository>
             </pluginRepositories>
         </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>
 
     <!-- need to explicitly list dependencies for assembly to work -->

Modified: openjpa/trunk/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Wed Jun 11 09:48:56 2008
@@ -1,25 +1,26 @@
 <?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.   
+ 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.   
 -->
-<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">
+<!-- 
+    Maven release plugin requires the project tag to be on a single line. 
+-->
+<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>
 	<groupId>org.apache.openjpa</groupId>
 	<artifactId>openjpa-slice</artifactId>
@@ -88,8 +89,8 @@
 				<connection.url>
 					jdbc:derby:target/database/slice-derby-One;create=true
 				</connection.url>
-				<connection.username></connection.username>
-				<connection.password></connection.password>
+				<connection.username />
+				<connection.password />
 			</properties>
 		</profile>
 		<profile>
@@ -139,19 +140,12 @@
 						<phase>test-compile</phase>
 						<configuration>
 							<tasks>
-								<ant antfile="src/main/ant/enhancer.xml"
-									target="enhance" inheritRefs="true">
-									<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 antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
+									<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>
 							</tasks>
 						</configuration>

Modified: openjpa/trunk/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-xmlstore/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/openjpa-xmlstore/pom.xml (original)
+++ openjpa/trunk/openjpa-xmlstore/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,9 +17,10 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    Maven release plugin requires the project tag to be on a single line. 
+-->
+<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>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-xmlstore</artifactId>

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=666731&r1=666730&r2=666731&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Wed Jun 11 09:48:56 2008
@@ -17,10 +17,10 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<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">
+<!-- 
+    Maven release plugin requires the project tag to be on a single line. 
+-->
+<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>
     <prerequisites>
         <maven>2.0.4</maven>
@@ -131,7 +131,73 @@
                                     <goal>jar</goal>
                                 </goals>
                             </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>
                 </plugins>
             </build>
@@ -476,4 +542,9 @@
         <url>scpexe://${user.name}@people.apache.org/www/openjpa.apache.org/builds/${pom.version}</url>
       </site>
     </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>



Mime
View raw message