Modified: openjpa/branches/1.2.x/openjpa-project/pom.xml URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/pom.xml?rev=998283&r1=998282&r2=998283&view=diff ============================================================================== --- openjpa/branches/1.2.x/openjpa-project/pom.xml (original) +++ openjpa/branches/1.2.x/openjpa-project/pom.xml Fri Sep 17 19:41:45 2010 @@ -7,9 +7,9 @@ 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 @@ -18,32 +18,36 @@ under the License. --> <!-- - Please keep the project tag on one line to avoid confusing - the release plugin. + 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";> <!-- To build the distribution files from project root: - mvn clean compile package -Dtest=false + mvn clean compile package -Dtest=false -DfailIfNoTests=false - To build and deploy a full digned release with docs, run: + To build and deploy a fully signed release with docs, run: - mvn clean deploy -Pjavadoc-profile,docbook-profile,sign-release + mvn clean deploy -Papache-release,docbook-profile 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.3-SNAPSHOT</version> </parent> + <groupId>org.apache.openjpa</groupId> + <artifactId>apache-openjpa</artifactId> + <packaging>pom</packaging> + <name>OpenJPA Project Docs and Assemblies</name> + <description>OpenJPA Project Docs and Assemblies</description> + <properties> <openjpa.release.keyAlias> ${[email protected] @@ -79,7 +83,7 @@ <docbook.target>${project.basedir}/target/manual</docbook.target> <docbook.version>1.67.2</docbook.version> <local.repository>${settings.localRepository}</local.repository> - + <!-- Java imaging apis are needed to include images in a PDF. JIMI or JAI may be used. Neither is available in a maven @@ -100,21 +104,22 @@ <jai.groupId>com.sun</jai.groupId> <jai.version>1.1.3</jai.version> + <nightly.version>${project.version}</nightly.version> <!-- authentication for nightly uploads --> <nightly.user.name>${user.name}</nightly.user.name> <nightly.password>passw0rd</nightly.password> - </properties> + </properties> - <build> + <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> + <resource> + <directory>${project.basedir}/src/site</directory> + <!-- targetPath is relative to target/classes/ --> + <targetPath>../filtered-site</targetPath> <filtering>false</filtering> </resource> </resources> @@ -131,7 +136,9 @@ <goal>attached</goal> </goals> <configuration> - <descriptor>assembly.xml</descriptor> + <descriptors> + <descriptor>assembly.xml</descriptor> + </descriptors> <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory> <workDirectory>target/work</workDirectory> </configuration> @@ -364,7 +371,7 @@ </repositories> </profile> <!-- - Upload distribution files, javadoc and manual to openjpa.apache.org/builds/latest. + Upload distribution files, javadoc and manual to openjpa.apache.org/builds/${nightly.version}. This profile is designed to be run nightly by a continuous build server, but can also be run manually. @@ -386,34 +393,12 @@ <phase>package</phase> <configuration> <tasks> - <mkdir dir="target/site/tempDocs" /> - <unzip dest="target/site/tempDocs"> - <fileset dir="target/site/downloads"> - <include name="*binary*.zip" /> - </fileset> - <patternset> - <include name="**/javadoc/**" /> - <include name="**/manual/**" /> - </patternset> - </unzip> - <move todir="target/site/tempDocs/docs"> - <fileset dir="target/site/tempDocs/apache-openjpa-${pom.version}/docs" /> - </move> - <checksum> - <fileset dir="target/site/downloads/"> - <include name="*.zip" /> - </fileset> - </checksum> - <scp todir="${nightly.user.name}:${[email protected]:/www/openjpa.apache.org/builds/latest-1.2.x/downloads" trust="true"> - <fileset dir="target/site/downloads" /> - </scp> - <scp todir="${nightly.user.name}:${[email protected]:/www/openjpa.apache.org/builds/latest-1.2.x/docs" trust="true"> - <fileset dir="target/site/tempDocs/docs" /> - </scp> - <sshexec host="people.apache.org" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w /www/openjpa.apache.org/builds/latest-1.2.x" trust="true" /> - <delete> - <fileset dir="target/site/tempDocs" /> - </delete> + <ant antfile="upload.xml" target="upload" inheritRefs="true"> + <property name="nightly.user.name" value="${nightly.user.name}" /> + <property name="nightly.password" value="${nightly.password}" /> + <property name="nightly.version" value="${nightly.version}" /> + <property name="project.version" value="${project.version}" /> + </ant> </tasks> </configuration> <goals> @@ -432,7 +417,7 @@ <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <!-- included so we can include it in the distribution --> @@ -440,5 +425,9 @@ <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> </dependencies> </project>
Modified: openjpa/branches/1.2.x/openjpa-project/source-assembly.xml URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/source-assembly.xml?rev=998283&r1=998282&r2=998283&view=diff ============================================================================== --- openjpa/branches/1.2.x/openjpa-project/source-assembly.xml (original) +++ openjpa/branches/1.2.x/openjpa-project/source-assembly.xml Fri Sep 17 19:41:45 2010 @@ -35,6 +35,9 @@ <outputDirectory>${artifactId}-${version}-source</outputDirectory> <excludes> <exclude>**/target/**</exclude> + <exclude>**/*.log</exclude> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> </excludes> </fileSet> Added: openjpa/branches/1.2.x/openjpa-project/upload.xml URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/upload.xml?rev=998283&view=auto ============================================================================== --- openjpa/branches/1.2.x/openjpa-project/upload.xml (added) +++ openjpa/branches/1.2.x/openjpa-project/upload.xml Fri Sep 17 19:41:45 2010 @@ -0,0 +1,75 @@ +<?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. +--> +<project name="upload" default="upload" basedir="."> + <description> + Ant build file used to upload binaries to openjpa.apache.org/builds/latest. + </description> + <target name="upload"> + + <property name="build.dir" value="/www/openjpa.apache.org/builds"/> + <property name="host" value="people.apache.org"/> + + <mkdir dir="target/site/tempDocs" /> + <unzip dest="target/site/tempDocs"> + <fileset dir="target/site/downloads"> + <include name="*binary*.zip" /> + </fileset> + <patternset> + <include name="**/javadoc/**" /> + <include name="**/manual/**" /> + </patternset> + </unzip> + <zip destfile="target/site/tempDocs/docs.zip"> + <fileset dir="target/site/tempDocs"> + <include name="**/javadoc/**"/> + <include name="**/manual/**"/> + <exclude name="docs/**"/> + </fileset> + </zip> + <checksum> + <fileset dir="target/site/downloads/"> + <include name="*.zip" /> + </fileset> + </checksum> + + <scp todir="${nightly.user.name}:${nightly.passwo...@${host}:${build.dir}" trust="true"> + <fileset dir="target/site/tempDocs"> + <include name="docs.zip"/> + </fileset> + </scp> + <!-- remove directories, hopefully this fails silently. mkdir does not and stops the process these exist.--> + <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/docs" trust="true" /> + <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/downloads" trust="true" /> + <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="unzip -qq -d ${build.dir}/ ${build.dir}/docs.zip" trust="true" /> + <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm ${build.dir}/docs.zip" trust="true" /> + <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="mkdir ${build.dir}/apache-openjpa-${project.version}/downloads " trust="true" /> + + <scp todir="${nightly.user.name}:${nightly.passwo...@${host}:${build.dir}/apache-openjpa-${project.version}/downloads" trust="true"> + <fileset dir="target/site/downloads" /> + </scp> + + <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w ${build.dir}/apache-openjpa-${project.version}" trust="true" /> + + <delete> + <fileset dir="target/site/tempDocs" /> + </delete> + </target> +</project> + Propchange: openjpa/branches/1.2.x/openjpa-project/upload.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: openjpa/branches/1.2.x/openjpa-slice/pom.xml URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-slice/pom.xml?rev=998283&r1=998282&r2=998283&view=diff ============================================================================== --- openjpa/branches/1.2.x/openjpa-slice/pom.xml (original) +++ openjpa/branches/1.2.x/openjpa-slice/pom.xml Fri Sep 17 19:41:45 2010 @@ -7,9 +7,9 @@ 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 @@ -21,139 +21,149 @@ 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.3-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_1.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-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> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-parent</artifactId> + <version>1.2.3-SNAPSHOT</version> + </parent> + + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-slice</artifactId> + <packaging>jar</packaging> + <name>OpenJPA Slice</name> + <description>OpenJPA Slice</description> + + <dependencies> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-kernel</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-jdbc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_1.0_spec</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-persistence</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-persistence-jdbc</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <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> + + <!-- Sample profile for testing with MySQL DB --> + <profile> + <!-- different id, so this doesn't run during automated testing --> + <id>test-mysql-slice</id> + <activation> + <activeByDefault>false</activeByDefault> + <property> + <name>test-mysql-slice</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>${mysql.version}</version> + <scope>test</scope> + </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> + <!-- DBCP overrides for MySQL testing --> + <dbcp.maxIdle>0</dbcp.maxIdle> + <dbcp.minIdle>0</dbcp.minIdle> + </properties> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <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.Log" value="${openjpa.Log}" /> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${test.jvm.arguments}</argLine> + <systemProperties> + <property> + <name>openjpa.Log</name> + <value>${openjpa.Log}</value> + </property> + <property> + <name>derby.stream.error.file</name> + <value>target/derby.log</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: openjpa/branches/1.2.x/openjpa-xmlstore/pom.xml URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-xmlstore/pom.xml?rev=998283&r1=998282&r2=998283&view=diff ============================================================================== --- openjpa/branches/1.2.x/openjpa-xmlstore/pom.xml (original) +++ openjpa/branches/1.2.x/openjpa-xmlstore/pom.xml Fri Sep 17 19:41:45 2010 @@ -21,35 +21,41 @@ Maven release plugin requires the project tag to be on a single line. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-xmlstore</artifactId> - <packaging>jar</packaging> - <name>OpenJPA XML Store</name> - <description>OpenJPA XML Store</description> - <url>http://openjpa.apache.org</url> + <parent> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-parent</artifactId> <version>1.2.3-SNAPSHOT</version> </parent> + + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-xmlstore</artifactId> + <packaging>jar</packaging> + <name>OpenJPA XML Store</name> + <description>OpenJPA XML Store</description> + <dependencies> <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-kernel</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-persistence-jdbc</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-persistence-jdbc</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> + </project> + Modified: openjpa/branches/1.2.x/pom.xml URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/pom.xml?rev=998283&r1=998282&r2=998283&view=diff ============================================================================== --- openjpa/branches/1.2.x/pom.xml (original) +++ openjpa/branches/1.2.x/pom.xml Fri Sep 17 19:41:45 2010 @@ -387,6 +387,11 @@ <version>2.0</version> </dependency> <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.0.5</version> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${hsqldb.version}</version>
