Author: psteitz
Date: Wed Jun 5 13:52:12 2013
New Revision: 1489873
URL: http://svn.apache.org/r1489873
Log:
Updated to include generation of 1.5.x versions.
Modified:
commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/release-process.txt
Modified: commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/release-process.txt
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/release-process.txt?rev=1489873&r1=1489872&r2=1489873&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/release-process.txt
(original)
+++ commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/release-process.txt Wed Jun
5 13:52:12 2013
@@ -7,94 +7,106 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-This document describes the process used to produce DBCP 1.3.x/1.4.x release
-candidates from the common source code maintained in DBCP's svn trunk.
+This document describes the process used to produce DBCP 1.3.x/1.4.x/1.5.x
release
+candidates from the common source code maintained in DBCP's DBCP_1_5_x branch.
-0. Prepare and validate changes, testing with JDK 1.4 and 1.5 using Ant
- and the code in trunk.
+0. Prepare and validate changes, testing with JDK 1.4, 1.5, 1.6 and 1.7 using
Ant
+ and the code in DBCP_1_5_x. The ant build in DBCP_1_5_x/build.xml should
+ pickup the jdk version and filter sources accordingly.
1. Change the version numbers in pom.xml, build.xml,
- pom-1.3.xml and build-1.3.xml to the new .x version.
+ pom-1.3.xml, pom-1.4.xml, build-1.3.xml and build-1.4.xml to the
+ new .x version.
-3. Regenerate download_dbcp.xml using the commons-build plugin:
- mvn commons:download-page
+2. Modify the main DBCP web page to include links to the new versions and
+ also modify the download page to include the new versions.
-4. Regenerate RELEASE_NOTES.txt
+3. Regenerate RELEASE_NOTES.txt
mvn changes:announcement-generate
mv target/announcement/dbcp-release-notes.vm RELEASE-NOTES.txt
The formatting may need some tweaking. Check RELEASE-Notes.txt
in.
-5. Test artifact generation from trunk:
+4. Test artifact generation from trunk:
mvn -Prc install
- Inspect the 1.4.x tarballs in /target and the maven artifacts in
+ Inspect the 1.5.x tarballs in /target and the maven artifacts in
your local maven repo. Fix any problems.
-6. Check in all changes to trunk; re-run tests.
+5. Check in all changes to DBCP_1_5_x; re-run tests.
- Now we create a branch which will be used to set up the JDBC3
- version of the code. This can be done in two different ways:
-
-7a. Create the branch directly in SVN:
+6. Now we create branches which will be used to set up the 1.3.x and 1.4.x
+ versions of the code.
[If necessary, delete any existing such branch first]
- svn copy -m"Create 1.3.x compatibility release branch." \
- https://svn.apache.org/repos/asf/commons/proper/dbcp/trunk \
+ svn copy -m "Create 1.3.x compatibility release branch." \
+ https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_5_x \
https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_x_BRANCH
+
+ svn copy -m "Create 1.4.x compatibility release branch." \
+ https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_5_x \
+
https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH
-8a. Check out the branch into a local workspace:
+7. Check out the branches into a local workspace:
svn co
https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_x_BRANCH
+ svn co
https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH
- Alternatively:
-
-7b. Check out DBCP fully - i.e., trunk, branches, tags.
-
-8b. From the top level of the checkout, execute
- svn cp trunk branches/DBCP_1_3_x_BRANCH
- svn commit -m "Created 1.3.x compatibility release branch."
- (where x is the final digit of the new release number)
-
- Whichever method was chosen above, continue as follows:
-
-9. From the DBCP_1_3_x_BRANCH
+8. Modify build files in the branches:
+ From DBCP_1_3_x_BRANCH
svn rm pom.xml
svn rm build.xml
svn rm findbugs-exclude-filter.xml
svn mv build-1.3.xml build.xml
svn mv pom-1.3.xml pom.xml
+
+ From DBCP_1_4_x_BRANCH
+ svn rm pom.xml
+ svn rm build.xml
+ svn rm findbugs-exclude-filter.xml
+ svn mv build-1.4.xml build.xml
+ svn mv pom-1.4.xml pom.xml
-10. From the DBCP_1_3_x_BRANCH, using JDK 1.4 or 1.5
+9. Filter the sources in the compatibility branches
+ From DBCP_1_3_x_BRANCH, using JDK 1.4 or 1.5
cp build.properties.sample build.properties (make sure all referenced jars
exist)
ant filter-sources
ant clean test
mvn clean site
- svn commit -m "Filtered sources to remove JDBC 4 methods."
+ svn commit -m "Filtered sources to remove JDBC 4+ methods."
+
+ From DBCP_1_4_x_BRANCH, using JDK 1.6
+ cp build.properties.sample build.properties (make sure all referenced jars
exist)
+ ant filter-sources
+ ant clean test
+ mvn clean site
+ svn commit -m "Filtered sources to remove JDBC 4.1 methods."
-11a. Create release tags directly in SVN.
+10. Create release tags:
svn cp -m "Tagging 1.3.x RCy" \
https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_x_BRANCH
\
https://svn.apache.org/repos/asf/commons/proper/dbcp/tags/DBCP_1_3_x_RCy
(where x is dot level, y is RC number)
svn cp -m "Tagging 1.4.x RCy" \
- https://svn.apache.org/repos/asf/commons/proper/dbcp/trunk \
+
https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH
\
https://svn.apache.org/repos/asf/commons/proper/dbcp/tags/DBCP_1_4_x_RCy
+ svn cp -m "Tagging 1.5.x RCy" \
+
https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH
\
+
https://svn.apache.org/repos/asf/commons/proper/dbcp/tags/DBCP_1_5_x_RCy
-11b. Create release tags from workspace. From the top-level dbcp directory
- svn cp branches/DBCP_1_3_x_BRANCH tags/DBCP_1_3_x_RCy (where x is dot
level, y is RC number)
- svn cp trunk tags/DBCP_1_4_x_RCy
- svn commit -m "Tagging 1.3.x RCy" tags/DBCP_1_3_x_RCy
- svn commit -m "Tagging 1.4.x RCy" tags/DBCP_1_4_x_RCy
+11. Create RC artifacts:
-12. From a fresh checkout of the DBCP_1_4_x_RCy tag, using JDK 1.6 execute
+ From a fresh checkout of the DBCP_1_5_x_RCy tag, using JDK 1.7 execute
mvn -Prc install
-
-13. From a fresh checkout of the DBCP_1_3_x_RCy tag using JDK 1.5,
+
+ From a fresh checkout of the DBCP_1_4_x_RCy tag using JDK 1.6,
mvn -Prc install
+
+ From a fresh checkout of the DBCP_1_3_x_RCy tag using JDK 1.5,
+ mvn -Prc install
+
-14. Collect the maven released artifacts from the 1.3.x/1.4.x dbcp directories
- in your local repo and the tarballs/zips from the /target directories
- in trunk and the 1.3 branch.
+12. Collect the maven released artifacts from the 1.3.x/1.4.x/1.5.x dbcp
directories
+ in your local repo and the tarballs/zips from the /target directories in
the branches.
