Author: dwoods
Date: Mon Sep 20 12:16:43 2010
New Revision: 998904
URL: http://svn.apache.org/viewvc?rev=998904&view=rev
Log:
OPENJPA-1712 Merge in build updates from 2.0.1
Added:
openjpa/branches/1.3.x/openjpa-project/upload.xml (with props)
Modified:
openjpa/branches/1.3.x/CHANGES.txt
openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
Modified: openjpa/branches/1.3.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/CHANGES.txt?rev=998904&r1=998903&r2=998904&view=diff
==============================================================================
--- openjpa/branches/1.3.x/CHANGES.txt (original)
+++ openjpa/branches/1.3.x/CHANGES.txt Mon Sep 20 12:16:43 2010
@@ -90,7 +90,7 @@ Getting Involved
How do I Contribute?
* To discuss Apache OpenJPA topics check out the mailing lists.
* Informal discussion also occurs on the #openjpa IRC channel on
- freenode.net.
+ freenode.net.
* Bugs and other issues can be posted on the project JIRA.
Modified: openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml?rev=998904&r1=998903&r2=998904&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml Mon Sep 20 12:16:43
2010
@@ -308,18 +308,15 @@ databaseName=${db.name}
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_1.0_spec</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml?rev=998904&r1=998903&r2=998904&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml Mon Sep 20 12:16:43
2010
@@ -143,7 +143,7 @@
</dependency>
</dependencies>
<properties>
-
<openjpa.derbynet.url>jdbc:derby://localhost:1527/openjpa20;create=true;traceDirectory=target;traceFile=derby.log</openjpa.derbynet.url>
+
<openjpa.derbynet.url>jdbc:derby://localhost:1527/openjpa13;create=true;traceDirectory=target;traceFile=derby.log</openjpa.derbynet.url>
<openjpa.derbynet.driver>org.apache.derby.jdbc.ClientDriver</openjpa.derbynet.driver>
<!-- Note: commons-dbcp requires dummy values for uid/pwd -->
<openjpa.derbynet.username>uid</openjpa.derbynet.username>
@@ -262,8 +262,6 @@
by also supplying the following properties:
-Dmssql.groupid=com.microsoft.sqlserver
-Dmssql.version=2.0
- If you are using Java SE 6 or later, you will need to use:
- -Dmssql.artifactid=sqljdbc4
-->
<id>test-mssql</id>
<activation>
@@ -993,7 +991,7 @@
<property>
<name>openjpa.Log</name>
<value>${openjpa.Log}</value>
- </property>>
+ </property>
<property>
<name>openjpa.ConnectionDriverName</name>
<value>org.apache.commons.dbcp.BasicDataSource</value>
Added: openjpa/branches/1.3.x/openjpa-project/upload.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/upload.xml?rev=998904&view=auto
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/upload.xml (added)
+++ openjpa/branches/1.3.x/openjpa-project/upload.xml Mon Sep 20 12:16:43 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.3.x/openjpa-project/upload.xml
------------------------------------------------------------------------------
svn:eol-style = native
