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 2022/05/17 18:08:06 UTC
svn commit: r1901006 - in /db/derby/code/branches/10.16: ./ build.xml
Author: rhillegas
Date: Tue May 17 18:08:06 2022
New Revision: 1901006
URL: http://svn.apache.org/viewvc?rev=1901006&view=rev
Log:
DERBY-7138: Merge 1901005 from trunk to 10.16 branch.
Modified:
db/derby/code/branches/10.16/ (props changed)
db/derby/code/branches/10.16/build.xml
Propchange: db/derby/code/branches/10.16/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1901005
Modified: db/derby/code/branches/10.16/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/build.xml?rev=1901006&r1=1901005&r2=1901006&view=diff
==============================================================================
--- db/derby/code/branches/10.16/build.xml (original)
+++ db/derby/code/branches/10.16/build.xml Tue May 17 18:08:06 2022
@@ -2650,39 +2650,6 @@
</target>
- <!-- Checkin the generated security policy documentation to the docs client -->
- <target name="copy-security-policy-docs">
-
- <property name="sec.dir" value="${docs.root}/src/security"/>
- <property name="gen.dita.dir" value="${generated.src.engine.dir}/${derby.dir}/security"/>
-
- <copy todir="${sec.dir}">
- <fileset dir="${gen.dita.dir}" includes="*.dita"/>
- </copy>
-
- <antcall target="checkinfile">
- <param name="checkinComment" value="Check in rsecbasicclient.dita as part of building a release."/>
- <param name="fileName" value="${sec.dir}/rsecbasicclient.dita"/>
- </antcall>
- <antcall target="checkinfile">
- <param name="checkinComment" value="Check in rsecbasicengine.dita as part of building a release."/>
- <param name="fileName" value="${sec.dir}/rsecbasicengine.dita"/>
- </antcall>
- <antcall target="checkinfile">
- <param name="checkinComment" value="Check in rsecbasicserver.dita as part of building a release."/>
- <param name="fileName" value="${sec.dir}/rsecbasicserver.dita"/>
- </antcall>
- <antcall target="checkinfile">
- <param name="checkinComment" value="Check in rsecbasictools.dita as part of building a release."/>
- <param name="fileName" value="${sec.dir}/rsecbasictools.dita"/>
- </antcall>
- <antcall target="checkinfile">
- <param name="checkinComment" value="Check in rsecpolicysample.dita as part of building a release."/>
- <param name="fileName" value="${sec.dir}/rsecpolicysample.dita"/>
- </antcall>
-
- </target>
-
<!-- Build the NOTICE file and check it in -->
<target name="buildnotice">
@@ -3771,9 +3738,6 @@ you should not have to do this.
<!-- copy the generated sqlstate tables to the docs client and check it in -->
<antcall target="copyerrordocs"/>
- <!-- copy the generated policy file documentation to the docs client and check it in -->
- <antcall target="copy-security-policy-docs"/>
-
<!-- sync the clients to guarantee that we are up-to-date -->
<antcall target="updatesvnclients"/>