You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2013/11/02 22:19:26 UTC
svn commit: r1538284 - in /db/jdo: ./ site/
site/src/site/resources/releases/ site/src/site/xdoc/
site/src/site/xdoc/releases/
Author: mcaisse
Date: Sat Nov 2 21:19:25 2013
New Revision: 1538284
URL: http://svn.apache.org/r1538284
Log:
Updates to site and process documents for 3.1-rc1 release.
Added:
db/jdo/site/src/site/resources/releases/release-3.1-rc1.cgi
db/jdo/site/src/site/xdoc/releases/release-3.1-rc1.xml
Modified:
db/jdo/HowToReleaseJDO.html
db/jdo/site/HOWTO
db/jdo/site/src/site/xdoc/downloads.xml
db/jdo/site/src/site/xdoc/index.xml
db/jdo/site/src/site/xdoc/specifications.xml
db/jdo/site/src/site/xdoc/tck.xml
Modified: db/jdo/HowToReleaseJDO.html
URL: http://svn.apache.org/viewvc/db/jdo/HowToReleaseJDO.html?rev=1538284&r1=1538283&r2=1538284&view=diff
==============================================================================
--- db/jdo/HowToReleaseJDO.html (original)
+++ db/jdo/HowToReleaseJDO.html Sat Nov 2 21:19:25 2013
@@ -140,7 +140,7 @@ https://svn.apache.org/repos/asf/db/jdo/
Check the artifacts at <a href="https://repository.apache.org/content/repositories/snapshots/">the Maven release repository</a>
</li>
<li>
- Prepare and release the artifacts.
+ Prepare and release the artifacts. There are interoperability issues with the maven release plugin and cygwin, so if on Windows, use a Windows command window for this step and the following one.
<pre>
mvn release:clean -Papache-release
mvn release:prepare -Papache-release
@@ -152,6 +152,11 @@ mvn release:prepare -Papache-release
mvn release:perform -Papache-release
</pre>
</li>
+ <li>Close the Staged Repository
+ See <a href="https://docs.sonatype.org/display/Repository/Closing+a+Staging+Repository"
+ >Closing a Staging Repository</a> for details on connecting to the Nexus UI.
+ The Nexus repository URL is https://repository.apache.org/index.html.
+ </li>
<li>Send an announcement to test the release to the
jdo-dev@db.apache.org alias. If problems are found, fix and
repeat.</li>
@@ -165,11 +170,7 @@ mvn release:perform -Papache-release
follow the instructions at <a href="
https://docs.sonatype.org/display/Repository/Releasing+a+Staging+Repository">
Releasing a Staging Repository</a> to release the artifacts.
- See <a href="https://docs.sonatype.org/display/Repository/Closing+a+Staging+Repository"
- >Closing a Staging Repository</a> for details on connecting to the Nexus UI.
</li>
- <li>To get the Maven2 repo populated with Maven1 jars ask
- repository@apache.org to push the release</li>
<li>If the release is a bug fix release to a maintenance release,
update README.txt in the parent branch, adding the following
line: "This release has been deprecated. Please use version
@@ -187,22 +188,22 @@ mvn release:perform -Papache-release
<li>Update the Apache JDO web site to point the downloads page to
the release.
<ol>
- <li>In site/xdocs/releases create release-2.n.xml. Edit the
+ <li>In site/src/site/xdoc/releases create release-<i>N.n</i>.xml. Edit the
release numbers and the link to the release notes. You will
need to change the '&'s in the URL to "&amp;"</li>
- <li>In site/xdocs/releases create release-2.n.cgi. The .cgi
+ <li>In site/src/site/resources/releases create release-<i>N.n</i>.cgi. The .cgi
file contents are identical to the other .cgi files in the
release directory; only the file name differs.</li>
- <li>Edit site/xdocs/downloads.xml to link to the new release
+ <li>Edit site/src/site/xdoc/downloads.xml to link to the new release
page .cgi document.</li>
<li>Build and test as described in the site/HOWTO document.
Note that the cgi page will not be active until it is on the
server, so can't really be tested.</li>
<li>Add the new files to the subversion repository.
- <pre>svn add xdocs/releases/release-2.n.html
-svn add docs/releases/release-2.n.html
-svn add xocs/releases/release-2.n.cgi
-svn add docs/releases/release-2.n.cgi
+ <pre>svn add site/src/site/xdoc/releases/release-<i>N.n</i>.html
+svn add site/docs/releases/release-<i>N.n</i>.html
+svn add site/src/site/resources/releases/release-<i>N.n</i>.cgi
+svn add site/docs/releases/release-<i>N.n</i>.cgi
</pre>
</li>
<li>Set the svn properties svn:eol-style to native and
@@ -214,13 +215,13 @@ svn add docs/releases/release-2.n.cgi
to the RunRules.html file of the latest release.</li>
<li>Update the news list on the site home page to announce the new
release.</li>
+ <li>Update the specification page to link to the new specification pdf document.
<li>Add the javadoc for the release to the site.
<ol>
<li>Make a new directory under site/docs for the release, e.g.
api2.1. We'll call it <i>docsdir</i>.</li>
- <li>Copy the apidocs directory from the release branch
- target/docs directory to <i>docsdir</i>.</li>
- <li>Make a zip file of the apidocs tree and put it in <i>docsdir</i>.</li>
+ <li>Download the javadoc artifact from the repository and copy it to <i>docsdir</i>.</li>
+ <li>Unzip it in <i>docsdir</i>.</li>
<li>Do svn add on <i>docsdir</i>.</li>
<li>Edit xdocs/javadoc.xml and add links to the new javadoc.</li>
</ol>
Modified: db/jdo/site/HOWTO
URL: http://svn.apache.org/viewvc/db/jdo/site/HOWTO?rev=1538284&r1=1538283&r2=1538284&view=diff
==============================================================================
--- db/jdo/site/HOWTO (original)
+++ db/jdo/site/HOWTO Sat Nov 2 21:19:25 2013
@@ -18,20 +18,22 @@ https://svn.apache.org/repos/infra/websi
How to change the site content and generate ?
---------------------------------------------
-1) Make your modifications to the source xml file in src/site/xdocs/
+1) Make your modifications to the source xml files in src/site/xdoc/
2) Run Maven "site"
$ mvn -o clean site
3) If errors, fix and repeat step 2
-4) Check the generated site in "target/docs" using
- your browser.
+4) Check the generated site in "target/site" using
+ your browser. Open index.html to view the site from the top level page.
5) If all ok, copy the generated site into the SVN locations by
$ cp -R target/site/* docs/
-6) Commit all changes to SVN (all changes under "src" as well as all generated "docs"). You may have to do a separate commit for docs because it refers to a separate repository.
+6) Do an svn add on all new files in both site/docs and site/src/xdocs.
+
+7) Commit all changes to SVN (all changes under "src" as well as all generated "docs"). You may have to do a separate commit for docs because it refers to a separate repository.
How to update the javadoc
Added: db/jdo/site/src/site/resources/releases/release-3.1-rc1.cgi
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/resources/releases/release-3.1-rc1.cgi?rev=1538284&view=auto
==============================================================================
--- db/jdo/site/src/site/resources/releases/release-3.1-rc1.cgi (added)
+++ db/jdo/site/src/site/resources/releases/release-3.1-rc1.cgi Sat Nov 2 21:19:25 2013
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Copyright 2002-2004 The Apache Software Foundation or its licensors,
+# as applicable.
+#
+# Licensed 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.
+
+# Wrapper script around mirrors.cgi script
+# (we must change to that directory in order for python to pick up the
+# python includes correctly)
+# Copied from Stefan's http://www.apache.org/~bodewig/mirror.html
+cd /www/www.apache.org/dyn/mirrors
+/www/www.apache.org/dyn/mirrors/mirrors.cgi $*
Modified: db/jdo/site/src/site/xdoc/downloads.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/downloads.xml?rev=1538284&r1=1538283&r2=1538284&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/downloads.xml (original)
+++ db/jdo/site/src/site/xdoc/downloads.xml Sat Nov 2 21:19:25 2013
@@ -27,14 +27,19 @@ limitations under the License.
<body>
<section name="Latest Official Release">
<p>
- <a href="releases/release-3.0.1.cgi">JDO 3.0.1</a>
+ <a href="releases/release-3.1-rc1.cgi">JDO 3.1-rc1</a>
<img vspace="0" hspace="8" src="images/dot_clear.gif" alt=""/>
- November 13, 2011
+ September 22, 2013
</p>
</section>
<section name="Previous Official Releases">
<p>
+ <a href="releases/release-3.0.1.cgi">JDO 3.0.1</a>
+ <img vspace="0" hspace="8" src="images/dot_clear.gif" alt=""/>
+ November 13, 2011
+ </p>
+ <p>
<a href="releases/release-3.0.cgi">JDO 3.0</a>
<img vspace="0" hspace="8" src="images/dot_clear.gif" alt=""/>
July 23, 2010
Modified: db/jdo/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/index.xml?rev=1538284&r1=1538283&r2=1538284&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/index.xml (original)
+++ db/jdo/site/src/site/xdoc/index.xml Sat Nov 2 21:19:25 2013
@@ -56,6 +56,14 @@ thriving community of users and develope
<section name="JDO News">
+ <strong>JDO 3.1-rc1 is released</strong><br/>
+ <blockquote>
+ JDO 3.1-rc1 has been released. This release contains minor bug fixes. For a complete list of changes (features plus bug fixes) see
+ <a href="https://issues.apache.org/jira/browse/JDO/fixforversion/12314921">JDO 3.1-rc1 changes</a>.
+ You can download the release from the
+ <a href="downloads.html">downloads page</a>. You can also use the new release in maven projects
+ simply by referencing the jdo-api artifact in your pom.xml.</blockquote>
+
<strong>JDO 3.0.1 is released</strong><br/>
<blockquote>
JDO 3.0.1 has been released. This release contains minor bug fixes. For a complete list of changes (features plus bug fixes) see
Added: db/jdo/site/src/site/xdoc/releases/release-3.1-rc1.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/releases/release-3.1-rc1.xml?rev=1538284&view=auto
==============================================================================
--- db/jdo/site/src/site/xdoc/releases/release-3.1-rc1.xml (added)
+++ db/jdo/site/src/site/xdoc/releases/release-3.1-rc1.xml Sat Nov 2 21:19:25 2013
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<document>
+ <properties>
+ <title>Apache JDO 3.1-rc1 Release</title>
+ <author email="jdo-dev@db.apache.org">JDO Documentation Team</author>
+ </properties>
+ <body>
+ <section name="JDO 3.1-rc1 Distributions">
+ <p>
+ Use the links below to download Apache JDO from one of our mirrors.
+ For more information about the projects see <a href="../downloads.html">Downloads</a>.
+ For information on running the TCK, see <a href="../tck.html">TCK</a>.
+ </p>
+ <p>
+ It is good practice to <a href="#Verifying">verify the integrity</a>
+ of the distribution files.
+ </p>
+ <p>
+ You are currently using <strong>[preferred]</strong>.
+ If you encounter a problem with this mirror, then please select another.
+ If all mirrors are failing, there are backup mirrors at the end of the list.
+ See <a href="http://www.apache.org/mirrors/">status</a> of mirrors.
+ </p>
+ <form action="[location]" method="get" id="SelectMirror">
+ Other mirrors: <select name="Preferred">
+ [if-any http]
+ [for http]<option value="[http]">[http]</option>[end]
+ [end]
+ [if-any ftp]
+ [for ftp]<option value="[ftp]">[ftp]</option>[end]
+ [end]
+ [if-any backup]
+ [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+ [end]
+ </select>
+ <input type="submit" value="Change" />
+ </form>
+ <br/>
+
+ <subsection name="Release Notes">
+ <p>
+ <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12314921&styleName=Html&projectId=10630">
+ View release notes for JDO 3.1-rc1</a>
+ </p>
+ </subsection>
+ <subsection name="API">
+ <p>
+ The api project contains source to build jdo-api.jar,
+ which defines the JDO API.
+ The jar file is the only artifact needed for users who wish to compile
+ their programs using the JDO API.
+ It can be downloaded automatically by maven and placed into the local
+ maven repository if you include the
+ proper dependency in your maven project definition.
+ Use groupId javax.jdo, artifactId jdo-api, version 3.1-rc1
+ and define your remote repository as
+ http://www.ibiblio.org/maven.
+ Alternatively, it can be downloaded manually and put into a location
+ of your choice.
+ </p>
+ <p>
+ <a href="[preferred]/javax/jdo/jdo-api/jdo-api-3.1-rc1.jar">jdo-api-3.1-rc1.jar</a>
+ [<a href="[preferred]/javax/jdo/jdo-api/jdo-api-3.1-rc1.jar.asc">PGP</a>]
+ </p>
+ <p>
+ <a href="[preferred]/javax/jdo/jdo-api/jdo-api-3.1-rc1.pom">jdo-api-3.1-rc1.pom</a>
+ [<a href="[preferred]/javax/jdo/jdo-api/jdo-api-3.1-rc1.pom.asc">PGP</a>]
+ </p>
+ <p>
+ <a href="[preferred]/javax/jdo/3.1-rc1/jdo-api-3.1-rc1-sources.jar">jdo-api-3.1-rc1-sources.jar</a>
+ [<a href="[preferred]/javax/jdo/3.1-rc1/jdo-api-3.1-rc1-sources.jar.asc">PGP</a>]
+ </p>
+ </subsection>
+
+ <subsection name="TCK">
+ <p>
+ This is a download for all implementors of JDO, and for those who want to check
+ how well an implementation is compliant with the JDO specification.
+ The tck2 project contains the JDO 2 Technology Compatibility Kit.
+ The source distribution is the only artifact needed to be downloaded
+ by the user. The dependencies are automatically downloaded by maven as needed to run the TCK.
+
+ </p>
+ <p>
+ <a href="[preferred]/org/apache/jdo/3.1-rc1/jdo-tck-3.1-rc1-src.zip">jdo-tck-3.1-rc1-src.zip</a>
+ [<a href="[preferred]/org/apache/jdo/3.1-rc1/jdo-tck-3.1-rc1-src.zip.asc">PGP</a>]
+ </p>
+ <p>
+ <a href="[preferred]/org/apache/jdo/3.1-rc1/jdo-tck-3.1-rc1-src.tar.gz">jdo-tck-3.1-rc1-src.tar.gz</a>
+ [<a href="[preferred]/org/apache/jdo/3.1-rc1/jdo-tck-3.1-rc1-src.tar.gz.asc">PGP</a>]
+ </p>
+ </subsection>
+
+ </section>
+
+<section name="Verifying Releases">
+<a name="Verifying"></a>
+<p>It is essential that you verify the integrity of the downloaded
+files using the PGP signature. </p>
+<p>The PGP signatures can be verified using PGP or GPG.
+First download the <a href="http://www.apache.org/dist/db/jdo/KEYS">KEYS</a>
+as well as the <code>asc</code> signature file for the particular
+distribution.
+Make sure you get these files from the
+<a href="http://www.apache.org/dist/db/jdo/">main distribution
+directory</a>, rather than from a mirror. Then verify the signatures using
+</p>
+<p><code>
+% pgpk -a KEYS<br />
+% pgpv <i>release_name</i>.tar.gz.asc<br />
+</code>
+<em>or</em><br />
+<code>
+% pgp -ka KEYS<br />
+% pgp <i>release_name</i>.tar.gz.asc<br />
+</code>
+<em>or</em><br />
+<code>
+% gpg --import KEYS<br/>
+% gpg --verify <i>release_name</i>.tar.gz.asc
+</code></p>
+ </section>
+ </body>
+</document>
Modified: db/jdo/site/src/site/xdoc/specifications.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/specifications.xml?rev=1538284&r1=1538283&r2=1538284&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/specifications.xml (original)
+++ db/jdo/site/src/site/xdoc/specifications.xml Sat Nov 2 21:19:25 2013
@@ -31,6 +31,7 @@ limitations under the License.
The following specifications for JDO are available
</p>
<ul>
+ <li>The <a href="http://svn.apache.org/viewvc/db/jdo/trunk/specification/OOO/JDO_3_1-rc1.pdf?view=co">JDO 3.1 Specification (Release Candidate 1)</a> </li>
<li>The <a href="http://jcp.org/aboutJava/communityprocess/mrel/jsr243/index3.html">JDO 3.0 Specification (Maintenance Release 3)</a> </li>
<li>The <a href="http://jcp.org/aboutJava/communityprocess/mrel/jsr243/index2.html">JDO 2.2 Specification (Maintenance Release 2)</a> </li>
<li>The <a href="http://www.jcp.org/en/jsr/detail?id=243">JDO 2.1 Specification (Maintenance Release 1)</a></li>
Modified: db/jdo/site/src/site/xdoc/tck.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/tck.xml?rev=1538284&r1=1538283&r2=1538284&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/tck.xml (original)
+++ db/jdo/site/src/site/xdoc/tck.xml Sat Nov 2 21:19:25 2013
@@ -49,10 +49,10 @@ limitations under the License.
</li>
<li>
Follow the instructions in the Prerequisites section of
- <a href="http://svn.apache.org/viewcvs.cgi/*checkout*/db/jdo/branches/2.3-ea/README.html">README.html</a>.
+ <a href="http://svn.apache.org/viewcvs.cgi/*checkout*/db/jdo/branches/3.1-rc1/README.html">README.html</a>.
</li>
<li>
- Follow the procedure in <a href="http://svn.apache.org/viewcvs.cgi/*checkout*/db/jdo/branches/2.3-ea/tck2/RunRules.html">RunRules.html</a> in the jdo2-tck-<i>version</i> directory.
+ Follow the procedure in <a href="http://svn.apache.org/viewcvs.cgi/*checkout*/db/jdo/branches/3.1-rc1/tck/RunRules.html">RunRules.html</a> in the tck directory.
</li>
</ol>
</section>