You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2012/06/01 18:06:47 UTC
svn commit: r1345264 - in /db/derby/code/branches/10.8: ./ build.xml
java/client/org/apache/derby/client/net/NetCursor.java
Author: rhillegas
Date: Fri Jun 1 16:06:46 2012
New Revision: 1345264
URL: http://svn.apache.org/viewvc?rev=1345264&view=rev
Log:
DERBY-5272: Port 1345254 from trunk to 10.8 branch.
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/build.xml
db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java (props changed)
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1345254
Modified: db/derby/code/branches/10.8/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/build.xml?rev=1345264&r1=1345263&r2=1345264&view=diff
==============================================================================
--- db/derby/code/branches/10.8/build.xml (original)
+++ db/derby/code/branches/10.8/build.xml Fri Jun 1 16:06:46 2012
@@ -2130,7 +2130,6 @@
<antcall target="insane"/>
<antcall target="all"/>
<antcall target="buildjars"/>
- <antcall target="plugin"/>
<antcall target="publishedapi"/>
<java classname="org.apache.derbyBuild.maintversion2props">
@@ -2160,8 +2159,6 @@
<tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,README,javadoc/publishedapi/**" excludes="bin/templates/**"/>
</tar>
- <copy file="${jarsdist.dir}/insane/derby_core_plugin_${major}.${minor}.${interim}.zip"
- tofile="${snapshot.dir}/derby_core_plugin_${major}.${minor}.${interim}.${changenumber}.zip"/>
</target>
<target name="snapshotError" if="is.sane">
@@ -2643,15 +2640,8 @@ you should not have to do this.
>
<ant antfile="${basedir}/tools/release/build.xml" target="release"/>
- <!-- copy the eclipse plugins into the distribution directory -->
- <property file="${release.base}/plugintmp.properties"/>
- <property name="eclipse.plugin" value="${plugin.derby.core.zipfile}_${plugin.derby.version}.zip"/>
- <copy file="${jarsdist.dir}/insane/${eclipse.plugin}" todir="${release.dir}"/>
- <copy file="${eclipse.ui.doc.plugin}" tofile="${release.dir}/${eclipse.ui.doc.plugin.name}"/>
-
<!-- sign all of the artifacts -->
<ant antfile="${basedir}/tools/release/build.xml" target="sign"/>
- <ant antfile="${basedir}/tools/release/build.xml" target="sign.eclipse.plugin"/>
<!-- remove cruft -->
<delete dir="${crlf.dir}"/>
@@ -2723,7 +2713,7 @@ you should not have to do this.
Sneaky, very, very sneaky.
-->
- <target name="promptforreleaseproperties" depends="promptforsvncredentials,promptforpgpcredentials,promptforreleaseid,promptforeclipseplugin"/>
+ <target name="promptforreleaseproperties" depends="promptforsvncredentials,promptforpgpcredentials,promptforreleaseid"/>
<!-- Define the task which prompts for missing properties -->
<target name="defineprompt" depends="prebuild">
@@ -2781,16 +2771,6 @@ you should not have to do this.
</target>
- <!-- Prompt for location of eclipse ui/doc plugin. This artifact does not generally change from one release to another -->
- <target name="promptforeclipseplugin" depends="defineprompt">
-
- <promptForProperty
- propertyName="eclipse.ui.doc.plugin"
- prompt="Enter the location of the eclipse ui/doc plugin (e.g., /Users/me/derby/derby_ui_doc_plugin_1.1.2.zip) > "
- />
-
- </target>
-
<!--
Prompt for whether we should continue. The user is offered a Y/N choice.
Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
Merged /db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:r1345254