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 2008/07/17 02:09:56 UTC
svn commit: r677472 - in /openjpa/trunk: ./ openjpa-all/ openjpa-examples/
openjpa-jdbc/ openjpa-kernel/ openjpa-lib/ openjpa-persistence-jdbc/
openjpa-persistence/ openjpa-project/ openjpa-slice/ openjpa-xmlstore/
Author: mikedd
Date: Wed Jul 16 17:09:55 2008
New Revision: 677472
URL: http://svn.apache.org/viewvc?rev=677472&view=rev
Log:
OPENJPA-633 setting consistent eol-style for pom.xml files in trunk
Modified:
openjpa/trunk/openjpa-all/pom.xml (props changed)
openjpa/trunk/openjpa-examples/pom.xml (props changed)
openjpa/trunk/openjpa-jdbc/pom.xml (props changed)
openjpa/trunk/openjpa-kernel/pom.xml (contents, props changed)
openjpa/trunk/openjpa-lib/pom.xml (props changed)
openjpa/trunk/openjpa-persistence-jdbc/pom.xml (props changed)
openjpa/trunk/openjpa-persistence/pom.xml (props changed)
openjpa/trunk/openjpa-project/pom.xml (contents, props changed)
openjpa/trunk/openjpa-slice/pom.xml (contents, props changed)
openjpa/trunk/openjpa-xmlstore/pom.xml (props changed)
openjpa/trunk/pom.xml (props changed)
Propchange: openjpa/trunk/openjpa-all/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openjpa/trunk/openjpa-examples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openjpa/trunk/openjpa-jdbc/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/trunk/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/pom.xml?rev=677472&r1=677471&r2=677472&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel/pom.xml Wed Jul 16 17:09:55 2008
@@ -1,173 +1,173 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!--
Maven release plugin requires the project tag to be on a single line.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-kernel</artifactId>
- <packaging>jar</packaging>
- <name>OpenJPA Kernel</name>
- <description>OpenJPA Kernel</description>
- <url>http://openjpa.apache.org</url>
- <parent>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-lib</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.ibm.websphere</groupId>
- <artifactId>websphere_uow_api</artifactId>
- <version>0.0.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <id>jjtree-jpql</id>
- <phase>generate-sources</phase>
- <configuration>
- <sourceDirectory>
- ${basedir}/src/main/jjtree/org/apache/openjpa/kernel/jpql</sourceDirectory>
- <outputDirectory>
- ${project.build.directory}/generated-sources/jjtree/org/apache/openjpa/kernel/jpql</outputDirectory>
- <buildNodeFiles>false</buildNodeFiles>
- </configuration>
- <goals>
- <goal>jjtree</goal>
- </goals>
- </execution>
- <execution>
- <id>javacc-jpql</id>
- <phase>generate-sources</phase>
- <configuration>
- <sourceDirectory>
- ${project.build.directory}/generated-sources/jjtree/org/apache/openjpa/kernel/jpql</sourceDirectory>
- <outputDirectory>
- ${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql</outputDirectory>
- </configuration>
- <goals>
- <goal>javacc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <delete
- file="${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql/ParseException.java"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>add-was-interfaces</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-standard-sco-proxies</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
- <arg line="-utils 5" />
- </java>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <excludes>
- <exclude>**/com/ibm/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <!--
- Internal (in SVN) repository which contains jar files that are not
- publicly available and cannot be re-distributed.
- -->
- <repository>
- <id>openjpa-internal</id>
- <name>Internal repository</name>
- <url>file://${basedir}/internal-repository</url>
- </repository>
- </repositories>
-</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>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-kernel</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenJPA Kernel</name>
+ <description>OpenJPA Kernel</description>
+ <url>http://openjpa.apache.org</url>
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-lib</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.websphere</groupId>
+ <artifactId>websphere_uow_api</artifactId>
+ <version>0.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>jjtree-jpql</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceDirectory>
+ ${basedir}/src/main/jjtree/org/apache/openjpa/kernel/jpql</sourceDirectory>
+ <outputDirectory>
+ ${project.build.directory}/generated-sources/jjtree/org/apache/openjpa/kernel/jpql</outputDirectory>
+ <buildNodeFiles>false</buildNodeFiles>
+ </configuration>
+ <goals>
+ <goal>jjtree</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>javacc-jpql</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceDirectory>
+ ${project.build.directory}/generated-sources/jjtree/org/apache/openjpa/kernel/jpql</sourceDirectory>
+ <outputDirectory>
+ ${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql</outputDirectory>
+ </configuration>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <delete
+ file="${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql/ParseException.java"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>add-was-interfaces</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-standard-sco-proxies</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
+ <arg line="-utils 5" />
+ </java>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <excludes>
+ <exclude>**/com/ibm/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <!--
+ Internal (in SVN) repository which contains jar files that are not
+ publicly available and cannot be re-distributed.
+ -->
+ <repository>
+ <id>openjpa-internal</id>
+ <name>Internal repository</name>
+ <url>file://${basedir}/internal-repository</url>
+ </repository>
+ </repositories>
+</project>
Propchange: openjpa/trunk/openjpa-kernel/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openjpa/trunk/openjpa-lib/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openjpa/trunk/openjpa-persistence/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=677472&r1=677471&r2=677472&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Wed Jul 16 17:09:55 2008
@@ -1,321 +1,321 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!--
- Please keep the project tag on one line to avoid confusing
- the release plugin.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
- 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>apache-openjpa</artifactId>
- <packaging>pom</packaging>
- <name>OpenJPA Distribution</name>
- <parent>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <properties>
- <openjpa.release.keyAlias>
- ${user.name}@apache.org
- </openjpa.release.keyAlias>
-
- <openjpa.assembly.finalName>
- ${artifactId}-${version}</openjpa.assembly.finalName>
- <openjpa.assembly.outputDirectory>
- ${project.basedir}/../target/site/downloads
- </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>
-
- <parent.site.docs>
- ${project.basedir}/../target/site/docs
- </parent.site.docs>
-
- <docbook.source>${project.basedir}/src/doc/manual</docbook.source>
- <docbook.target>${project.basedir}/target/manual</docbook.target>
- <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>
- <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>
- <outputDirectory>${openjpa.assembly.outputDirectory}</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:
- MAVEN_OPTS=-Xmx512m
- mvn -f openjpa-project/pom.xml process-resources -Pdocbook-profile
- -->
- <profile>
- <id>docbook-profile</id>
- <build>
- <plugins>
- <!-- build the docs when processing resources -->
- <plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>build-pdf-doc</id>
- <phase>process-resources</phase>
- <goals><goal>generate-pdf</goal></goals>
- <configuration>
- <sourceDirectory>
- ${docbook.source}
- </sourceDirectory>
- <targetDirectory>
- ${docbook.target}
- </targetDirectory>
- <includes>manual.xml</includes>
- <foCustomization>
- ${docbook.source}/manual-pdf.xsl
- </foCustomization>
- <imgSrcPath>
- ${docbook.source}/
- </imgSrcPath>
- <postProcess>
- <!-- copy to parent module for
- expanded access in upload -->
- <mkdir dir="${parent.site.docs}" />
- <delete file="${docbook.target}/manual.fo" />
- <copy todir="${parent.site.docs}">
- <fileset dir="${docbook.target}">
- <include name="manual.pdf" />
- </fileset>
- </copy>
- </postProcess>
- </configuration>
- </execution>
- <execution>
- <id>build-chunked-doc</id>
- <phase>process-resources</phase>
- <goals><goal>generate-html</goal></goals>
- <configuration>
- <sourceDirectory>
- ${docbook.source}
- </sourceDirectory>
- <targetDirectory>
- ${docbook.target}
- </targetDirectory>
- <includes>manual.xml</includes>
- <chunkedOutput>true</chunkedOutput>
- <chunkQuietly>false</chunkQuietly>
- <htmlCustomization>
- ${docbook.source}/manual-xhtml-chunk.xsl
- </htmlCustomization>
- <postProcess>
- <!-- rename manual to index -->
- <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html" />
-
- <!-- copy over images and styles -->
- <mkdir dir="${docbook.target}/img" />
- <copy todir="${docbook.target}/img">
- <fileset dir="${docbook.source}/img">
- <include name="*.*" />
- </fileset>
- </copy>
-
- <mkdir dir="${docbook.target}/css" />
- <copy todir="${docbook.target}/css">
- <fileset dir="${docbook.source}/css">
- <include name="*.*" />
- </fileset>
- </copy>
-
- <!-- copy to parent module for
- expanded access in upload -->
- <mkdir dir="${parent.site.docs}" />
- <copy todir="${parent.site.docs}">
- <fileset dir="${docbook.target}">
- <include name="*.*" />
- </fileset>
- </copy>
- </postProcess>
- </configuration>
- </execution>
- <execution>
- <id>build-single-doc</id>
- <phase>process-resources</phase>
- <goals><goal>generate-html</goal></goals>
- <configuration>
- <sourceDirectory>
- ${docbook.source}
- </sourceDirectory>
- <targetDirectory>
- ${docbook.target}
- </targetDirectory>
- <includes>manual.xml</includes>
- <chunkedOutput>false</chunkedOutput>
- <htmlCustomization>
- ${docbook.source}/manual-xhtml.xsl
- </htmlCustomization>
- <postProcess>
- <!-- copy to parent module for
- expanded access in upload -->
- <mkdir dir="${parent.site.docs}" />
- <copy todir="${parent.site.docs}">
- <fileset dir="${docbook.target}">
- <include name="manual.html" />
- </fileset>
- </copy>
- </postProcess>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <version>4.4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- <activation>
- <property>
- <name>builddocs</name>
- <value>true</value>
- </property>
- </activation>
- <pluginRepositories>
- <pluginRepository>
- <id>agilejava</id>
- <name>Agilejava repository (Docbook plugin)</name>
- <url>http://agilejava.com/maven</url>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-
- <!-- need to explicitly list dependencies for assembly to work -->
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- included so we can include it in the distribution -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+ Please keep the project tag on one line to avoid confusing
+ the release plugin.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ 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>apache-openjpa</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenJPA Distribution</name>
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <openjpa.release.keyAlias>
+ ${user.name}@apache.org
+ </openjpa.release.keyAlias>
+
+ <openjpa.assembly.finalName>
+ ${artifactId}-${version}</openjpa.assembly.finalName>
+ <openjpa.assembly.outputDirectory>
+ ${project.basedir}/../target/site/downloads
+ </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>
+
+ <parent.site.docs>
+ ${project.basedir}/../target/site/docs
+ </parent.site.docs>
+
+ <docbook.source>${project.basedir}/src/doc/manual</docbook.source>
+ <docbook.target>${project.basedir}/target/manual</docbook.target>
+ <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>
+ <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>
+ <outputDirectory>${openjpa.assembly.outputDirectory}</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:
+ MAVEN_OPTS=-Xmx512m
+ mvn -f openjpa-project/pom.xml process-resources -Pdocbook-profile
+ -->
+ <profile>
+ <id>docbook-profile</id>
+ <build>
+ <plugins>
+ <!-- build the docs when processing resources -->
+ <plugin>
+ <groupId>com.agilejava.docbkx</groupId>
+ <artifactId>docbkx-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-pdf-doc</id>
+ <phase>process-resources</phase>
+ <goals><goal>generate-pdf</goal></goals>
+ <configuration>
+ <sourceDirectory>
+ ${docbook.source}
+ </sourceDirectory>
+ <targetDirectory>
+ ${docbook.target}
+ </targetDirectory>
+ <includes>manual.xml</includes>
+ <foCustomization>
+ ${docbook.source}/manual-pdf.xsl
+ </foCustomization>
+ <imgSrcPath>
+ ${docbook.source}/
+ </imgSrcPath>
+ <postProcess>
+ <!-- copy to parent module for
+ expanded access in upload -->
+ <mkdir dir="${parent.site.docs}" />
+ <delete file="${docbook.target}/manual.fo" />
+ <copy todir="${parent.site.docs}">
+ <fileset dir="${docbook.target}">
+ <include name="manual.pdf" />
+ </fileset>
+ </copy>
+ </postProcess>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-chunked-doc</id>
+ <phase>process-resources</phase>
+ <goals><goal>generate-html</goal></goals>
+ <configuration>
+ <sourceDirectory>
+ ${docbook.source}
+ </sourceDirectory>
+ <targetDirectory>
+ ${docbook.target}
+ </targetDirectory>
+ <includes>manual.xml</includes>
+ <chunkedOutput>true</chunkedOutput>
+ <chunkQuietly>false</chunkQuietly>
+ <htmlCustomization>
+ ${docbook.source}/manual-xhtml-chunk.xsl
+ </htmlCustomization>
+ <postProcess>
+ <!-- rename manual to index -->
+ <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html" />
+
+ <!-- copy over images and styles -->
+ <mkdir dir="${docbook.target}/img" />
+ <copy todir="${docbook.target}/img">
+ <fileset dir="${docbook.source}/img">
+ <include name="*.*" />
+ </fileset>
+ </copy>
+
+ <mkdir dir="${docbook.target}/css" />
+ <copy todir="${docbook.target}/css">
+ <fileset dir="${docbook.source}/css">
+ <include name="*.*" />
+ </fileset>
+ </copy>
+
+ <!-- copy to parent module for
+ expanded access in upload -->
+ <mkdir dir="${parent.site.docs}" />
+ <copy todir="${parent.site.docs}">
+ <fileset dir="${docbook.target}">
+ <include name="*.*" />
+ </fileset>
+ </copy>
+ </postProcess>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-single-doc</id>
+ <phase>process-resources</phase>
+ <goals><goal>generate-html</goal></goals>
+ <configuration>
+ <sourceDirectory>
+ ${docbook.source}
+ </sourceDirectory>
+ <targetDirectory>
+ ${docbook.target}
+ </targetDirectory>
+ <includes>manual.xml</includes>
+ <chunkedOutput>false</chunkedOutput>
+ <htmlCustomization>
+ ${docbook.source}/manual-xhtml.xsl
+ </htmlCustomization>
+ <postProcess>
+ <!-- copy to parent module for
+ expanded access in upload -->
+ <mkdir dir="${parent.site.docs}" />
+ <copy todir="${parent.site.docs}">
+ <fileset dir="${docbook.target}">
+ <include name="manual.html" />
+ </fileset>
+ </copy>
+ </postProcess>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.docbook</groupId>
+ <artifactId>docbook-xml</artifactId>
+ <version>4.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ <activation>
+ <property>
+ <name>builddocs</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>agilejava</id>
+ <name>Agilejava repository (Docbook plugin)</name>
+ <url>http://agilejava.com/maven</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+
+ <!-- need to explicitly list dependencies for assembly to work -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <!-- included so we can include it in the distribution -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: openjpa/trunk/openjpa-project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/trunk/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=677472&r1=677471&r2=677472&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Wed Jul 16 17:09:55 2008
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!--
Maven release plugin requires the project tag to be on a single line.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-slice</artifactId>
- <packaging>jar</packaging>
- <name>OpenJPA Slice</name>
- <description>OpenJPA Slice</description>
- <url>http://openjpa.apache.org</url>
- <parent>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
- <properties>
- <openjpa.loglevel>INFO</openjpa.loglevel>
- <!-- to set debug arguments, you might set the following at the command line:
- -Dsurefire.jvm.args="-Xmx500m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000"
- -->
- <surefire.jvm.args>-Xmx500m</surefire.jvm.args>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-kernel</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-jdbc</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <profiles>
- <!-- Profile for testing with Apache Derby -->
- <profile>
- <id>test-derby</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>test-derby</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <connection.driver.name>
- org.apache.derby.jdbc.EmbeddedDriver
- </connection.driver.name>
- <connection.url>
- jdbc:derby:target/database/slice-derby-One;create=true
- </connection.url>
- <connection.username />
- <connection.password />
- </properties>
- </profile>
- <profile>
- <id>test-mysql</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>test-mysql</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.5</version>
- </dependency>
- </dependencies>
- <properties>
- <connection.driver.name>
- com.mysql.jdbc.Driver
- </connection.driver.name>
- <connection.url>${openjpa.mysql.url}</connection.url>
- <connection.username>
- ${openjpa.mysql.username}
- </connection.username>
- <connection.password>
- ${openjpa.mysql.password}
- </connection.password>
- </properties>
- </profile>
-
- </profiles>
- <build>
- <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>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>test-compile</phase>
- <configuration>
- <tasks>
- <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
- <property name="maven.test.skip" value="${maven.test.skip}" />
- <property name="test" value="${test}" />
- <property name="outdir" value="${project.build.outputDirectory}" />
- <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
- <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
-
- </plugins>
- </build>
-</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>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-slice</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenJPA Slice</name>
+ <description>OpenJPA Slice</description>
+ <url>http://openjpa.apache.org</url>
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <openjpa.loglevel>INFO</openjpa.loglevel>
+ <!-- to set debug arguments, you might set the following at the command line:
+ -Dsurefire.jvm.args="-Xmx500m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000"
+ -->
+ <surefire.jvm.args>-Xmx500m</surefire.jvm.args>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-kernel</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <!-- Profile for testing with Apache Derby -->
+ <profile>
+ <id>test-derby</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>test-derby</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <connection.driver.name>
+ org.apache.derby.jdbc.EmbeddedDriver
+ </connection.driver.name>
+ <connection.url>
+ jdbc:derby:target/database/slice-derby-One;create=true
+ </connection.url>
+ <connection.username />
+ <connection.password />
+ </properties>
+ </profile>
+ <profile>
+ <id>test-mysql</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>test-mysql</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <connection.driver.name>
+ com.mysql.jdbc.Driver
+ </connection.driver.name>
+ <connection.url>${openjpa.mysql.url}</connection.url>
+ <connection.username>
+ ${openjpa.mysql.username}
+ </connection.username>
+ <connection.password>
+ ${openjpa.mysql.password}
+ </connection.password>
+ </properties>
+ </profile>
+
+ </profiles>
+ <build>
+ <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>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test-compile</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
+ <property name="maven.test.skip" value="${maven.test.skip}" />
+ <property name="test" value="${test}" />
+ <property name="outdir" value="${project.build.outputDirectory}" />
+ <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
+ <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Propchange: openjpa/trunk/openjpa-slice/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openjpa/trunk/openjpa-xmlstore/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openjpa/trunk/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native