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 cl...@apache.org on 2021/05/07 23:12:00 UTC

[db-jdo] 04/08: Update version numbers for release. Convert README to html.

This is an automated email from the ASF dual-hosted git repository.

clr pushed a commit to branch origin/2.1.1
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 1a29fe1769c6a498438f16dbc8b92002e1c0733f
Author: Michelle Caisse <mc...@apache.org>
AuthorDate: Fri Aug 1 18:36:27 2008 +0000

    Update version numbers for release. Convert README to html.
---
 JDO20.MF                |  12 +--
 README.html             | 230 ++++++++++++++++++++++++++++++++++++++++++++++++
 README.txt              | 170 -----------------------------------
 api2-legacy/project.xml |  13 +--
 api2/project.xml        |  12 +--
 enhancer20/project.xml  |  12 +--
 model20/project.xml     |   8 +-
 tck2/project.xml        |  16 ++--
 util20/project.xml      |   8 +-
 9 files changed, 264 insertions(+), 217 deletions(-)

diff --git a/JDO20.MF b/JDO20.MF
index 82a2021..d7cbe14 100644
--- a/JDO20.MF
+++ b/JDO20.MF
@@ -1,8 +1,8 @@
-Manifest-Version: 1.0 
+Manifest-Version: 1.0
 Specification-Version: JDO 2.1
-Bundle-ManifestVersion: 2 
-Bundle-Name: Java Data Objects 
-Bundle-SymbolicName: javax.jdo 
+Bundle-ManifestVersion: 2
+Bundle-Name: Java Data Objects
+Bundle-SymbolicName: javax.jdo
 Bundle-Version: 2.1
-Bundle-Localization: plugin 
-Bundle-Vendor: Apache 
+Bundle-Localization: plugin
+Bundle-Vendor: Apache
diff --git a/README.html b/README.html
new file mode 100644
index 0000000..22f0b92
--- /dev/null
+++ b/README.html
@@ -0,0 +1,230 @@
+<!--
+  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.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
+	<TITLE>JDO 2 TCK README</TITLE>
+</HEAD>
+<BODY LANG="en-US" DIR="LTR">
+<H1>The JDO 2 Technology Compatibility Kit</H1>
+<UL>
+    <LI><a href="#overview">Overview</a></LI>
+    <!-- For minor release change documentation
+    -->
+    <LI><a href="#changes">Changes since the last release</a></LI>
+    <LI><a href="#prereqs">Prerequisites</a>
+    <UL>
+        <LI><a href="#maven">Maven</a></LI>
+        <LI><a href="#jndi">JNDI Implementation</a></LI>
+    </UL>
+    </LI>
+    <LI><a href="#building">Building the TCK from source</a></LI>
+    <LI><a href="#running">Running the TCK</a>
+    <UL>
+        <LI><a href="#goals">Custom Goals</a></LI>
+        <LI><a href="#cli">Command Line Options</a></LI>
+        <LI><a href="#files">Files</a></LI>
+        <LI><a href="#examples">Examples</a></LI>
+    </UL></LI>
+    </UL>
+<a name="overview"></a>
+<H2>Overview of the JDO 2 Technology Compatibility Kit</H2>
+<p>
+The JDO 2 project includes the JDO 2 TCK and its dependencies:
+</p>
+<UL>
+    <LI>api2 contains source to build jdo2-api-2.1.1.jar, which defines the JDO API version 2.1.1 for Java 1.5 and later.</LI>
+    <LI>api2-legacy contains source to build jdo2-api-legacy-2.1.1.jar, which defines the JDO API version 2.1.1 for Java 1.4 and earlier.</LI>
+    <LI>core20 contains the JDO2 core, including utility and metadata model classes</LI>
+    <LI>enhancer20 contains the utility classes used for verifying enhanced files</LI>
+    <LI>tck2 contains the JDO 2.1.1 Technology Compatibility Kit for Java 1.5 and later.</LI>
+  <LI>tck2-legacy contains the JDO 2.1.1 Technology Compatibility Kit for Java 1.4 and earlier.</LI>
+</UL>
+<p>
+JDO releases may be downloaded from <a href="http://db.apache.org/jdo/downloads.html">the Apache JDO downloads page</a>. Minor updates of releases are only available as source from the Subversion repository. Follow the instructions <a href="#building">below</a> to build the TCK from source.
+<p>
+For complete rules for certifying a JDO implementation,
+see RunRules.html in the top level tck2 or tck2-legacy project directory.
+</p>
+<!-- When creating a new minor release branch, list changes from the major release here 
+-->
+
+<a name="changes"></a>
+<h2>Changes since the Major Release</h2>
+<p>
+JDO 2.1.1 contains fixes for the following bugs:
+<DL>
+    <DT><a href="http://issues.apache.org/jira/browse/JDO-593">JDO-593</a> Cleanup Glassfish entry in maven.repo.remote property
+    <DD>Fixes a possible problem downloading the JTA jars on which some JDO subprojects depend.
+    <DT><a href="http://issues.apache.org/jira/browse/JDO-586">JDO-586</a> conf/iut-persistence.xml is wrong
+    <DD>
+    <DT><a href="http://issues.apache.org/jira/browse/JDO-584">JDO-584</a> Make runtck.iut run out of the box with jpox
+    <DD>Allows the user to run the maven goal runtck.iut using the reference implementation with no modifications.
+</DL>
+</p>
+
+<a name="prereqs"></a>
+<h2>Prerequisites</h2>
+<p>
+You must install the software listed in the following sections
+to successfully run the TCK.
+Other dependencies, such as the reference implementation, DataNucleus,
+and the Apache Derby database, are downloaded automatically by maven.
+Note that Apache JDO uses the apache commons logging package for logging.
+</p>
+<a name="maven"></a>
+<h3>Maven</h3>
+<p>
+You must have Maven version 1.0.1, 1.0.2, or 1.1 to build the projects
+from source and to execute the TCK. You can download maven from 
+http://maven.apache.org/start/download.html
+</p><p>
+Note that maven uses the user.home system property for the location
+of the maven local repostitory: ${user.home}/.maven/repository.
+Under Windows this system property is C:\Documents and Settings\<i>user</i> 
+no matter what the HOME variable is set to. As a workaround you may set the 
+system property by adding -Duser.home=%HOME% to the environment variable 
+MAVEN_OPTS.
+</p> <p>
+Mevenide is a nice maven plugin for IDEs available from http://mevenide.codehaus.org.
+In Netbeans, after you install the plugin, you can open an 
+existing maven project by File -> Open Project -> Open Project Folder.
+Navigate to a directory including a maven project (e.g. api2) and choose this 
+directory. Netbeans will create a project folder. If you right-click the Maven 
+project you can examine the contents of the project.xml (see Properties) or 
+execute goals.
+</p>
+<a name="jndi"></a>
+<h3>JNDI implementation (fscontext.jar and providerutil.jar)</h3>
+<p>
+The JNDI test cases in tck2 need a JNDI implementation.
+The TCK is configured to use Sun's JNDI implementation.
+To use your own implementation, put the implementation
+jar files into lib/ext and update jndi.properties in the TCK directory
+src/conf.  To download Sun's implementation, go to 
+http://java.sun.com/products/jndi/downloads/index.html,
+click the Download button at 'Download JNDI 1.2.1 & More', accept a license 
+agreement, download 'File System Service Provider, 1.2 Beta 3' and then unpack
+the downloaded zip. It includes the jars fscontext.jar and providerutil.jar.
+</p>
+<a name="building"></a>
+<h2>Building the TCK from Source</h2>
+For instructions for checking out the JDO source, see the Apache JDO <a href="http://db.apache.org/jdo/svn.html">source code</a> page.
+To build the TCK dependencies, change to the top level directory of the branch you are working in (or trunk if you are using the latest unreleased code) and run
+<pre>
+maven tck2.default
+</pre>
+Then change to the tck2 or tck2-legacy directory and run
+<pre>
+maven build
+</pre>
+When execution completes, you are ready to run the TCK.
+<p>
+<a name="running"></a>
+<h2>Running the TCK</h2>
+<p>
+In the tck2 project, run "maven build" to build the tck.  This will 
+compile, enhance, install the schemas, and run all the tests on the RI on all 
+supported databases and identitytypes.
+</p>
+<p>
+You may use the following custom goals and command line options
+with the tck2 project:
+</p>
+<a name="goals"></a>
+<h3>Custom Goals</h3>
+<DL>
+    <DT>help
+    <DD>displays help text describing custom goals and options
+    <DT>runtck.jdori
+    <DD>runs the TCK on the JDO Reference Implementation
+    <DT>runtck.iut
+    <DD>runs the TCK on the implementation under test
+    <DT>installSchema
+    <DD>installs the database schema
+    <DT>enhance.jdori
+    <DD>enhances the class files using the JDO RI enhancer
+    <DT>enhance.iut
+    <DD>enhances the class files using the implementation under test's enhancer
+    <DT>debugtck.jdori
+    <DD>waits for a debugger to attach and then runs the TCK on the JDO RI
+    <DT>debugtck.iut
+    <DD>waits for a debugger to attach and then runs the TCK on the implementation under test
+    <DT>cleanClasses
+    <DD>deletes classes and enhanced classes
+</DL>
+
+<a name="cli"></a>
+    <h3>Command Line Options</h3>
+    <DL>
+        <DT>-Djdo.tck.cfglist=<i>configuration file list</i><DD>Overrides the definition of jdo.tck.cfglist found in tck2/src/conf/configuration.list by supplying one or more space-separated test configuration files. Test configuration files typically have the .conf extension. To run a single test, create a .conf file (copy an existing file) and put the test into the jdo.tck.classes property.
+        <DT>-Djdo.tck.dblist=<i>database list</i><DD>Overrides the property value in project.properties by supplying one or more space-separated database names
+        <DT>-Djdo.tck.identitytypes=<i>identity type list</i><DD>Overrides the property value in project.properties by supplying one or more space-separated identity types (applicationidentity or datastoreidentity) to use for this run.
+        <DT>-Djdo.tck.cleanupaftertest=<i>boolean</i><DD>When false, data is retained in the database after the test. This allows inspection of data after test is run. Default is true.
+        <DT>-Djdo.tck.debug.port=<i>port number</i><DD>Sets the port number the JVM should listen for a debugger on. Default is 8787.
+        <DT>-Djdo.tck.debug.jvmargs=<i>args</i><DD>Sets the "-Xdebug ..." arguments to allow you to supply your own debug directives.
+</DL>
+<a name="files"></a>
+<h3>Files</h3>
+<p>Maven looks for the following configuration files in src/conf:
+<UL>
+    <LI>configurations.list
+    <br>A list of files. Each file listed is a test configuration file.</LI>
+    <LI>test configuration files (*.conf)
+    <br>Each of these files sets values for
+    <DL>
+        <DT>jdo.tck.testdescription 
+        <DD>An optional string describing the purpose of these tests
+        <DT>jdo.tck.classes 
+        <DD>A list of one or more test classes (required)
+        <DT>jdo.tck.testdata 
+        <DD>The fully qualified file name of the xml test data file(optional)
+        <DT>jdo.tck.standarddata 
+        <DD>The fully qualified file name of the xml test data file(optional)
+        <DT>jdo.tck.mapping 
+        <DD>The file designator that maven.xml uses to build a javax.jdo.option.Mapping value and corresponding schema name (required)
+</DL></LI>
+     <LI>exclude.list
+        <br>A list of test classes NOT to execute during a TCK test run</LI>
+</UL>
+<a name="examples"></a>
+<h3>Examples</h3>
+<DL>
+    <DT>maven -Djdo.tck.identitytypes=datastoreidentity installSchema
+    <DD>Installs the database schema for datastore identity for all supported databases
+
+     <DT>maven -Djdo.tck.cfglist="alltests.conf cfg1.conf" runtck.jdori
+     <DD>Runs the test configurations specified in alltests.conf and cfg1.conf on the JDORI, using all supported identity types and databases.
+
+     <DT>maven -Djdo.tck.cfglist=detach.conf debugtck.jdori
+     <DD>Runs the test detach.conf configuration, waiting for a debugger to attach on the default port
+
+     <DT>maven -Djdo.tck.cfglist=detach.conf -Djdo.tck.debug.port=9343 debugtck.jdori
+     <DD>Runs the test detach.conf configuration, waiting for a debugger to attach on port 9343
+</DL>
+<p>
+Note:
+</p>
+<UL>
+    <LI type="none">By default, the database schema is NOT installed when the custom goals runtck.iut and runtck.jdori are run.</LI>
+     <LI type="none">maven build installs the database schema and runs the TCK on the JDO Reference Implementation.</LI>
+     <LI type="none">Enhancement is always done before running the TCK when the enhanced classes are not up to date.</LI>
+</UL>
+
+ </BODY>
+ </HTML>
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 60a7896..0000000
--- a/README.txt
+++ /dev/null
@@ -1,170 +0,0 @@
-This is the official release of the JDO 2 project. It includes
-the JDO 2.1 TCK and its dependencies:
-
-- api2 contains source to build jdo2-api-2.1.jar, which defines the JDO API
-  version 2.1 for Java 1.5 and later.
-- api2-legacy contains source to build jdo2-api-legacy-2.1.jar, which defines
-  the JDO API version 2.1 for Java 1.4 and earlier.
-- core20 contains the JDO2 core, including utility and metadata model classes
-- enhancer20 contains the utility classes used for verifying enhanced files
-- tck2 contains the JDO 2.1 Technology Compatibility Kit for Java 1.5 and later.
-- tck2-legacy contains the JDO 2.1 Technology Compatibility Kit for Java 1.4
-  and earlier.
-
--------------
-Prerequisites
--------------
-
-The following are needed to successfully run the TCK. (For complete rules for
-certifying a JDO implementation, see RunRules.html in the top level
-tck2 or tck2-legacy project directory.)
-
-- Maven
-You must have Maven version 1.0.1, 1.0.2, or 1.1 to build the projects
-from source and to execute the TCK. You can download maven from 
-http://maven.apache.org/start/download.html
-
-Note that maven uses the user.home system property for the location
-of the maven local repostitory: ${user.home}/.maven/repository.
-Under Windows this system property is C:\Documents and Settings\<user> 
-no matter what the HOME variable is set to. As a workaround you may set the 
-system property by adding -Duser.home=%HOME% to the environment variable 
-MAVEN_OPTS.
-
-- JNDI implementation (fscontext.jar and providerutil.jar)
-The JNDI test cases in tck2 need a JNDI implementation.
-The TCK is configured to use Sun's JNDI implementation.
-To use your own implementation, put the implementation
-jar files into lib/ext and update jndi.properties in the TCK directory
-src/conf.  To download Sun's implementation, go to 
-http://java.sun.com/products/jndi/downloads/index.html,
-click the Download button at 'Download JNDI 1.2.1 & More', accept a license 
-agreement, download 'File System Service Provider, 1.2 Beta 3' and then unpack
-the downloaded zip. It includes the jars fscontext.jar and providerutil.jar.
-
-- JPOX
-The Reference Implementation for JDO 2.1 is JPOX 1.2. The tck2 subproject 
-automatically downloads the JPOX jar files via maven configuration.
-
-- Derby
-The default datastore for tck2 is Apache Derby. The tck2 subproject 
-automatically downloads version 10.2.1.6 of derby.jar and derbytools.jar.
-
--------
-Notes
--------
-
-- Logging
-Apache JDO uses the apache commons logging package for logging.
-
-- Checkstyle
-The file jdo_check.xml includes the checkstyle configuration. It is borrowed
-from the sun_checks.xml, but does not use all of the sun rules and customizes 
-some other rules. The checkstyle configuration is not yet finished.
-
-- Mevenide
-Mevenide is a nice maven plugin for IDEs (see http://mevenide.codehaus.org).
-You find download instructions in http://mevenide.codehaus.org/download.html.
-For Netbeans, once you installed the plugin, you should be able to open an 
-existing maven project by File -> Open Project -> Open Project Folder.
-Navigate to a directory including a maven project (e.g. api2) and choose this 
-directory. Netbeans will create a project folder. If you right-click the Maven 
-project you can examine the contents of the project.xml (see Properties) or 
-execute goals.
-
--------
-Running the TCK
--------
-
-In the tck2 project, run "maven build" to build the tck.  This will 
-compile, enhance, install the schemas, and run all the tests on the RI on all 
-supported databases and identitytypes.
-
-You may use the following custom goals and command line options
-with the tck2 project:
-
-Custom Goals:
-    * help - displays help text describing custom goals and options
-    * runtck.jdori - runs the TCK on the JDO Reference Implementation
-    * runtck.iut - runs the TCK on the implementation under test
-    * installSchema - installs the database schema
-    * enhance.jdori - enhances the class files using the JDO RI enhancer
-    * enhance.iut - enhances the class files using the
-                    implementation under test's enhancer
-    * debugtck.jdori - waits for a debugger to attach and then runs the TCK
-                     on the JDO RI
-    * debugtck.iut - waits for a debugger to attach and then runs the TCK
-                     on the implementation under test
-    * cleanClasses - deletes classes and enhanced classes
-
-Command Line Options:
-    -Djdo.tck.cfglist=<configuration file list>
-          Overrides the definition of jdo.tck.cfglist found in
-          tck2/src/conf/configuration.list by supplying
-          one or more space-separated test configuration files.
-          Test configuration files typically have the .conf extension.
-          To run a single test, create a .conf file (copy an existing
-          file) and put the test into the jdo.tck.classes property.
-
-      -Djdo.tck.dblist=<database list>
-          Overrides the property value in project.properties by supplying
-          one or more space-separated database names
-
-      -Djdo.tck.identitytypes=<identity type list>
-            Overrides the property value in project.properties by supplying
-            one or more space-separated identity types (applicationidentity
-            or datastoreidentity) to use for this run.
-
-      -Djdo.tck.cleanupaftertest=xxx - true/false. Setting it to false will
-            retain data in database after test. This will allow inspection of
-            data after test is run. Default is true
-
-      -Djdo.tck.debug.port=##### - the port number the JVM should listen for
-            a debugger on (default 8787)
-
-      -Djdo.tck.debug.jvmargs=xxx - the "-Xdebug ..." arguments in the event
-            you want to supply your own debug directives
-
-Maven looks for the following configuration files in src/conf:
-    * configurations.list
-          A list of files. Each file listed is a test configuration file.
-    * test configuration files
-          Each of these files sets values for
-                jdo.tck.testdescription - an optional string describing
-                    the purpose of these tests
-                jdo.tck.classes - a list of one or more test classes.
-                jdo.tck.testdata - fully qualified file name
-                    (not required by all tests)
-                jdo.tck.standarddata - fully qualified file name
-                    (not required by all tests)
-                jdo.tck.mapping - file designator that maven.xml uses
-                    to build a javax.jdo.option.Mapping value and
-                    corresponding schema name
-    * exclude.list
-          A list of test classes NOT to execute during a TCK test run
-
-Examples:
-   maven -Djdo.tck.identitytypes=datastoreidentity installSchema
-       Installs the database schema for datastore identity for all
-       supported databases
-
-   maven -Djdo.tck.cfglist="alltests.conf cfg1.conf" runtck.jdori
-       Runs the test configurations specified in alltests.conf and cfg1.conf
-       on the JDORI, using all supported identity types and databases.
-
-   maven -Djdo.tck.cfglist=detach.conf debugtck.jdori
-       Runs the test detach.conf configuration, waiting for a debugger to
-       attach on the default port
-
-   maven -Djdo.tck.cfglist=detach.conf -Djdo.tck.debug.port=9343 debugtck.jdori
-       Runs the test detach.conf configuration, waiting for a debugger to
-       attach on port 9343
-
-Note:
-   By default, the database schema is NOT installed when the custom goals
-     runtck.iut and runtck.jdori are run.
-   maven build installs the database schema and runs the TCK on the
-     JDO Reference Implementation.
-   Enhancement is always done before running the TCK when the enhanced classes
-     are not up to date.
-
diff --git a/api2-legacy/project.xml b/api2-legacy/project.xml
index 407648e..dddf5be 100644
--- a/api2-legacy/project.xml
+++ b/api2-legacy/project.xml
@@ -25,10 +25,10 @@
     <name>JDO2 API Legacy</name>
     <groupId>javax.jdo</groupId>
     <artifactId>jdo2-api-legacy</artifactId>
-    <currentVersion>2.1</currentVersion>
+    <currentVersion>2.1.1</currentVersion>
     <package>javax.jdo</package>
-    <shortDescription>Java Data Objects 2.1 (JDO) API legacy</shortDescription>
-    <description>The Java Data Objects 2.1 (JDO) API is a standard interface-based 
+    <shortDescription>Java Data Objects 2 (JDO) API legacy</shortDescription>
+    <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request 243 under the auspices of the Java Community Process.
 This version requires only JDK 1.3.</description>
@@ -79,7 +79,6 @@ This version requires only JDK 1.3.</description>
                 </resource>
             </resources>
         </unitTest>
-
         <defaultGoal>jar:install</defaultGoal>
 
         <!-- J A R  R E S O U R C E S -->
@@ -93,12 +92,6 @@ This version requires only JDK 1.3.</description>
                 </includes>
             </resource>
             <resource>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>API2.MF</include>
-                </includes>
-            </resource>
-            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>javax/jdo/*.properties</include>
diff --git a/api2/project.xml b/api2/project.xml
index ddcf4ed..bd2f294 100644
--- a/api2/project.xml
+++ b/api2/project.xml
@@ -25,10 +25,10 @@
     <name>JDO2 API</name>
     <groupId>javax.jdo</groupId>
     <artifactId>jdo2-api</artifactId>
-    <currentVersion>2.1</currentVersion>
+    <currentVersion>2.1.1</currentVersion>
     <package>javax.jdo</package>
-    <shortDescription>Java Data Objects 2.1 (JDO) API</shortDescription>
-    <description>The Java Data Objects 2.1 (JDO) API is a standard interface-based 
+    <shortDescription>Java Data Objects 2 (JDO) API</shortDescription>
+    <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request 243 under the auspices of the Java Community Process.</description>
     <!-- ============ -->
@@ -89,12 +89,6 @@ Request 243 under the auspices of the Java Community Process.</description>
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>API2.MF</include>
-                </includes>
-            </resource>
-            <resource>
                 <directory>${basedir}/..</directory>
                 <targetPath>META-INF</targetPath>
                 <includes>
diff --git a/enhancer20/project.xml b/enhancer20/project.xml
index 1775e5b..286cc93 100644
--- a/enhancer20/project.xml
+++ b/enhancer20/project.xml
@@ -26,10 +26,10 @@
     <name>JDO2 Implementation (Enhancer)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-enhancer</artifactId>
-    <currentVersion>2.1</currentVersion>
+    <currentVersion>2.1.1</currentVersion>
     <package>org.apache.jdo</package>
-    <shortDescription>Java Data Objects 2.0 (JDO) Enhancer</shortDescription>
-    <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
+    <shortDescription>Java Data Objects 2 (JDO) Enhancer</shortDescription>
+    <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request JSR 243 under the auspices of the Java Community Process.</description>
     <!-- ============ -->
@@ -39,17 +39,17 @@ Request JSR 243 under the auspices of the Java Community Process.</description>
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
diff --git a/model20/project.xml b/model20/project.xml
index 900ebf0..eb41325 100644
--- a/model20/project.xml
+++ b/model20/project.xml
@@ -26,10 +26,10 @@
     <name>JDO2 Implementation (Model)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-model</artifactId>
-    <currentVersion>2.1</currentVersion>
+    <currentVersion>2.1.1</currentVersion>
     <package>org.apache.jdo</package>
-    <shortDescription>Java Data Objects 2.0 (JDO) Model</shortDescription>
-    <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
+    <shortDescription>Java Data Objects 2 (JDO) Model</shortDescription>
+    <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request JSR 243 under the auspices of the Java Community Process.</description>
     <!-- ============ -->
@@ -39,7 +39,7 @@ Request JSR 243 under the auspices of the Java Community Process.</description>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
diff --git a/tck2/project.xml b/tck2/project.xml
index 6801a62..7b9b09b 100644
--- a/tck2/project.xml
+++ b/tck2/project.xml
@@ -24,12 +24,12 @@
     <name>JDO2 Technology Compatibility Kit</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-tck</artifactId>
-    <currentVersion>2.1</currentVersion>
+    <currentVersion>2.1.1</currentVersion>
     <package>org.apache.jdo.tck</package>
-    <shortDescription>Java Data Objects 2.0 (JDO) TCK</shortDescription>
-    <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request JSR 243 under the auspices of the Java Community Process.
+    <shortDescription>Java Data Objects 2 (JDO) TCK</shortDescription>
+    <description>The Java Data Objects 2 (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request JSR 243 under the auspices of the Java Community Process.
 
-The JDO TCK is a test suite designed to test implementations of the Java Data Objects 2.0 specification. In order to claim compatibility with JDO, an implementation must pass all relevant tests of the JDOTCK.
+The JDO TCK is a test suite designed to test implementations of the Java Data Objects 2 specification. In order to claim compatibility with JDO, an implementation must pass all relevant tests of the JDOTCK.
 
 NOTE!! There are no unit tests in this project.</description>
     <!-- ============ -->
@@ -39,22 +39,22 @@ NOTE!! There are no unit tests in this project.</description>
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-enhancer</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
diff --git a/util20/project.xml b/util20/project.xml
index 8c60ec2..8e4048f 100644
--- a/util20/project.xml
+++ b/util20/project.xml
@@ -26,10 +26,10 @@
     <name>JDO2 Implementation (Util)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-util</artifactId>
-    <currentVersion>2.1</currentVersion>
+    <currentVersion>2.1.1</currentVersion>
     <package>org.apache.jdo</package>
-    <shortDescription>Java Data Objects 2.0 (JDO) Util</shortDescription>
-    <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
+    <shortDescription>Java Data Objects 2 (JDO) Util</shortDescription>
+    <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request JSR 243 under the auspices of the Java Community Process.</description>
     <!-- ============ -->
@@ -39,7 +39,7 @@ Request JSR 243 under the auspices of the Java Community Process.</description>
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>