You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2007/04/10 23:59:03 UTC

svn commit: r527320 [2/2] - in /incubator/openjpa/branches/0.9.7-incubating: ./ openjpa-all/ openjpa-examples/ openjpa-integration/ openjpa-integration/examples/ openjpa-integration/tck/ openjpa-jdbc-5/ openjpa-jdbc/ openjpa-kernel-5/ openjpa-kernel/ o...

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml?view=diff&rev=527320&r1=527319&r2=527320
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml Tue Apr 10 14:59:02 2007
@@ -1,376 +1,349 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation.
- 
- Licensed 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">
-    <!--
-        To build the distribution files from project root:
-
-        mvn clean compile package -Dtest=false
-
-        To build and deploy a full digned release with docs, run:
-
-            mvn clean deploy -Pjavadoc-profile,docbook-profile,sign-release
-
-        Note that to sign the release, you need to have "gpg" installed and
-        create a key. See http://apache.org/dev/release-signing.html
-    -->
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>openjpa-project</artifactId>
-    <packaging>pom</packaging>
-    <name>OpenJPA Distribution</name>
-    <parent>
-        <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
-        <version>0.9.7-incubating-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <openjpa.release.keyAlias>${user.name}@apache.org</openjpa.release.keyAlias>
-        <openjpa.assembly.finalName>openjpa-${version}</openjpa.assembly.finalName>
-        <openjpa.assembly.outputDirectory>${project.basedir}/target/assembly</openjpa.assembly.outputDirectory>
-
-        <openjpa.assembly.binarySuffix>binary</openjpa.assembly.binarySuffix>
-        <openjpa.assembly.binaryBase>${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.binarySuffix}</openjpa.assembly.binaryBase>
-        <openjpa.assembly.binaryFile>${openjpa.assembly.binaryBase}.zip</openjpa.assembly.binaryFile>
-
-        <openjpa.assembly.sourceSuffix>source</openjpa.assembly.sourceSuffix>
-        <openjpa.assembly.sourceBase>${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.sourceSuffix}</openjpa.assembly.sourceBase>
-        <openjpa.assembly.sourceFile>${openjpa.assembly.sourceBase}.zip</openjpa.assembly.sourceFile>
-
-        <docbook.version>1.67.2</docbook.version>
-        <local.repository>${settings.localRepository}</local.repository>
-    </properties>
-
-    <build>
-        <!-- needed to let maven pass the "compile" phase -->
-        <testSourceDirectory>/none/</testSourceDirectory>
-
-        <!-- filter site resources -->
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/site</directory>
-                <!-- targetPath is relative to target/classes/ -->
-                <targetPath>../filtered-site</targetPath>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <descriptor>assembly.xml</descriptor>
-                            <finalName>${openjpa.assembly.finalName}</finalName>
-                            <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
-                            <workDirectory>target/work</workDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <descriptor>source-assembly.xml</descriptor>
-                            <finalName>openjpa-${version}</finalName>
-                            <outputDirectory>${project.basedir}/target/assembly</outputDirectory>
-                            <workDirectory>target/work</workDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!--
-                Copy over site files from src/site to target/filtered-site
-                so we can filter resources and include other generated
-                content from the openjpa-project module.
-            -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>prefilter-site</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>2.0-beta-5</version>
-                <configuration>
-                    <siteDirectory>target/filtered-site</siteDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <!--
-            Docbook profile. Docs can be built by running:
-                mvn package -Dtest=false -Pjavadoc-profile,docbook-profile
-        -->
-        <profile>
-            <id>docbook-profile</id>
-            <build>
-                <plugins>
-                    <!-- build the docs when creating the site from docbook source -->
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>process-resources</phase>
-                                <configuration>
-                                 <!-- destdir="${project.build.directory}/site/manual" -->
-                                    <tasks>
-                                    <echo>Building docbook manual</echo>
-
-                                    <mkdir dir="${project.basedir}/target/stylesheets"/>
-                                    <available file="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip" property="docbook.available"/>
-                                    <fail unless="docbook.available">Could not find docbook file: ${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip</fail>
-
-                                    <unzip src="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip" dest="${project.basedir}/target/stylesheets/" overwrite="false"/>
-
-
-                                    <style includes="**/manual.xml"
-                                        force="true"
-                                        basedir="${project.basedir}/src/doc/manual"
-                                        destdir="${project.basedir}/target/manual"
-                                        style="manual-xhtml.xsl"
-                                        classpathref="maven.runtime.classpath">
-                                        <factory name="org.apache.xalan.processor.TransformerFactoryImpl">
-                                            <attribute name="http://xml.apache.org/xalan/features/optimize" value="true"/>
-                                        </factory>
-                                    </style>
-
-                                    <!--
-                                    <style includes="**/manual.xml"
-                                        force="true"
-                                        basedir="${project.basedir}/src/doc/manual"
-                                        destdir="${project.basedir}/target/manual"
-                                        style="manual-xhtml-chunk.xsl"
-                                        classpathref="maven.runtime.classpath">
-                                        <factory name="org.apache.xalan.processor.TransformerFactoryImpl">
-                                            <attribute name="http://xml.apache.org/xalan/features/optimize" value="true"/>
-                                        </factory>
-                                    </style>
-                                    -->
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <activation>
-                <property>
-                    <name>builddocs</name>
-                    <value>true</value>
-                </property>
-            </activation>
-        </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 -->
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-all</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-lib</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-kernel-5</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-jdbc</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-jdbc-5</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-persistence</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-xmlstore</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-examples</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <!-- included so we can include it in the distribution -->
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.2.2.0</version>
-        </dependency>
-
-        <!-- jars needed for for docbook -->
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.6.5</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant-trax</artifactId>
-            <version>1.6.5</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>2.7.0</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>bcel</groupId>
-            <artifactId>bcel</artifactId>
-            <version>5.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>docbook</groupId>
-            <artifactId>docbook-xsl</artifactId>
-            <version>${docbook.version}</version>
-            <scope>runtime</scope>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-</project>
+<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:
+
+        mvn clean compile package -Dtest=false
+
+        To build and deploy a full digned release with docs, run:
+
+            mvn clean deploy -Pjavadoc-profile,docbook-profile,sign-release
+
+        Note that to sign the release, you need to have "gpg" installed and
+        create a key. See http://apache.org/dev/release-signing.html
+    -->
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>openjpa-project</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Distribution</name>
+    <parent>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa</artifactId>
+        <version>0.9.7-incubating</version>
+    </parent>
+
+    <properties>
+        <openjpa.release.keyAlias>${user.name}@apache.org</openjpa.release.keyAlias>
+        <openjpa.assembly.finalName>openjpa-${version}</openjpa.assembly.finalName>
+        <openjpa.assembly.outputDirectory>${project.basedir}/target/assembly</openjpa.assembly.outputDirectory>
+
+        <openjpa.assembly.binarySuffix>binary</openjpa.assembly.binarySuffix>
+        <openjpa.assembly.binaryBase>${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.binarySuffix}</openjpa.assembly.binaryBase>
+        <openjpa.assembly.binaryFile>${openjpa.assembly.binaryBase}.zip</openjpa.assembly.binaryFile>
+
+        <openjpa.assembly.sourceSuffix>source</openjpa.assembly.sourceSuffix>
+        <openjpa.assembly.sourceBase>${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.sourceSuffix}</openjpa.assembly.sourceBase>
+        <openjpa.assembly.sourceFile>${openjpa.assembly.sourceBase}.zip</openjpa.assembly.sourceFile>
+
+        <docbook.version>1.67.2</docbook.version>
+        <local.repository>${settings.localRepository}</local.repository>
+    </properties>
+
+    <build>
+        <!-- needed to let maven pass the "compile" phase -->
+        <testSourceDirectory>/none/</testSourceDirectory>
+
+        <!-- filter site resources -->
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/site</directory>
+                <!-- targetPath is relative to target/classes/ -->
+                <targetPath>../filtered-site</targetPath>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                        <configuration>
+                            <descriptor>assembly.xml</descriptor>
+                            <finalName>${openjpa.assembly.finalName}</finalName>
+                            <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
+                            <workDirectory>target/work</workDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                        <configuration>
+                            <descriptor>source-assembly.xml</descriptor>
+                            <finalName>openjpa-${version}</finalName>
+                            <outputDirectory>${project.basedir}/target/assembly</outputDirectory>
+                            <workDirectory>target/work</workDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--
+                Copy over site files from src/site to target/filtered-site
+                so we can filter resources and include other generated
+                content from the openjpa-project module.
+            -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prefilter-site</id>
+                        <phase>site</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>2.0-beta-5</version>
+                <configuration>
+                    <siteDirectory>target/filtered-site</siteDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <!--
+            Docbook profile. Docs can be built by running:
+                mvn package -Dtest=false -Pjavadoc-profile,docbook-profile
+        -->
+        <profile>
+            <id>docbook-profile</id>
+            <build>
+                <plugins>
+                    <!-- build the docs when creating the site from docbook source -->
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-resources</phase>
+                                <configuration>
+                                 <!-- destdir="${project.build.directory}/site/manual" -->
+                                    <tasks>
+                                    <echo>Building docbook manual</echo>
+
+                                    <mkdir dir="${project.basedir}/target/stylesheets" />
+                                    <available file="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip" property="docbook.available" />
+                                    <fail unless="docbook.available">Could not find docbook file: ${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip</fail>
+
+                                    <unzip src="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip" dest="${project.basedir}/target/stylesheets/" overwrite="false" />
+
+
+                                    <style includes="**/manual.xml" force="true" basedir="${project.basedir}/src/doc/manual" destdir="${project.basedir}/target/manual" style="manual-xhtml.xsl" classpathref="maven.runtime.classpath">
+                                        <factory name="org.apache.xalan.processor.TransformerFactoryImpl">
+                                            <attribute name="http://xml.apache.org/xalan/features/optimize" value="true" />
+                                        </factory>
+                                    </style>
+
+                                    <!--
+                                    <style includes="**/manual.xml" force="true"
+                                        basedir="${project.basedir}/src/doc/manual"
+                                        destdir="${project.basedir}/target/manual"
+                                        style="manual-xhtml-chunk.xsl"
+                                        classpathref="maven.runtime.classpath">
+                                        <factory name="org.apache.xalan.processor.TransformerFactoryImpl">
+                                            <attribute name="http://xml.apache.org/xalan/features/optimize" value="true" />
+                                        </factory>
+                                    </style>
+                                    -->
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <activation>
+                <property>
+                    <name>builddocs</name>
+                    <value>true</value>
+                </property>
+            </activation>
+        </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 -->
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-all</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-lib</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-kernel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-kernel-5</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-jdbc</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-jdbc-5</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-persistence</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-persistence-jdbc</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-xmlstore</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-examples</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <!-- included so we can include it in the distribution -->
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.2.2.0</version>
+        </dependency>
+
+        <!-- jars needed for for docbook -->
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.6.5</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant-trax</artifactId>
+            <version>1.6.5</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>bcel</groupId>
+            <artifactId>bcel</artifactId>
+            <version>5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>docbook</groupId>
+            <artifactId>docbook-xsl</artifactId>
+            <version>${docbook.version}</version>
+            <scope>runtime</scope>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml?view=diff&rev=527320&r1=527319&r2=527320
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml Tue Apr 10 14:59:02 2007
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation.
- 
- Licensed 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">
+<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>
@@ -27,7 +9,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.7-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating</version>
     </parent>
     <dependencies>
         <dependency>
@@ -49,4 +31,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file

Modified: incubator/openjpa/branches/0.9.7-incubating/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/pom.xml?view=diff&rev=527320&r1=527319&r2=527320
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/pom.xml Tue Apr 10 14:59:02 2007
@@ -1,324 +1,305 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation.
- 
- Licensed 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">
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>2.0.4</maven>
-    </prerequisites>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa</artifactId>
-    <packaging>pom</packaging>
-    <name>OpenJPA</name>
-    <description>OpenJPA</description>
-    <!--
-        Changing this version needs to also be done in all children poms
-        See: http://jira.codehaus.org/browse/MNG-624
-    -->
-    <version>0.9.7-incubating-SNAPSHOT</version>
-    <url>http://incubator.apache.org/projects/openjpa</url>
-    <issueManagement>
-        <system>jira</system>
-        <url>http://issues.apache.org/jira/browse/OPENJPA</url>
-    </issueManagement>
-    <inceptionYear>2006</inceptionYear>
-    <mailingLists>
-        <mailingList>
-            <name>OpenJPA Developer List</name>
-            <subscribe>open-jpa-dev-subscribe@incubator.apache.org</subscribe>
-            <unsubscribe>open-jpa-dev-unsubscribe@incubator.apache.org</unsubscribe>
-            <post>open-jpa-dev@incubator.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-dev/</archive>
-        </mailingList>
-        <mailingList>
-            <name>OpenJPA Commits List</name>
-            <subscribe>open-jpa-commits-subscribe@incubator.apache.org</subscribe>
-            <unsubscribe>open-jpa-commits-unsubscribe@incubator.apache.org</unsubscribe>
-            <post>open-jpa-commits@incubator.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-commits/</archive>
-        </mailingList>
-    </mailingLists>
-    <developers>
-        <developer>
-            <name>Patrick Linskey</name>
-            <id>plinskey</id>
-            <organization>BEA Systems, Inc.</organization>
-            <email>plinskey@bea.com</email>
-        </developer>
-        <developer>
-            <name>Abe White</name>
-            <id>awhite</id>
-            <organization>BEA Systems, Inc.</organization>
-            <email>awhite@bea.com</email>
-        </developer>
-        <developer>
-            <name>Steve Kim</name>
-            <id>stkim</id>
-            <organization>BEA Systems, Inc.</organization>
-            <email>stkim@bea.com</email>
-        </developer>
-        <developer>
-            <name>Marc Prud'hommeaux</name>
-            <id>mprudhom</id>
-            <organization>BEA Systems, Inc.</organization>
-            <email>mprudhom@bea.com</email>
-        </developer>
-    </developers>
-    <licenses>
-        <license>
-            <name>Apache Software License 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-    </organization>
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/openjpa/branches/0.9.7-incubating</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/openjpa/branches/0.9.7-incubating</developerConnection>
-        <url>https://svn.apache.org/repos/asf/incubator/openjpa/branches/0.9.7-incubating</url>
-    </scm>
-    <modules>
-        <module>openjpa-lib</module>
-        <module>openjpa-kernel</module>
-        <module>openjpa-jdbc</module>
-        <module>openjpa-xmlstore</module>
-        <module>openjpa-all</module>
-        <module>openjpa-project</module>
-        <module>openjpa-integration</module>
-    </modules>
-    <profiles>
-        <profile>
-            <id>jdk1.5</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <modules>
-                <module>openjpa-persistence</module>
-                <module>openjpa-persistence-jdbc</module>
-                <module>openjpa-kernel-5</module>
-                <module>openjpa-jdbc-5</module>
-                <module>openjpa-examples</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>release</id>
-            <activation>
-                <property>
-                    <name>release</name>
-                </property>
-            </activation>
-            <modules>
-                <module>openjpa-project</module>
-            </modules>
-            <build>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.0-alpha-1</version>
-                    <configuration>
-                        <passphrase>${gpg.passphrase}</passphrase>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>sign</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin> 
-                <plugin>
-                    <inherited>true</inherited>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.3</version>
-                    <configuration>
-                        <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-                        <updateReleaseInfo>true</updateReleaseInfo>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>        
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-4</version>          
-                    <configuration>
-                        <tagBase>https://svn.apache.org/repos/asf/incubator/openjpa/branches/0.9.7-incubating/tags/</tagBase>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </build>
-        </profile>
-        <profile>
-            <!--                        
-                Javadoc profile. Docs can be built by running:
-                    mvn package -Dtest=false -Pjavadoc-profile,docbook-profile
-            -->  
-            <id>javadoc-profile</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.1</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals><goal>javadoc</goal></goals>
-                                <configuration>
-                                    <aggregate>true</aggregate>
-                                    <excludePackageNames>hellojpa</excludePackageNames>
-                                    <verbose>false</verbose>
-                                    <!-- <linksource>true</linksource> -->
-                                    <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>
-                </plugins>
-            </build>
-            <activation>
-                <property>
-                    <name>builddocs</name>
-                    <value>true</value>
-                </property>
-            </activation>
-        </profile>
-
-    </profiles>
-
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Maven Repository Switchboard</name>
-            <url>http://www.ibiblio.org/maven2</url>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <!-- also include license and notice files in all the jars -->
-            <resource>
-                <directory>${basedir}/../openjpa-project/</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                    <include>DISCLAIMER.txt</include>
-                </includes>
-                <targetPath>META-INF</targetPath>
-            </resource>
-        </resources>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.2</version>
-                    <configuration>
-                        <useFile>false</useFile>
-                        <trimStackTrace>false</trimStackTrace>
-                        <useSystemClassLoader>true</useSystemClassLoader>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>jdepend-maven-plugin</report>
-                            <!-- <report>jxr-maven-plugin</report> -->
-                            <report>surefire-report-maven-plugin</report>
-                            <report>maven-javadoc-plugin</report>
-                            <report>project-team</report>
-                            <report>mailing-list</report>
-                            <report>issue-tracking</report>
-                            <report>license</report>
-                            <report>scm</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </reporting>
-
-
-    <distributionManagement>
-      <repository>
-        <id>people.apache.org</id>
-        <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository/</url>
-      </repository>
-      <snapshotRepository>
-        <id>people.apache.org</id>
-        <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository/</url>
-        <uniqueVersion>false</uniqueVersion>
-      </snapshotRepository>
-      <site>
-        <id>people.apache.org</id>
-        <url>scpexe://people.apache.org/home/mikedd/public_html/openjpa/site/</url>
-      </site>
-    </distributionManagement>
-</project>
+<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>
+    </prerequisites>
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA</name>
+    <description>OpenJPA</description>
+    <!--
+        Changing this version needs to also be done in all children poms
+        See: http://jira.codehaus.org/browse/MNG-624
+    -->
+    <version>0.9.7-incubating</version>
+    <url>http://incubator.apache.org/projects/openjpa</url>
+    <issueManagement>
+        <system>jira</system>
+        <url>http://issues.apache.org/jira/browse/OPENJPA</url>
+    </issueManagement>
+    <inceptionYear>2006</inceptionYear>
+    <mailingLists>
+        <mailingList>
+            <name>OpenJPA Developer List</name>
+            <subscribe>open-jpa-dev-subscribe@incubator.apache.org</subscribe>
+            <unsubscribe>open-jpa-dev-unsubscribe@incubator.apache.org</unsubscribe>
+            <post>open-jpa-dev@incubator.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-dev/</archive>
+        </mailingList>
+        <mailingList>
+            <name>OpenJPA Commits List</name>
+            <subscribe>open-jpa-commits-subscribe@incubator.apache.org</subscribe>
+            <unsubscribe>open-jpa-commits-unsubscribe@incubator.apache.org</unsubscribe>
+            <post>open-jpa-commits@incubator.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-commits/</archive>
+        </mailingList>
+    </mailingLists>
+    <developers>
+        <developer>
+            <name>Patrick Linskey</name>
+            <id>plinskey</id>
+            <organization>BEA Systems, Inc.</organization>
+            <email>plinskey@bea.com</email>
+        </developer>
+        <developer>
+            <name>Abe White</name>
+            <id>awhite</id>
+            <organization>BEA Systems, Inc.</organization>
+            <email>awhite@bea.com</email>
+        </developer>
+        <developer>
+            <name>Steve Kim</name>
+            <id>stkim</id>
+            <organization>BEA Systems, Inc.</organization>
+            <email>stkim@bea.com</email>
+        </developer>
+        <developer>
+            <name>Marc Prud'hommeaux</name>
+            <id>mprudhom</id>
+            <organization>BEA Systems, Inc.</organization>
+            <email>mprudhom@bea.com</email>
+        </developer>
+    </developers>
+    <licenses>
+        <license>
+            <name>Apache Software License 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+    </organization>
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/openjpa/branches/0.9.7-incubating/tags/openjpa-0.9.7-incubating-RC1</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/openjpa/branches/0.9.7-incubating/tags/openjpa-0.9.7-incubating-RC1</developerConnection>
+        <url>https://svn.apache.org/repos/asf/incubator/openjpa/branches/0.9.7-incubating/tags/openjpa-0.9.7-incubating-RC1</url>
+    </scm>
+    <modules>
+        <module>openjpa-lib</module>
+        <module>openjpa-kernel</module>
+        <module>openjpa-jdbc</module>
+        <module>openjpa-xmlstore</module>
+        <module>openjpa-all</module>
+        <module>openjpa-project</module>
+        <module>openjpa-integration</module>
+    </modules>
+    <profiles>
+        <profile>
+            <id>jdk1.5</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <modules>
+                <module>openjpa-persistence</module>
+                <module>openjpa-persistence-jdbc</module>
+                <module>openjpa-kernel-5</module>
+                <module>openjpa-jdbc-5</module>
+                <module>openjpa-examples</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>release</id>
+            <activation>
+                <property>
+                    <name>release</name>
+                </property>
+            </activation>
+            <modules>
+                <module>openjpa-project</module>
+            </modules>
+            <build>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.0-alpha-1</version>
+                    <configuration>
+                        <passphrase>${gpg.passphrase}</passphrase>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>sign</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin> 
+                <plugin>
+                    <inherited>true</inherited>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.3</version>
+                    <configuration>
+                        <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+                        <updateReleaseInfo>true</updateReleaseInfo>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>        
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.0-beta-4</version>          
+                    <configuration>
+                        <tagBase>https://svn.apache.org/repos/asf/incubator/openjpa/branches/0.9.7-incubating/tags/</tagBase>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </build>
+        </profile>
+        <profile>
+            <!--                        
+                Javadoc profile. Docs can be built by running:
+                    mvn package -Dtest=false -Pjavadoc-profile,docbook-profile
+            -->  
+            <id>javadoc-profile</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.1</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals><goal>javadoc</goal></goals>
+                                <configuration>
+                                    <aggregate>true</aggregate>
+                                    <excludePackageNames>hellojpa</excludePackageNames>
+                                    <verbose>false</verbose>
+                                    <!-- <linksource>true</linksource> -->
+                                    <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>
+                </plugins>
+            </build>
+            <activation>
+                <property>
+                    <name>builddocs</name>
+                    <value>true</value>
+                </property>
+            </activation>
+        </profile>
+
+    </profiles>
+
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven Repository Switchboard</name>
+            <url>http://www.ibiblio.org/maven2</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <!-- also include license and notice files in all the jars -->
+            <resource>
+                <directory>${basedir}/../openjpa-project/</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
+                    <include>DISCLAIMER.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.1</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.2</version>
+                    <configuration>
+                        <useFile>false</useFile>
+                        <trimStackTrace>false</trimStackTrace>
+                        <useSystemClassLoader>true</useSystemClassLoader>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>jdepend-maven-plugin</report>
+                            <!-- <report>jxr-maven-plugin</report> -->
+                            <report>surefire-report-maven-plugin</report>
+                            <report>maven-javadoc-plugin</report>
+                            <report>project-team</report>
+                            <report>mailing-list</report>
+                            <report>issue-tracking</report>
+                            <report>license</report>
+                            <report>scm</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>taglist-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+
+
+    <distributionManagement>
+      <repository>
+        <id>people.apache.org</id>
+        <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository/</url>
+      </repository>
+      <snapshotRepository>
+        <id>people.apache.org</id>
+        <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository/</url>
+        <uniqueVersion>false</uniqueVersion>
+      </snapshotRepository>
+      <site>
+        <id>people.apache.org</id>
+        <url>scpexe://people.apache.org/home/mikedd/public_html/openjpa/site/</url>
+      </site>
+    </distributionManagement>
+</project>
\ No newline at end of file



RE: svn commit: r527320 [2/2] - in /incubator/openjpa/branches/0.9.7-incubating: ./ openjpa-all/ openjpa-examples/ openjpa-integration/ openjpa-integration/examples/ openjpa-integration/tck/ openjpa-jdbc-5/ openjpa-jdbc/ openjpa-kernel-5/ openjpa-kernel/

Posted by Patrick Linskey <pl...@bea.com>.
FYI, it looks like your client is changing line-endings for
modifications in XML files....

-Patrick

-- 
Patrick Linskey
BEA Systems, Inc. 

_______________________________________________________________________
Notice:  This email message, together with any attachments, may contain
information  of  BEA Systems,  Inc.,  its subsidiaries  and  affiliated
entities,  that may be confidential,  proprietary,  copyrighted  and/or
legally privileged, and is intended solely for the use of the individual
or entity named in this message. If you are not the intended recipient,
and have received this message in error, please immediately return this
by email and then delete it. 

> -----Original Message-----
> From: mikedd@apache.org [mailto:mikedd@apache.org] 
> Sent: Tuesday, April 10, 2007 2:59 PM
> To: open-jpa-commits@incubator.apache.org
> Subject: svn commit: r527320 [2/2] - in 
> /incubator/openjpa/branches/0.9.7-incubating: ./ openjpa-all/ 
> openjpa-examples/ openjpa-integration/ 
> openjpa-integration/examples/ openjpa-integration/tck/ 
> openjpa-jdbc-5/ openjpa-jdbc/ openjpa-kernel-5/ openjpa-kernel/ o...
> 
> Modified: 
> incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-
> incubating/openjpa-project/pom.xml?view=diff&rev=527320&r1=527
> 319&r2=527320
> ==============================================================
> ================
> --- 
> incubator/openjpa/branches/0.9.7-incubating/openjpa-project/po
> m.xml (original)
> +++ 
> incubator/openjpa/branches/0.9.7-incubating/openjpa-project/po
> m.xml Tue Apr 10 14:59:02 2007
> @@ -1,376 +1,349 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<!--
> - Copyright 2006 The Apache Software Foundation.
> - 
> - Licensed 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">
> -    <!--
> -        To build the distribution files from project root:
> -
> -        mvn clean compile package -Dtest=false
> -
> -        To build and deploy a full digned release with docs, run:
> -
> -            mvn clean deploy 
> -Pjavadoc-profile,docbook-profile,sign-release
> -
> -        Note that to sign the release, you need to have 
> "gpg" installed and
> -        create a key. See http://apache.org/dev/release-signing.html
> -    -->
> -    <modelVersion>4.0.0</modelVersion>
> -    <artifactId>openjpa-project</artifactId>
> -    <packaging>pom</packaging>
> -    <name>OpenJPA Distribution</name>
> -    <parent>
> -        <groupId>org.apache.openjpa</groupId>
> -        <artifactId>openjpa</artifactId>
> -        <version>0.9.7-incubating-SNAPSHOT</version>
> -    </parent>
> -
> -    <properties>
> -        
> <openjpa.release.keyAlias>${user.name}@apache.org</openjpa.rel
> ease.keyAlias>
> -        
> <openjpa.assembly.finalName>openjpa-${version}</openjpa.assemb
> ly.finalName>
> -        
> <openjpa.assembly.outputDirectory>${project.basedir}/target/as
> sembly</openjpa.assembly.outputDirectory>
> -
> -        
> <openjpa.assembly.binarySuffix>binary</openjpa.assembly.binarySuffix>
> -        
> <openjpa.assembly.binaryBase>${openjpa.assembly.outputDirector
> y}/${openjpa.assembly.finalName}-${openjpa.assembly.binarySuff
ix}</openjpa.assembly.binaryBase>
> -        
> <openjpa.assembly.binaryFile>${openjpa.assembly.binaryBase}.zi
> p</openjpa.assembly.binaryFile>
> -
> -        
> <openjpa.assembly.sourceSuffix>source</openjpa.assembly.sourceSuffix>
> -        
> <openjpa.assembly.sourceBase>${openjpa.assembly.outputDirector
> y}/${openjpa.assembly.finalName}-${openjpa.assembly.sourceSuff
ix}</openjpa.assembly.sourceBase>
> -        
> <openjpa.assembly.sourceFile>${openjpa.assembly.sourceBase}.zi
> p</openjpa.assembly.sourceFile>
> -
> -        <docbook.version>1.67.2</docbook.version>
> -        
> <local.repository>${settings.localRepository}</local.repository>
> -    </properties>
> -
> -    <build>
> -        <!-- needed to let maven pass the "compile" phase -->
> -        <testSourceDirectory>/none/</testSourceDirectory>
> -
> -        <!-- filter site resources -->
> -        <resources>
> -            <resource>
> -                <directory>${project.basedir}/src/site</directory>
> -                <!-- targetPath is relative to target/classes/ -->
> -                <targetPath>../filtered-site</targetPath>
> -                <filtering>false</filtering>
> -            </resource>
> -        </resources>
> -
> -        <plugins>
> -            <plugin>
> -                <artifactId>maven-assembly-plugin</artifactId>
> -                <executions>
> -                    <execution>
> -                        <id>bin</id>
> -                        <phase>package</phase>
> -                        <goals>
> -                            <goal>attached</goal>
> -                        </goals>
> -                        <configuration>
> -                            <descriptor>assembly.xml</descriptor>
> -                            
> <finalName>${openjpa.assembly.finalName}</finalName>
> -                            
> <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
> -                            
> <workDirectory>target/work</workDirectory>
> -                        </configuration>
> -                    </execution>
> -                    <execution>
> -                        <id>sources</id>
> -                        <phase>package</phase>
> -                        <goals>
> -                            <goal>attached</goal>
> -                        </goals>
> -                        <configuration>
> -                            
> <descriptor>source-assembly.xml</descriptor>
> -                            <finalName>openjpa-${version}</finalName>
> -                            
> <outputDirectory>${project.basedir}/target/assembly</outputDirectory>
> -                            
> <workDirectory>target/work</workDirectory>
> -                        </configuration>
> -                    </execution>
> -                </executions>
> -            </plugin>
> -
> -            <!--
> -                Copy over site files from src/site to 
> target/filtered-site
> -                so we can filter resources and include other 
> generated
> -                content from the openjpa-project module.
> -            -->
> -            <plugin>
> -                <artifactId>maven-resources-plugin</artifactId>
> -                <executions>
> -                    <execution>
> -                        <id>prefilter-site</id>
> -                        <phase>site</phase>
> -                        <goals>
> -                            <goal>resources</goal>
> -                        </goals>
> -                    </execution>
> -                </executions>
> -            </plugin>
> -
> -            <plugin>
> -                <groupId>org.apache.maven.plugins</groupId>
> -                <artifactId>maven-site-plugin</artifactId>
> -                <version>2.0-beta-5</version>
> -                <configuration>
> -                    
> <siteDirectory>target/filtered-site</siteDirectory>
> -                </configuration>
> -            </plugin>
> -        </plugins>
> -    </build>
> -
> -    <profiles>
> -        <!--
> -            Docbook profile. Docs can be built by running:
> -                mvn package -Dtest=false 
> -Pjavadoc-profile,docbook-profile
> -        -->
> -        <profile>
> -            <id>docbook-profile</id>
> -            <build>
> -                <plugins>
> -                    <!-- build the docs when creating the 
> site from docbook source -->
> -                    <plugin>
> -                        <artifactId>maven-antrun-plugin</artifactId>
> -                        <executions>
> -                            <execution>
> -                                <phase>process-resources</phase>
> -                                <configuration>
> -                                 <!-- 
> destdir="${project.build.directory}/site/manual" -->
> -                                    <tasks>
> -                                    <echo>Building docbook 
> manual</echo>
> -
> -                                    <mkdir 
> dir="${project.basedir}/target/stylesheets"/>
> -                                    <available 
> file="${local.repository}/docbook/docbook-xsl/${docbook.versio
> n}/docbook-xsl-${docbook.version}.zip" property="docbook.available"/>
> -                                    <fail 
> unless="docbook.available">Could not find docbook file: 
> ${local.repository}/docbook/docbook-xsl/${docbook.version}/doc
> book-xsl-${docbook.version}.zip</fail>
> -
> -                                    <unzip 
> src="${local.repository}/docbook/docbook-xsl/${docbook.version
> }/docbook-xsl-${docbook.version}.zip" 
> dest="${project.basedir}/target/stylesheets/" overwrite="false"/>
> -
> -
> -                                    <style includes="**/manual.xml"
> -                                        force="true"
> -                                        
> basedir="${project.basedir}/src/doc/manual"
> -                                        
> destdir="${project.basedir}/target/manual"
> -                                        style="manual-xhtml.xsl"
> -                                        
> classpathref="maven.runtime.classpath">
> -                                        <factory 
> name="org.apache.xalan.processor.TransformerFactoryImpl">
> -                                            <attribute 
> name="http://xml.apache.org/xalan/features/optimize" value="true"/>
> -                                        </factory>
> -                                    </style>
> -
> -                                    <!--
> -                                    <style includes="**/manual.xml"
> -                                        force="true"
> -                                        
> basedir="${project.basedir}/src/doc/manual"
> -                                        
> destdir="${project.basedir}/target/manual"
> -                                        
> style="manual-xhtml-chunk.xsl"
> -                                        
> classpathref="maven.runtime.classpath">
> -                                        <factory 
> name="org.apache.xalan.processor.TransformerFactoryImpl">
> -                                            <attribute 
> name="http://xml.apache.org/xalan/features/optimize" value="true"/>
> -                                        </factory>
> -                                    </style>
> -                                    -->
> -                                    </tasks>
> -                                </configuration>
> -                                <goals>
> -                                    <goal>run</goal>
> -                                </goals>
> -                            </execution>
> -                        </executions>
> -                    </plugin>
> -                </plugins>
> -            </build>
> -            <activation>
> -                <property>
> -                    <name>builddocs</name>
> -                    <value>true</value>
> -                </property>
> -            </activation>
> -        </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 -->
> -    <dependencies>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-all</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-lib</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-kernel</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-kernel-5</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-jdbc</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-jdbc-5</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-persistence</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-persistence-jdbc</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-xmlstore</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -        <dependency>
> -            <groupId>org.apache.openjpa</groupId>
> -            <artifactId>openjpa-examples</artifactId>
> -            <version>${pom.version}</version>
> -        </dependency>
> -
> -        <!-- included so we can include it in the distribution -->
> -        <dependency>
> -            <groupId>org.apache.derby</groupId>
> -            <artifactId>derby</artifactId>
> -            <version>10.2.2.0</version>
> -        </dependency>
> -
> -        <!-- jars needed for for docbook -->
> -        <dependency>
> -            <groupId>ant</groupId>
> -            <artifactId>ant</artifactId>
> -            <version>1.6.5</version>
> -            <scope>runtime</scope>
> -        </dependency>
> -        <dependency>
> -            <groupId>ant</groupId>
> -            <artifactId>ant-trax</artifactId>
> -            <version>1.6.5</version>
> -            <scope>runtime</scope>
> -        </dependency>
> -        <dependency>
> -            <groupId>xalan</groupId>
> -            <artifactId>xalan</artifactId>
> -            <version>2.7.0</version>
> -            <scope>runtime</scope>
> -        </dependency>
> -        <dependency>
> -            <groupId>bcel</groupId>
> -            <artifactId>bcel</artifactId>
> -            <version>5.1</version>
> -            <scope>runtime</scope>
> -        </dependency>
> -        <dependency>
> -            <groupId>docbook</groupId>
> -            <artifactId>docbook-xsl</artifactId>
> -            <version>${docbook.version}</version>
> -            <scope>runtime</scope>
> -            <type>zip</type>
> -        </dependency>
> -    </dependencies>
> -</project>
> +<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:
> +
> +        mvn clean compile package -Dtest=false
> +
> +        To build and deploy a full digned release with docs, run:
> +
> +            mvn clean deploy 
> -Pjavadoc-profile,docbook-profile,sign-release
> +
> +        Note that to sign the release, you need to have 
> "gpg" installed and
> +        create a key. See http://apache.org/dev/release-signing.html
> +    -->
> +    <modelVersion>4.0.0</modelVersion>
> +    <artifactId>openjpa-project</artifactId>
> +    <packaging>pom</packaging>
> +    <name>OpenJPA Distribution</name>
> +    <parent>
> +        <groupId>org.apache.openjpa</groupId>
> +        <artifactId>openjpa</artifactId>
> +        <version>0.9.7-incubating</version>
> +    </parent>
> +
> +    <properties>
> +        
> <openjpa.release.keyAlias>${user.name}@apache.org</openjpa.rel
> ease.keyAlias>
> +        
> <openjpa.assembly.finalName>openjpa-${version}</openjpa.assemb
> ly.finalName>
> +        
> <openjpa.assembly.outputDirectory>${project.basedir}/target/as
> sembly</openjpa.assembly.outputDirectory>
> +
> +        
> <openjpa.assembly.binarySuffix>binary</openjpa.assembly.binarySuffix>
> +        
> <openjpa.assembly.binaryBase>${openjpa.assembly.outputDirector
> y}/${openjpa.assembly.finalName}-${openjpa.assembly.binarySuff
ix}</openjpa.assembly.binaryBase>
> +        
> <openjpa.assembly.binaryFile>${openjpa.assembly.binaryBase}.zi
> p</openjpa.assembly.binaryFile>
> +
> +        
> <openjpa.assembly.sourceSuffix>source</openjpa.assembly.sourceSuffix>
> +        
> <openjpa.assembly.sourceBase>${openjpa.assembly.outputDirector
> y}/${openjpa.assembly.finalName}-${openjpa.assembly.sourceSuff
ix}</openjpa.assembly.sourceBase>
> +        
> <openjpa.assembly.sourceFile>${openjpa.assembly.sourceBase}.zi
> p</openjpa.assembly.sourceFile>
> +
> +        <docbook.version>1.67.2</docbook.version>
> +        
> <local.repository>${settings.localRepository}</local.repository>
> +    </properties>
> +
> +    <build>
> +        <!-- needed to let maven pass the "compile" phase -->
> +        <testSourceDirectory>/none/</testSourceDirectory>
> +
> +        <!-- filter site resources -->
> +        <resources>
> +            <resource>
> +                <directory>${project.basedir}/src/site</directory>
> +                <!-- targetPath is relative to target/classes/ -->
> +                <targetPath>../filtered-site</targetPath>
> +                <filtering>false</filtering>
> +            </resource>
> +        </resources>
> +
> +        <plugins>
> +            <plugin>
> +                <artifactId>maven-assembly-plugin</artifactId>
> +                <executions>
> +                    <execution>
> +                        <id>bin</id>
> +                        <phase>package</phase>
> +                        <goals>
> +                            <goal>attached</goal>
> +                        </goals>
> +                        <configuration>
> +                            <descriptor>assembly.xml</descriptor>
> +                            
> <finalName>${openjpa.assembly.finalName}</finalName>
> +                            
> <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
> +                            
> <workDirectory>target/work</workDirectory>
> +                        </configuration>
> +                    </execution>
> +                    <execution>
> +                        <id>sources</id>
> +                        <phase>package</phase>
> +                        <goals>
> +                            <goal>attached</goal>
> +                        </goals>
> +                        <configuration>
> +                            
> <descriptor>source-assembly.xml</descriptor>
> +                            <finalName>openjpa-${version}</finalName>
> +                            
> <outputDirectory>${project.basedir}/target/assembly</outputDirectory>
> +                            
> <workDirectory>target/work</workDirectory>
> +                        </configuration>
> +                    </execution>
> +                </executions>
> +            </plugin>
> +
> +            <!--
> +                Copy over site files from src/site to 
> target/filtered-site
> +                so we can filter resources and include other 
> generated
> +                content from the openjpa-project module.
> +            -->
> +            <plugin>
> +                <artifactId>maven-resources-plugin</artifactId>
> +                <executions>
> +                    <execution>
> +                        <id>prefilter-site</id>
> +                        <phase>site</phase>
> +                        <goals>
> +                            <goal>resources</goal>
> +                        </goals>
> +                    </execution>
> +                </executions>
> +            </plugin>
> +
> +            <plugin>
> +                <groupId>org.apache.maven.plugins</groupId>
> +                <artifactId>maven-site-plugin</artifactId>
> +                <version>2.0-beta-5</version>
> +                <configuration>
> +                    
> <siteDirectory>target/filtered-site</siteDirectory>
> +                </configuration>
> +            </plugin>
> +        </plugins>
> +    </build>
> +
> +    <profiles>
> +        <!--
> +            Docbook profile. Docs can be built by running:
> +                mvn package -Dtest=false 
> -Pjavadoc-profile,docbook-profile
> +        -->
> +        <profile>
> +            <id>docbook-profile</id>
> +            <build>
> +                <plugins>
> +                    <!-- build the docs when creating the 
> site from docbook source -->
> +                    <plugin>
> +                        <artifactId>maven-antrun-plugin</artifactId>
> +                        <executions>
> +                            <execution>
> +                                <phase>process-resources</phase>
> +                                <configuration>
> +                                 <!-- 
> destdir="${project.build.directory}/site/manual" -->
> +                                    <tasks>
> +                                    <echo>Building docbook 
> manual</echo>
> +
> +                                    <mkdir 
> dir="${project.basedir}/target/stylesheets" />
> +                                    <available 
> file="${local.repository}/docbook/docbook-xsl/${docbook.versio
> n}/docbook-xsl-${docbook.version}.zip" property="docbook.available" />
> +                                    <fail 
> unless="docbook.available">Could not find docbook file: 
> ${local.repository}/docbook/docbook-xsl/${docbook.version}/doc
> book-xsl-${docbook.version}.zip</fail>
> +
> +                                    <unzip 
> src="${local.repository}/docbook/docbook-xsl/${docbook.version
> }/docbook-xsl-${docbook.version}.zip" 
> dest="${project.basedir}/target/stylesheets/" overwrite="false" />
> +
> +
> +                                    <style 
> includes="**/manual.xml" force="true" 
> basedir="${project.basedir}/src/doc/manual" 
> destdir="${project.basedir}/target/manual" 
> style="manual-xhtml.xsl" classpathref="maven.runtime.classpath">
> +                                        <factory 
> name="org.apache.xalan.processor.TransformerFactoryImpl">
> +                                            <attribute 
> name="http://xml.apache.org/xalan/features/optimize" value="true" />
> +                                        </factory>
> +                                    </style>
> +
> +                                    <!--
> +                                    <style 
> includes="**/manual.xml" force="true"
> +                                        
> basedir="${project.basedir}/src/doc/manual"
> +                                        
> destdir="${project.basedir}/target/manual"
> +                                        
> style="manual-xhtml-chunk.xsl"
> +                                        
> classpathref="maven.runtime.classpath">
> +                                        <factory 
> name="org.apache.xalan.processor.TransformerFactoryImpl">
> +                                            <attribute 
> name="http://xml.apache.org/xalan/features/optimize" value="true" />
> +                                        </factory>
> +                                    </style>
> +                                    -->
> +                                    </tasks>
> +                                </configuration>
> +                                <goals>
> +                                    <goal>run</goal>
> +                                </goals>
> +                            </execution>
> +                        </executions>
> +                    </plugin>
> +                </plugins>
> +            </build>
> +            <activation>
> +                <property>
> +                    <name>builddocs</name>
> +                    <value>true</value>
> +                </property>
> +            </activation>
> +        </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 -->
> +    <dependencies>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-all</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-lib</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-kernel</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-kernel-5</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-jdbc</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-jdbc-5</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-persistence</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-persistence-jdbc</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-xmlstore</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.openjpa</groupId>
> +            <artifactId>openjpa-examples</artifactId>
> +            <version>${pom.version}</version>
> +        </dependency>
> +
> +        <!-- included so we can include it in the distribution -->
> +        <dependency>
> +            <groupId>org.apache.derby</groupId>
> +            <artifactId>derby</artifactId>
> +            <version>10.2.2.0</version>
> +        </dependency>
> +
> +        <!-- jars needed for for docbook -->
> +        <dependency>
> +            <groupId>ant</groupId>
> +            <artifactId>ant</artifactId>
> +            <version>1.6.5</version>
> +            <scope>runtime</scope>
> +        </dependency>
> +        <dependency>
> +            <groupId>ant</groupId>
> +            <artifactId>ant-trax</artifactId>
> +            <version>1.6.5</version>
> +            <scope>runtime</scope>
> +        </dependency>
> +        <dependency>
> +            <groupId>xalan</groupId>
> +            <artifactId>xalan</artifactId>
> +            <version>2.7.0</version>
> +            <scope>runtime</scope>
> +        </dependency>
> +        <dependency>
> +            <groupId>bcel</groupId>
> +            <artifactId>bcel</artifactId>
> +            <version>5.1</version>
> +            <scope>runtime</scope>
> +        </dependency>
> +        <dependency>
> +            <groupId>docbook</groupId>
> +            <artifactId>docbook-xsl</artifactId>
> +            <version>${docbook.version}</version>
> +            <scope>runtime</scope>
> +            <type>zip</type>
> +        </dependency>
> +    </dependencies>
> +</project>
> \ No newline at end of file
> 
> Modified: 
> incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-
> incubating/openjpa-xmlstore/pom.xml?view=diff&rev=527320&r1=52
> 7319&r2=527320
> ==============================================================
> ================
> --- 
> incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/p
> om.xml (original)
> +++ 
> incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/p
> om.xml Tue Apr 10 14:59:02 2007
> @@ -1,22 +1,4 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<!--
> - Copyright 2006 The Apache Software Foundation.
> - 
> - Licensed 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">
> +<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>
> @@ -27,7 +9,7 @@
>      <parent>
>          <groupId>org.apache.openjpa</groupId>
>          <artifactId>openjpa</artifactId>
> -        <version>0.9.7-incubating-SNAPSHOT</version>
> +        <version>0.9.7-incubating</version>
>      </parent>
>      <dependencies>
>          <dependency>
> @@ -49,4 +31,4 @@
>              </plugin>
>          </plugins>
>      </build>
> -</project>
> +</project>
> \ No newline at end of file
> 
> Modified: incubator/openjpa/branches/0.9.7-incubating/pom.xml
> URL: 
> http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-
> incubating/pom.xml?view=diff&rev=527320&r1=527319&r2=527320
> ==============================================================
> ================
> --- incubator/openjpa/branches/0.9.7-incubating/pom.xml (original)
> +++ incubator/openjpa/branches/0.9.7-incubating/pom.xml Tue 
> Apr 10 14:59:02 2007
> @@ -1,324 +1,305 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<!--
> - Copyright 2006 The Apache Software Foundation.
> - 
> - Licensed 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">
> -    <modelVersion>4.0.0</modelVersion>
> -    <prerequisites>
> -        <maven>2.0.4</maven>
> -    </prerequisites>
> -    <groupId>org.apache.openjpa</groupId>
> -    <artifactId>openjpa</artifactId>
> -    <packaging>pom</packaging>
> -    <name>OpenJPA</name>
> -    <description>OpenJPA</description>
> -    <!--
> -        Changing this version needs to also be done in all 
> children poms
> -        See: http://jira.codehaus.org/browse/MNG-624
> -    -->
> -    <version>0.9.7-incubating-SNAPSHOT</version>
> -    <url>http://incubator.apache.org/projects/openjpa</url>
> -    <issueManagement>
> -        <system>jira</system>
> -        <url>http://issues.apache.org/jira/browse/OPENJPA</url>
> -    </issueManagement>
> -    <inceptionYear>2006</inceptionYear>
> -    <mailingLists>
> -        <mailingList>
> -            <name>OpenJPA Developer List</name>
> -            
> <subscribe>open-jpa-dev-subscribe@incubator.apache.org</subscribe>
> -            
> <unsubscribe>open-jpa-dev-unsubscribe@incubator.apache.org</un
> subscribe>
> -            <post>open-jpa-dev@incubator.apache.org</post>
> -            
> <archive>http://mail-archives.apache.org/mod_mbox/incubator-op
> en-jpa-dev/</archive>
> -        </mailingList>
> -        <mailingList>
> -            <name>OpenJPA Commits List</name>
> -            
> <subscribe>open-jpa-commits-subscribe@incubator.apache.org</subscribe>
> -            
> <unsubscribe>open-jpa-commits-unsubscribe@incubator.apache.org
> </unsubscribe>
> -            <post>open-jpa-commits@incubator.apache.org</post>
> -            
> <archive>http://mail-archives.apache.org/mod_mbox/incubator-op
> en-jpa-commits/</archive>
> -        </mailingList>
> -    </mailingLists>
> -    <developers>
> -        <developer>
> -            <name>Patrick Linskey</name>
> -            <id>plinskey</id>
> -            <organization>BEA Systems, Inc.</organization>
> -            <email>plinskey@bea.com</email>
> -        </developer>
> -        <developer>
> -            <name>Abe White</name>
> -            <id>awhite</id>
> -            <organization>BEA Systems, Inc.</organization>
> -            <email>awhite@bea.com</email>
> -        </developer>
> -        <developer>
> -            <name>Steve Kim</name>
> -            <id>stkim</id>
> -            <organization>BEA Systems, Inc.</organization>
> -            <email>stkim@bea.com</email>
> -        </developer>
> -        <developer>
> -            <name>Marc Prud'hommeaux</name>
> -            <id>mprudhom</id>
> -            <organization>BEA Systems, Inc.</organization>
> -            <email>mprudhom@bea.com</email>
> -        </developer>
> -    </developers>
> -    <licenses>
> -        <license>
> -            <name>Apache Software License 2.0</name>
> -            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
> -            <distribution>repo</distribution>
> -        </license>
> -    </licenses>
> -    <organization>
> -        <name>Apache Software Foundation</name>
> -        <url>http://www.apache.org</url>
> -    </organization>
> -    <scm>
> -        
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/
> openjpa/branches/0.9.7-incubating</connection>
> -        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
incubator/openjpa/branches/0.9.7-incubating</developerConnection>
> -        
> <url>https://svn.apache.org/repos/asf/incubator/openjpa/branch
> es/0.9.7-incubating</url>
> -    </scm>
> -    <modules>
> -        <module>openjpa-lib</module>
> -        <module>openjpa-kernel</module>
> -        <module>openjpa-jdbc</module>
> -        <module>openjpa-xmlstore</module>
> -        <module>openjpa-all</module>
> -        <module>openjpa-project</module>
> -        <module>openjpa-integration</module>
> -    </modules>
> -    <profiles>
> -        <profile>
> -            <id>jdk1.5</id>
> -            <activation>
> -                <jdk>1.5</jdk>
> -            </activation>
> -            <modules>
> -                <module>openjpa-persistence</module>
> -                <module>openjpa-persistence-jdbc</module>
> -                <module>openjpa-kernel-5</module>
> -                <module>openjpa-jdbc-5</module>
> -                <module>openjpa-examples</module>
> -            </modules>
> -        </profile>
> -        <profile>
> -            <id>release</id>
> -            <activation>
> -                <property>
> -                    <name>release</name>
> -                </property>
> -            </activation>
> -            <modules>
> -                <module>openjpa-project</module>
> -            </modules>
> -            <build>
> -            <plugins>
> -                <plugin>
> -                    <artifactId>maven-gpg-plugin</artifactId>
> -                    <version>1.0-alpha-1</version>
> -                    <configuration>
> -                        <passphrase>${gpg.passphrase}</passphrase>
> -                    </configuration>
> -                    <executions>
> -                        <execution>
> -                            <goals>
> -                                <goal>sign</goal>
> -                            </goals>
> -                        </execution>
> -                    </executions>
> -                </plugin> 
> -                <plugin>
> -                    <inherited>true</inherited>
> -                    <artifactId>maven-deploy-plugin</artifactId>
> -                    <version>2.3</version>
> -                    <configuration>
> -                        
> <altDeploymentRepository>${deploy.altRepository}</altDeploymen
> tRepository>
> -                        <updateReleaseInfo>true</updateReleaseInfo>
> -                    </configuration>
> -                </plugin>
> -                <plugin>
> -                    
> <groupId>org.apache.maven.plugins</groupId>        
> -                    <artifactId>maven-release-plugin</artifactId>
> -                    <version>2.0-beta-4</version>          
> -                    <configuration>
> -                        
> <tagBase>https://svn.apache.org/repos/asf/incubator/openjpa/br
> anches/0.9.7-incubating/tags/</tagBase>
> -                    </configuration>
> -                </plugin>
> -            </plugins>
> -        </build>
> -        </profile>
> -        <profile>
> -            <!--                        
> -                Javadoc profile. Docs can be built by running:
> -                    mvn package -Dtest=false 
> -Pjavadoc-profile,docbook-profile
> -            -->  
> -            <id>javadoc-profile</id>
> -            <build>
> -                <plugins>
> -                    <plugin>
> -                        <groupId>org.apache.maven.plugins</groupId>
> -                        <artifactId>maven-javadoc-plugin</artifactId>
> -                        <version>2.1</version>
> -                        <executions>
> -                            <execution>
> -                                <phase>package</phase>
> -                                <goals><goal>javadoc</goal></goals>
> -                                <configuration>
> -                                    <aggregate>true</aggregate>
> -                                    
> <excludePackageNames>hellojpa</excludePackageNames>
> -                                    <verbose>false</verbose>
> -                                    <!-- 
> <linksource>true</linksource> -->
> -                                    <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>
> -                </plugins>
> -            </build>
> -            <activation>
> -                <property>
> -                    <name>builddocs</name>
> -                    <value>true</value>
> -                </property>
> -            </activation>
> -        </profile>
> -
> -    </profiles>
> -
> -    <repositories>
> -        <repository>
> -            <id>central</id>
> -            <name>Maven Repository Switchboard</name>
> -            <url>http://www.ibiblio.org/maven2</url>
> -        </repository>
> -    </repositories>
> -    <dependencies>
> -        <dependency>
> -            <groupId>junit</groupId>
> -            <artifactId>junit</artifactId>
> -            <version>3.8.1</version>
> -            <scope>compile</scope>
> -        </dependency>
> -    </dependencies>
> -    <build>
> -        <resources>
> -            <resource>
> -                <directory>src/main/resources</directory>
> -            </resource>
> -            <!-- also include license and notice files in 
> all the jars -->
> -            <resource>
> -                <directory>${basedir}/../openjpa-project/</directory>
> -                <includes>
> -                    <include>NOTICE.txt</include>
> -                    <include>LICENSE.txt</include>
> -                    <include>DISCLAIMER.txt</include>
> -                </includes>
> -                <targetPath>META-INF</targetPath>
> -            </resource>
> -        </resources>
> -        <pluginManagement>
> -            <plugins>
> -                <plugin>
> -                    <groupId>org.apache.maven.plugins</groupId>
> -                    <artifactId>maven-compiler-plugin</artifactId>
> -                    <configuration>
> -                        <source>1.5</source>
> -                        <target>1.5</target>
> -                    </configuration>
> -                </plugin>
> -                <plugin>
> -                    <groupId>org.apache.maven.plugins</groupId>
> -                    <artifactId>maven-jar-plugin</artifactId>
> -                    <version>2.1</version>
> -                    <configuration>
> -                        <archive>
> -                            <manifest>
> -                                
> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
> -                                
> <addDefaultImplementationEntries>true</addDefaultImplementatio
> nEntries>
> -                            </manifest>
> -                        </archive>
> -                    </configuration>
> -                </plugin>
> -                <plugin>
> -                    <groupId>org.apache.maven.plugins</groupId>
> -                    <artifactId>maven-surefire-plugin</artifactId>
> -                    <version>2.2</version>
> -                    <configuration>
> -                        <useFile>false</useFile>
> -                        <trimStackTrace>false</trimStackTrace>
> -                        
> <useSystemClassLoader>true</useSystemClassLoader>
> -                    </configuration>
> -                </plugin>
> -            </plugins>
> -        </pluginManagement>
> -    </build>
> -    <reporting>
> -        <plugins>
> -            <plugin>
> -                
> <artifactId>maven-project-info-reports-plugin</artifactId>
> -                <reportSets>
> -                    <reportSet>
> -                        <reports>
> -                            <report>jdepend-maven-plugin</report>
> -                            <!-- 
> <report>jxr-maven-plugin</report> -->
> -                            
> <report>surefire-report-maven-plugin</report>
> -                            <report>maven-javadoc-plugin</report>
> -                            <report>project-team</report>
> -                            <report>mailing-list</report>
> -                            <report>issue-tracking</report>
> -                            <report>license</report>
> -                            <report>scm</report>
> -                        </reports>
> -                    </reportSet>
> -                </reportSets>
> -            </plugin>
> -            <plugin>
> -                <artifactId>maven-surefire-plugin</artifactId>
> -            </plugin>
> -            <plugin>
> -                <groupId>org.codehaus.mojo</groupId>
> -                <artifactId>taglist-maven-plugin</artifactId>
> -            </plugin>
> -        </plugins>
> -    </reporting>
> -
> -
> -    <distributionManagement>
> -      <repository>
> -        <id>people.apache.org</id>
> -        
> <url>scp://people.apache.org/www/people.apache.org/repo/m2-inc
> ubating-repository/</url>
> -      </repository>
> -      <snapshotRepository>
> -        <id>people.apache.org</id>
> -        
> <url>scp://people.apache.org/www/people.apache.org/repo/m2-sna
> pshot-repository/</url>
> -        <uniqueVersion>false</uniqueVersion>
> -      </snapshotRepository>
> -      <site>
> -        <id>people.apache.org</id>
> -        
> <url>scpexe://people.apache.org/home/mikedd/public_html/openjp
> a/site/</url>
> -      </site>
> -    </distributionManagement>
> -</project>
> +<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>
> +    </prerequisites>
> +    <groupId>org.apache.openjpa</groupId>
> +    <artifactId>openjpa</artifactId>
> +    <packaging>pom</packaging>
> +    <name>OpenJPA</name>
> +    <description>OpenJPA</description>
> +    <!--
> +        Changing this version needs to also be done in all 
> children poms
> +        See: http://jira.codehaus.org/browse/MNG-624
> +    -->
> +    <version>0.9.7-incubating</version>
> +    <url>http://incubator.apache.org/projects/openjpa</url>
> +    <issueManagement>
> +        <system>jira</system>
> +        <url>http://issues.apache.org/jira/browse/OPENJPA</url>
> +    </issueManagement>
> +    <inceptionYear>2006</inceptionYear>
> +    <mailingLists>
> +        <mailingList>
> +            <name>OpenJPA Developer List</name>
> +            
> <subscribe>open-jpa-dev-subscribe@incubator.apache.org</subscribe>
> +            
> <unsubscribe>open-jpa-dev-unsubscribe@incubator.apache.org</un
> subscribe>
> +            <post>open-jpa-dev@incubator.apache.org</post>
> +            
> <archive>http://mail-archives.apache.org/mod_mbox/incubator-op
> en-jpa-dev/</archive>
> +        </mailingList>
> +        <mailingList>
> +            <name>OpenJPA Commits List</name>
> +            
> <subscribe>open-jpa-commits-subscribe@incubator.apache.org</subscribe>
> +            
> <unsubscribe>open-jpa-commits-unsubscribe@incubator.apache.org
> </unsubscribe>
> +            <post>open-jpa-commits@incubator.apache.org</post>
> +            
> <archive>http://mail-archives.apache.org/mod_mbox/incubator-op
> en-jpa-commits/</archive>
> +        </mailingList>
> +    </mailingLists>
> +    <developers>
> +        <developer>
> +            <name>Patrick Linskey</name>
> +            <id>plinskey</id>
> +            <organization>BEA Systems, Inc.</organization>
> +            <email>plinskey@bea.com</email>
> +        </developer>
> +        <developer>
> +            <name>Abe White</name>
> +            <id>awhite</id>
> +            <organization>BEA Systems, Inc.</organization>
> +            <email>awhite@bea.com</email>
> +        </developer>
> +        <developer>
> +            <name>Steve Kim</name>
> +            <id>stkim</id>
> +            <organization>BEA Systems, Inc.</organization>
> +            <email>stkim@bea.com</email>
> +        </developer>
> +        <developer>
> +            <name>Marc Prud'hommeaux</name>
> +            <id>mprudhom</id>
> +            <organization>BEA Systems, Inc.</organization>
> +            <email>mprudhom@bea.com</email>
> +        </developer>
> +    </developers>
> +    <licenses>
> +        <license>
> +            <name>Apache Software License 2.0</name>
> +            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
> +            <distribution>repo</distribution>
> +        </license>
> +    </licenses>
> +    <organization>
> +        <name>Apache Software Foundation</name>
> +        <url>http://www.apache.org</url>
> +    </organization>
> +    <scm>
> +        
> <connection>scm:svn:https://svn.apache.org/repos/asf/incubator
> /openjpa/branches/0.9.7-incubating/tags/openjpa-0.9.7-incubati
> ng-RC1</connection>
> +        
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/
incubator/openjpa/branches/0.9.7-incubating/tags/openjpa-0.9.7-incubatin
g-> RC1</developerConnection>
> +        
> <url>https://svn.apache.org/repos/asf/incubator/openjpa/branch
> es/0.9.7-incubating/tags/openjpa-0.9.7-incubating-RC1</url>
> +    </scm>
> +    <modules>
> +        <module>openjpa-lib</module>
> +        <module>openjpa-kernel</module>
> +        <module>openjpa-jdbc</module>
> +        <module>openjpa-xmlstore</module>
> +        <module>openjpa-all</module>
> +        <module>openjpa-project</module>
> +        <module>openjpa-integration</module>
> +    </modules>
> +    <profiles>
> +        <profile>
> +            <id>jdk1.5</id>
> +            <activation>
> +                <jdk>1.5</jdk>
> +            </activation>
> +            <modules>
> +                <module>openjpa-persistence</module>
> +                <module>openjpa-persistence-jdbc</module>
> +                <module>openjpa-kernel-5</module>
> +                <module>openjpa-jdbc-5</module>
> +                <module>openjpa-examples</module>
> +            </modules>
> +        </profile>
> +        <profile>
> +            <id>release</id>
> +            <activation>
> +                <property>
> +                    <name>release</name>
> +                </property>
> +            </activation>
> +            <modules>
> +                <module>openjpa-project</module>
> +            </modules>
> +            <build>
> +            <plugins>
> +                <plugin>
> +                    <artifactId>maven-gpg-plugin</artifactId>
> +                    <version>1.0-alpha-1</version>
> +                    <configuration>
> +                        <passphrase>${gpg.passphrase}</passphrase>
> +                    </configuration>
> +                    <executions>
> +                        <execution>
> +                            <goals>
> +                                <goal>sign</goal>
> +                            </goals>
> +                        </execution>
> +                    </executions>
> +                </plugin> 
> +                <plugin>
> +                    <inherited>true</inherited>
> +                    <artifactId>maven-deploy-plugin</artifactId>
> +                    <version>2.3</version>
> +                    <configuration>
> +                        
> <altDeploymentRepository>${deploy.altRepository}</altDeploymen
> tRepository>
> +                        <updateReleaseInfo>true</updateReleaseInfo>
> +                    </configuration>
> +                </plugin>
> +                <plugin>
> +                    
> <groupId>org.apache.maven.plugins</groupId>        
> +                    <artifactId>maven-release-plugin</artifactId>
> +                    <version>2.0-beta-4</version>          
> +                    <configuration>
> +                        
> <tagBase>https://svn.apache.org/repos/asf/incubator/openjpa/br
> anches/0.9.7-incubating/tags/</tagBase>
> +                    </configuration>
> +                </plugin>
> +            </plugins>
> +        </build>
> +        </profile>
> +        <profile>
> +            <!--                        
> +                Javadoc profile. Docs can be built by running:
> +                    mvn package -Dtest=false 
> -Pjavadoc-profile,docbook-profile
> +            -->  
> +            <id>javadoc-profile</id>
> +            <build>
> +                <plugins>
> +                    <plugin>
> +                        <groupId>org.apache.maven.plugins</groupId>
> +                        <artifactId>maven-javadoc-plugin</artifactId>
> +                        <version>2.1</version>
> +                        <executions>
> +                            <execution>
> +                                <phase>package</phase>
> +                                <goals><goal>javadoc</goal></goals>
> +                                <configuration>
> +                                    <aggregate>true</aggregate>
> +                                    
> <excludePackageNames>hellojpa</excludePackageNames>
> +                                    <verbose>false</verbose>
> +                                    <!-- 
> <linksource>true</linksource> -->
> +                                    <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>
> +                </plugins>
> +            </build>
> +            <activation>
> +                <property>
> +                    <name>builddocs</name>
> +                    <value>true</value>
> +                </property>
> +            </activation>
> +        </profile>
> +
> +    </profiles>
> +
> +    <repositories>
> +        <repository>
> +            <id>central</id>
> +            <name>Maven Repository Switchboard</name>
> +            <url>http://www.ibiblio.org/maven2</url>
> +        </repository>
> +    </repositories>
> +    <dependencies>
> +        <dependency>
> +            <groupId>junit</groupId>
> +            <artifactId>junit</artifactId>
> +            <version>3.8.1</version>
> +            <scope>compile</scope>
> +        </dependency>
> +    </dependencies>
> +    <build>
> +        <resources>
> +            <resource>
> +                <directory>src/main/resources</directory>
> +            </resource>
> +            <!-- also include license and notice files in 
> all the jars -->
> +            <resource>
> +                <directory>${basedir}/../openjpa-project/</directory>
> +                <includes>
> +                    <include>NOTICE.txt</include>
> +                    <include>LICENSE.txt</include>
> +                    <include>DISCLAIMER.txt</include>
> +                </includes>
> +                <targetPath>META-INF</targetPath>
> +            </resource>
> +        </resources>
> +        <pluginManagement>
> +            <plugins>
> +                <plugin>
> +                    <groupId>org.apache.maven.plugins</groupId>
> +                    <artifactId>maven-compiler-plugin</artifactId>
> +                    <configuration>
> +                        <source>1.5</source>
> +                        <target>1.5</target>
> +                    </configuration>
> +                </plugin>
> +                <plugin>
> +                    <groupId>org.apache.maven.plugins</groupId>
> +                    <artifactId>maven-jar-plugin</artifactId>
> +                    <version>2.1</version>
> +                    <configuration>
> +                        <archive>
> +                            <manifest>
> +                                
> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
> +                                
> <addDefaultImplementationEntries>true</addDefaultImplementatio
> nEntries>
> +                            </manifest>
> +                        </archive>
> +                    </configuration>
> +                </plugin>
> +                <plugin>
> +                    <groupId>org.apache.maven.plugins</groupId>
> +                    <artifactId>maven-surefire-plugin</artifactId>
> +                    <version>2.2</version>
> +                    <configuration>
> +                        <useFile>false</useFile>
> +                        <trimStackTrace>false</trimStackTrace>
> +                        
> <useSystemClassLoader>true</useSystemClassLoader>
> +                    </configuration>
> +                </plugin>
> +            </plugins>
> +        </pluginManagement>
> +    </build>
> +    <reporting>
> +        <plugins>
> +            <plugin>
> +                
> <artifactId>maven-project-info-reports-plugin</artifactId>
> +                <reportSets>
> +                    <reportSet>
> +                        <reports>
> +                            <report>jdepend-maven-plugin</report>
> +                            <!-- 
> <report>jxr-maven-plugin</report> -->
> +                            
> <report>surefire-report-maven-plugin</report>
> +                            <report>maven-javadoc-plugin</report>
> +                            <report>project-team</report>
> +                            <report>mailing-list</report>
> +                            <report>issue-tracking</report>
> +                            <report>license</report>
> +                            <report>scm</report>
> +                        </reports>
> +                    </reportSet>
> +                </reportSets>
> +            </plugin>
> +            <plugin>
> +                <artifactId>maven-surefire-plugin</artifactId>
> +            </plugin>
> +            <plugin>
> +                <groupId>org.codehaus.mojo</groupId>
> +                <artifactId>taglist-maven-plugin</artifactId>
> +            </plugin>
> +        </plugins>
> +    </reporting>
> +
> +
> +    <distributionManagement>
> +      <repository>
> +        <id>people.apache.org</id>
> +        
> <url>scp://people.apache.org/www/people.apache.org/repo/m2-inc
> ubating-repository/</url>
> +      </repository>
> +      <snapshotRepository>
> +        <id>people.apache.org</id>
> +        
> <url>scp://people.apache.org/www/people.apache.org/repo/m2-sna
> pshot-repository/</url>
> +        <uniqueVersion>false</uniqueVersion>
> +      </snapshotRepository>
> +      <site>
> +        <id>people.apache.org</id>
> +        
> <url>scpexe://people.apache.org/home/mikedd/public_html/openjp
> a/site/</url>
> +      </site>
> +    </distributionManagement>
> +</project>
> \ No newline at end of file
> 
> 
> 

Notice:  This email message, together with any attachments, may contain information  of  BEA Systems,  Inc.,  its subsidiaries  and  affiliated entities,  that may be confidential,  proprietary,  copyrighted  and/or legally privileged, and is intended solely for the use of the individual or entity named in this message. If you are not the intended recipient, and have received this message in error, please immediately return this by email and then delete it.

Re: svn commit: r527320 [2/2] - in /incubator/openjpa/branches/0.9.7-incubating: ./ openjpa-all/ openjpa-examples/ openjpa-integration/ openjpa-integration/examples/ openjpa-integration/tck/ openjpa-jdbc-5/ openjpa-jdbc/ openjpa-kernel-5/ openjpa-kernel/ o...

Posted by Craig L Russell <Cr...@Sun.COM>.
This checkin looks like a line ending mismatch. All xml files should  
be specified as eol-style native.

Craig

On Apr 10, 2007, at 2:59 PM, mikedd@apache.org wrote:

> Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa- 
> project/pom.xml
> URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7- 
> incubating/openjpa-project/pom.xml? 
> view=diff&rev=527320&r1=527319&r2=527320
> ====================================================================== 
> ========
> --- incubator/openjpa/branches/0.9.7-incubating/openjpa-project/ 
> pom.xml (original)
> +++ incubator/openjpa/branches/0.9.7-incubating/openjpa-project/ 
> pom.xml Tue Apr 10 14:59:02 2007

Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!


Re: svn commit: r527320 [2/2] - in /incubator/openjpa/branches/0.9.7-incubating: ./ openjpa-all/ openjpa-examples/ openjpa-integration/ openjpa-integration/examples/ openjpa-integration/tck/ openjpa-jdbc-5/ openjpa-jdbc/ openjpa-kernel-5/ openjpa-kernel/ o...

Posted by Craig L Russell <Cr...@Sun.COM>.
This checkin looks like a line ending mismatch. All xml files should  
be specified as eol-style native.

Craig

On Apr 10, 2007, at 2:59 PM, mikedd@apache.org wrote:

> Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa- 
> project/pom.xml
> URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7- 
> incubating/openjpa-project/pom.xml? 
> view=diff&rev=527320&r1=527319&r2=527320
> ====================================================================== 
> ========
> --- incubator/openjpa/branches/0.9.7-incubating/openjpa-project/ 
> pom.xml (original)
> +++ incubator/openjpa/branches/0.9.7-incubating/openjpa-project/ 
> pom.xml Tue Apr 10 14:59:02 2007

Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!